Piotr Kliczewski has uploaded a new change for review.
Change subject: api: cleanup
......................................................................
api: cleanup
I do not know process of deprication of api but we have not used
following methods in 3.5 so it should be ok to remove them for 3.6.
Change-Id: Ifa1acf386d1860cd31440c97890f87941086f717
Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com>
---
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StartSpiceVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
12 files changed, 4 insertions(+), 256 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/36104/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
deleted file mode 100644
index 6af86e9..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class StartSpiceVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
- private String _vdsIp;
- private String _ticket;
- private int _guestPort;
-
- public StartSpiceVDSCommandParameters(Guid vdsId, String vdsIp, int
guestPort, String ticket) {
- super(vdsId);
- _vdsIp = vdsIp;
- _ticket = ticket;
- _guestPort = guestPort;
- }
-
- public String getTicket() {
- return _ticket;
- }
-
- public int getGuestPort() {
- return _guestPort;
- }
-
- public String getVdsIp() {
- return _vdsIp;
- }
-
- public StartSpiceVDSCommandParameters() {
- }
-
- @Override
- public String toString() {
- return String.format("%s, ticket=%s, guestPort=%s, vdsIp=%s",
- super.toString(),
- getTicket(),
- getGuestPort(),
- getVdsIp());
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 2c41867..6852617 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -24,7 +24,6 @@
FailedToRunVm("org.ovirt.engine.core.vdsbroker"),
SetVmStatus("org.ovirt.engine.core.vdsbroker"),
IsVmDuringInitiating("org.ovirt.engine.core.vdsbroker"),
- StartSpice("org.ovirt.engine.core.vdsbroker.vdsbroker"),
UpdateVdsVMsCleared("org.ovirt.engine.core.vdsbroker"),
AddNetwork("org.ovirt.engine.core.vdsbroker.vdsbroker"),
RemoveNetwork("org.ovirt.engine.core.vdsbroker.vdsbroker"),
@@ -32,7 +31,6 @@
SetSafeNetworkConfig("org.ovirt.engine.core.vdsbroker.vdsbroker"),
ConnectStorageServer("org.ovirt.engine.core.vdsbroker.vdsbroker"),
DisconnectStorageServer("org.ovirt.engine.core.vdsbroker.vdsbroker"),
- GetStorageConnectionsList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
ConnectStoragePool("org.ovirt.engine.core.vdsbroker.vdsbroker"),
DisconnectStoragePool("org.ovirt.engine.core.vdsbroker.vdsbroker"),
DiscoverSendTargets("org.ovirt.engine.core.vdsbroker.vdsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
index a09da95..3c9d89f 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
@@ -1,9 +1,8 @@
package org.ovirt.engine.core.vdsbroker.irsbroker;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.vdsbroker.StorageDomainListReturnForXmlRpc;
-
import java.util.Map;
+
+import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
public interface IIrsServer {
@@ -34,9 +33,6 @@
IrsStatsAndStatusXmlRpc getIrsStats();
- OneUuidReturnForXmlRpc importCandidate(String sdUUID, String vmGUID,
String templateGUID, String templateVolGUID,
- String path, String type, String force);
-
FileStatsReturnForXmlRpc getIsoList(String spUUID);
FileStatsReturnForXmlRpc getFloppyList(String spUUID);
@@ -55,8 +51,6 @@
StatusOnlyReturnForXmlRpc setStorageDomainDescription(String sdUUID,
String description);
- StorageDomainListReturnForXmlRpc reconstructMaster(String spUUID, int
hostSpmId, String msdUUID, String masterVersion);
-
StatusOnlyReturnForXmlRpc extendStorageDomain(String sdUUID, String
spUUID, String[] devlist);
StatusOnlyReturnForXmlRpc extendStorageDomain(String sdUUID, String
spUUID, String[] devlist, boolean force);
@@ -73,8 +67,6 @@
OneUuidReturnForXmlRpc cloneImageStructure(String spUUID, String
srcDomUUID, String imgGUID, String dstDomUUID);
OneUuidReturnForXmlRpc syncImageData(String spUUID, String srcDomUUID,
String imgGUID, String dstDomUUID, String syncType);
-
- StatusOnlyReturnForXmlRpc setMaxHosts(int maxHosts);
StatusOnlyReturnForXmlRpc updateVM(String spUUID, Map[] vms);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
index 1b7c709..f07caa5 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
@@ -41,9 +41,6 @@
public Map<String, Object> getStats();
- public Map<String, Object> importCandidate(String sdUUID, String vmGUID,
String templateGUID,
- String templateVolGUID, String path, String type, String force);
-
public Map<String, Object> getIsoList(String spUUID);
public Map<String, Object> getFloppyList(String spUUID);
@@ -61,8 +58,6 @@
public Map<String, Object> attachStorageDomain(String sdUUID, String
spUUID);
public Map<String, Object> setStorageDomainDescription(String sdUUID,
String description);
-
- public Map<String, Object> reconstructMaster(String spUUID, int hostSpmId,
String msdUUID, String masterVersion);
public Map<String, Object> extendStorageDomain(String sdUUID, String
spUUID, String[] devlist);
@@ -87,8 +82,6 @@
public Map<String, Object> syncImageData(String spUUID, String srcDomUUID,
String imgGUID, String dstDomUUID, String syncType);
public Map<String, Object> getImageDomainsList(String spUUID, String
imgUUID);
-
- public Map<String, Object> setMaxHosts(int maxHosts);
public Map<String, Object> updateVM(String spUUID, Map[] vms);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
index 7388e88..434c673 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
@@ -4,7 +4,6 @@
import org.apache.commons.httpclient.HttpClient;
import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.vdsbroker.StorageDomainListReturnForXmlRpc;
public class IrsServerWrapper implements IIrsServer {
@@ -100,15 +99,6 @@
}
@Override
- public OneUuidReturnForXmlRpc importCandidate(String sdUUID, String
vmGUID, String templateGUID,
- String templateVolGUID, String path, String type, String force) {
- Map<String, Object> xmlRpcReturnValue =
irsServer.importCandidate(sdUUID, vmGUID, templateGUID,
- templateVolGUID, path, type, force);
- OneUuidReturnForXmlRpc wrapper = new
OneUuidReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- }
-
- @Override
public FileStatsReturnForXmlRpc getIsoList(String spUUID) {
Map<String, Object> xmlRpcReturnValue = irsServer.getIsoList(spUUID);
FileStatsReturnForXmlRpc wrapper = new
FileStatsReturnForXmlRpc(xmlRpcReturnValue);
@@ -174,14 +164,6 @@
}
@Override
- public StorageDomainListReturnForXmlRpc reconstructMaster(String spUUID,
int hostSpmId, String msdUUID,
- String masterVersion) {
- Map<String, Object> xmlRpcReturnValue =
irsServer.reconstructMaster(spUUID, hostSpmId, msdUUID, masterVersion);
- StorageDomainListReturnForXmlRpc wrapper = new
StorageDomainListReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- }
-
- @Override
public StatusOnlyReturnForXmlRpc extendStorageDomain(String sdUUID, String
spUUID, String[] devlist) {
Map<String, Object> xmlRpcReturnValue =
irsServer.extendStorageDomain(sdUUID, spUUID, devlist);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
@@ -237,13 +219,6 @@
public OneUuidReturnForXmlRpc syncImageData(String spUUID, String
srcDomUUID, String imgGUID, String dstDomUUID, String syncType) {
Map<String, Object> xmlRpcReturnValue =
irsServer.syncImageData(spUUID, srcDomUUID, imgGUID, dstDomUUID, syncType);
OneUuidReturnForXmlRpc wrapper = new
OneUuidReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- }
-
- @Override
- public StatusOnlyReturnForXmlRpc setMaxHosts(int maxHosts) {
- Map<String, Object> xmlRpcReturnValue =
irsServer.setMaxHosts(maxHosts);
- StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java
index ab8b3a9..6cb7366 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java
@@ -14,9 +14,8 @@
import
org.ovirt.engine.core.vdsbroker.irsbroker.StoragePoolInfoReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.StorageStatusReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.UUIDListReturnForXmlRpc;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.vdsbroker.StorageDomainListReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.irsbroker.VolumeListReturnForXmlRpc;
+import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
import org.ovirt.vdsm.jsonrpc.client.JsonRpcClient;
import org.ovirt.vdsm.jsonrpc.client.JsonRpcRequest;
import org.ovirt.vdsm.jsonrpc.client.RequestBuilder;
@@ -216,18 +215,6 @@
}
@Override
- public OneUuidReturnForXmlRpc importCandidate(String sdUUID,
- String vmGUID,
- String templateGUID,
- String templateVolGUID,
- String path,
- String type,
- String force) {
- // This method is not used in the engine
- return null;
- }
-
- @Override
public FileStatsReturnForXmlRpc getIsoList(String spUUID) {
// duplicated in IVdsServer#getIsoList
JsonRpcRequest request =
@@ -335,15 +322,6 @@
Map<String, Object> response =
new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
- }
-
- @Override
- public StorageDomainListReturnForXmlRpc reconstructMaster(String spUUID,
- int hostSpmId,
- String msdUUID,
- String masterVersion) {
- // this method is not used but there is similar method in
IVdsServer#reconstructMaster
- return null;
}
@Override
@@ -459,12 +437,6 @@
Map<String, Object> response =
new FutureMap(this.client, request).withResponseKey("uuid");
return new OneUuidReturnForXmlRpc(response);
- }
-
- @Override
- public StatusOnlyReturnForXmlRpc setMaxHosts(int maxHosts) {
- // this method is not used
- return null;
}
@SuppressWarnings("rawtypes")
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
index 9e970e4..07d4667 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
@@ -18,8 +18,8 @@
import org.ovirt.engine.core.vdsbroker.gluster.GlusterServicesReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.gluster.GlusterTasksListReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusDetailForXmlRpc;
+import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeProfileInfoReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeStatusReturnForXmlRpc;
@@ -39,7 +39,6 @@
import
org.ovirt.engine.core.vdsbroker.vdsbroker.OneStorageDomainStatsReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.vdsbroker.OneVGReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.vdsbroker.OneVmReturnForXmlRpc;
-import
org.ovirt.engine.core.vdsbroker.vdsbroker.ServerConnectionListReturnForXmlRpc;
import
org.ovirt.engine.core.vdsbroker.vdsbroker.ServerConnectionStatusReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.vdsbroker.SpmStatusReturnForXmlRpc;
import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc;
@@ -302,15 +301,6 @@
}
@Override
- public StatusOnlyReturnForXmlRpc heartBeat() {
- // check method. This method is not used in the engine
- JsonRpcRequest request = new RequestBuilder("Host.ping").build();
- Map<String, Object> response =
- new FutureMap(this.client, request);
- return new StatusOnlyReturnForXmlRpc(response);
- }
-
- @Override
public StatusOnlyReturnForXmlRpc monitorCommand(String vmId, String
monitorCommand) {
JsonRpcRequest request =
new RequestBuilder("VM.monitorCommand").withParameter("vmID",
vmId)
@@ -341,12 +331,6 @@
.build();
Map<String, Object> response = new FutureMap(this.client, request);
return new StatusOnlyReturnForXmlRpc(response);
- }
-
- @Override
- public StatusOnlyReturnForXmlRpc startSpice(String vdsIp, int port, String
ticket) {
- // TODO This method is used by StartSpiceVDSCommand
- return null;
}
@Override
@@ -518,12 +502,6 @@
new FutureMap(this.client,
request).withResponseKey("statuslist")
.withResponseType(Object[].class);
return new ServerConnectionStatusReturnForXmlRpc(response);
- }
-
- @Override
- public ServerConnectionListReturnForXmlRpc
getStorageConnectionsList(String spUUID) {
- // TODO there is poolsGetConnectedList method not exposed and accepts
no args
- return null;
}
@Override
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java
deleted file mode 100644
index 5c4d01b..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
-import org.ovirt.engine.core.common.businessentities.StorageType;
-import
org.ovirt.engine.core.common.vdscommands.GetStorageConnectionsListVDSCommandParameters;
-
-
-public class GetStorageConnectionsListVDSCommand<P extends
GetStorageConnectionsListVDSCommandParameters>
- extends VdsBrokerCommand<P> {
- private ServerConnectionListReturnForXmlRpc _result;
-
- public GetStorageConnectionsListVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeVdsBrokerCommand() {
- _result = getBroker().getStorageConnectionsList(
- getParameters().getStoragePoolId().toString());
- proceedProxyReturnValue();
-
- // parse result to storage_server_connections
- ArrayList<StorageServerConnections> connections = new
ArrayList<StorageServerConnections>();
- for (Map<String, Object> x : _result.mConnectionList) {
- StorageServerConnections storageCon = new
StorageServerConnections();
- if (x.containsKey("serverType")) {
- storageCon.setstorage_type((StorageType) x.get("serverType"));
- }
- if (x.containsKey("target")) {
- storageCon.setconnection(x.get("target").toString());
- }
- connections.add(storageCon);
- }
- setReturnValue(connections);
- }
-
- @Override
- protected StatusForXmlRpc getReturnStatus() {
- return _result.mStatus;
- }
-
- @Override
- protected Object getReturnValueFromBroker() {
- return _result;
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
index 92619fa..54e28a2 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
@@ -76,16 +76,11 @@
OneVmReturnForXmlRpc changeFloppy(String vmId, String imageLocation);
- @Deprecated
- StatusOnlyReturnForXmlRpc heartBeat();
-
StatusOnlyReturnForXmlRpc monitorCommand(String vmId, String
monitorCommand);
StatusOnlyReturnForXmlRpc setVmTicket(String vmId, String otp64, String
sec);
StatusOnlyReturnForXmlRpc setVmTicket(String vmId, String otp64, String
sec, String connectionAction, Map<String, String> params);
-
- StatusOnlyReturnForXmlRpc startSpice(String vdsIp, int port, String
ticket);
StatusOnlyReturnForXmlRpc addNetwork(String bridge, String vlan, String
bond, String[] nics,
Map<String, String> options);
@@ -108,8 +103,6 @@
ServerConnectionStatusReturnForXmlRpc disconnectStorageServer(int
serverType, String spUUID,
Map<String, String>[] args);
-
- ServerConnectionListReturnForXmlRpc getStorageConnectionsList(String
spUUID);
StatusOnlyReturnForXmlRpc createStorageDomain(int domainType, String
sdUUID, String domainName, String arg,
int storageType, String storageFormatType);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StartSpiceVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StartSpiceVDSCommand.java
deleted file mode 100644
index 794f623..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StartSpiceVDSCommand.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import org.ovirt.engine.core.common.vdscommands.StartSpiceVDSCommandParameters;
-
-public class StartSpiceVDSCommand<P extends StartSpiceVDSCommandParameters>
extends VdsBrokerCommand<P> {
- private String _ip;
- private int _port;
- private String _ticket;
-
- public StartSpiceVDSCommand(P parameters) {
- super(parameters);
- _ip = parameters.getVdsIp();
- _port = parameters.getGuestPort();
- _ticket = parameters.getTicket();
- }
-
- @Override
- protected void executeVdsBrokerCommand() {
- status = getBroker().startSpice(_ip, _port, _ticket);
- proceedProxyReturnValue();
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
index e97444b..1d5b7f3 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java
@@ -50,15 +50,11 @@
public Map<String, Object> changeFloppy(String vmId, String imageLocation);
- public Map<String, Object> heartBeat();
-
public Map<String, Object> monitorCommand(String vmId, String
monitorCommand);
public Map<String, Object> setVmTicket(String vmId, String otp64, String
sec);
public Map<String, Object> setVmTicket(String vmId, String otp64, String
sec, String connectionAction, Map<String, String> params);
-
- public Map<String, Object> startSpice(String vdsIp, int port, String
ticket);
public Map<String, Object> addNetwork(String bridge, String vlan, String
bond, String[] nics,
Map<String, String> options);
@@ -84,8 +80,6 @@
public Map<String, Object> connectStorageServer(int serverType, String
spUUID, Map<String, String>[] args);
public Map<String, Object> disconnectStorageServer(int serverType, String
spUUID, Map<String, String>[] args);
-
- public Map<String, Object> getStorageConnectionsList(String spUUID);
public Map<String, Object> createStorageDomain(int domainType, String
sdUUID, String domainName, String arg,
int storageType, String storageFormatType);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
index d027b50..a27c402 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java
@@ -293,18 +293,6 @@
}
@Override
- public StatusOnlyReturnForXmlRpc heartBeat() {
- try {
- Map<String, Object> xmlRpcReturnValue = vdsServer.heartBeat();
- StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- } catch (UndeclaredThrowableException ute) {
- throw new XmlRpcRunTimeException(ute);
- }
-
- }
-
- @Override
public StatusOnlyReturnForXmlRpc monitorCommand(String vmId, String
monitorCommand) {
try {
Map<String, Object> xmlRpcReturnValue =
vdsServer.monitorCommand(vmId, monitorCommand);
@@ -332,18 +320,6 @@
public StatusOnlyReturnForXmlRpc setVmTicket(String vmId, String otp64,
String sec, String connectionAction, Map<String, String> params) {
try {
Map<String, Object> xmlRpcReturnValue =
vdsServer.setVmTicket(vmId, otp64, sec, connectionAction, params);
- StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- } catch (UndeclaredThrowableException ute) {
- throw new XmlRpcRunTimeException(ute);
- }
-
- }
-
- @Override
- public StatusOnlyReturnForXmlRpc startSpice(String vdsIp, int port, String
ticket) {
- try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.startSpice(vdsIp, port, ticket);
StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
@@ -445,18 +421,6 @@
Map<String, Object> xmlRpcReturnValue =
vdsServer.disconnectStorageServer(serverType, spUUID, args);
ServerConnectionStatusReturnForXmlRpc wrapper =
new
ServerConnectionStatusReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- } catch (UndeclaredThrowableException ute) {
- throw new XmlRpcRunTimeException(ute);
- }
-
- }
-
- @Override
- public ServerConnectionListReturnForXmlRpc
getStorageConnectionsList(String spUUID) {
- try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.getStorageConnectionsList(spUUID);
- ServerConnectionListReturnForXmlRpc wrapper = new
ServerConnectionListReturnForXmlRpc(xmlRpcReturnValue);
return wrapper;
} catch (UndeclaredThrowableException ute) {
throw new XmlRpcRunTimeException(ute);
--
To view, visit http://gerrit.ovirt.org/36104
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa1acf386d1860cd31440c97890f87941086f717
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
