Allon Mureinik has uploaded a new change for review.
Change subject: core: [WIP] Adding VDSM API for LiveStorageMigration
......................................................................
core: [WIP] Adding VDSM API for LiveStorageMigration
Added the VDSM interface calls required for implementing Live Storage
Migration.
In IRS (SPM):
* syncImage
In Vds (HSM):
* vmDiskMigrateStart
* vmDiskMigrateComplete
Note: This is a WIP patch. It currently introduces dead code that is not
in use in any flow (this will be introduced in subsequent patches) -
PLEASE DO NOT SUBMIT IT.
Change-Id: I449b2018a0f63687bafe939b2fd036c221194b26
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
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/vdsbroker/IVdsServer.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
6 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/8102/1
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 e2d2e35..be4df2f 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
@@ -68,6 +68,8 @@
OneUuidReturnForXmlRpc moveImage(String spUUID, String srcDomUUID, String
dstDomUUID, String imgGUID,
String vmGUID, int op, String postZero, String force);
+ OneUuidReturnForXmlRpc syncImage(String spUUID, String srcDomUUID, String
dstDomUUID, String imgGUID, int options);
+
StorageDomainGuidListReturnForXmlRpc getImageDomainsList(String spUUID,
String imgUUID);
StatusOnlyReturnForXmlRpc setMaxHosts(int maxHosts);
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 c87d1cd..b95cb4c 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
@@ -80,6 +80,8 @@
public Map<String, Object> moveImage(String spUUID, String srcDomUUID,
String dstDomUUID, String imgGUID,
String vmGUID, int op);
+ public Map<String, Object> syncImage(String spUUID, String srcDomUUID,
String dstDomUUID, String imgGUID, int options);
+
public Map<String, Object> getImageDomainsList(String spUUID, String
imgUUID);
public Map<String, Object> setMaxHosts(int maxHosts);
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 2f4bb77..63b4aa0 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
@@ -193,6 +193,12 @@
return wrapper;
}
+ public OneUuidReturnForXmlRpc syncImage(String spUUID, String srcDomUUID,
String dstDomUUID, String imgGUID, int options) {
+ Map<String, Object> xmlRpcReturnValue = irsServer.syncImage(spUUID,
srcDomUUID, dstDomUUID, imgGUID, options);
+ OneUuidReturnForXmlRpc wrapper = new
OneUuidReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ }
+
public StorageDomainGuidListReturnForXmlRpc getImageDomainsList(String
spUUID, String imgUUID) {
Map<String, Object> xmlRpcReturnValue =
irsServer.getImageDomainsList(spUUID, imgUUID);
StorageDomainGuidListReturnForXmlRpc wrapper = new
StorageDomainGuidListReturnForXmlRpc(xmlRpcReturnValue);
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 f04e32e..158e04e 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
@@ -236,4 +236,7 @@
GlusterServersListReturnForXmlRpc glusterServersList();
+ StatusOnlyReturnForXmlRpc vmDiskMigrateStart(String vmUUID, Map srcDisk,
Map dstDisk);
+
+ StatusOnlyReturnForXmlRpc vmDiskMigrateComplete(String vmUUID, String
action);
}
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 246da01..7641354 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
@@ -231,4 +231,7 @@
@FutureCall(delegeteTo = "ping")
public FutureTask<Map<String, Object>> futurePing();
+ public Map<String, Object> vmDiskMigrateStart(String vmUUID, Map srcDisk,
Map dstDisk);
+
+ public Map<String, Object> vmDiskMigrateComplete(String vmUUID, String
action);
}
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 a711e24..0d4b44b 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
@@ -1149,4 +1149,25 @@
}
}
+ @Override
+ public StatusOnlyReturnForXmlRpc vmDiskMigrateStart(String vmUUID, Map
srcDisk, Map dstDisk) {
+ try {
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.vmDiskMigrateStart(vmUUID, srcDisk, dstDisk);
+ StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
+
+ @Override
+ public StatusOnlyReturnForXmlRpc vmDiskMigrateComplete(String vmUUID,
String action) {
+ try {
+ Map<String, Object> xmlRpcReturnValue =
vdsServer.vmDiskMigrateComplete(vmUUID, action);
+ StatusOnlyReturnForXmlRpc wrapper = new
StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
+ return wrapper;
+ } catch (UndeclaredThrowableException ute) {
+ throw new XmlRpcRunTimeException(ute);
+ }
+ }
}
--
To view, visit http://gerrit.ovirt.org/8102
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I449b2018a0f63687bafe939b2fd036c221194b26
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
