[Engine-patches] Change in ovirt-engine[master]: core: parse vgName on getVGInfo response

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: core: parse vgName on getVGInfo response
......................................................................

core: parse vgName on getVGInfo response

GetVGInfoVDSCommand:
Parse 'vgName' property and set it for each LUN.

GetDeviceListVDSCommand -> parseLunFromXmlRpc:
Set 'vgName' as storageDomainId for each LUN.

Change-Id: I4ae7e54f76c4f3f42fad5d4559478fc6df4d662b
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/29162/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
index 6515874..499bb26 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java
@@ -11,6 +11,7 @@
 import org.ovirt.engine.core.common.utils.EnumUtils;
 import org.ovirt.engine.core.common.utils.SizeConverter;
 import 
org.ovirt.engine.core.common.vdscommands.GetDeviceListVDSCommandParameters;
+import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.vdsbroker.irsbroker.IrsBrokerCommand;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -63,6 +64,9 @@
         } else {
             lun.setvolume_group_id("");
         }
+        if (xlun.containsKey("vgName")) {
+            
lun.setStorageDomainId(Guid.createGuidFromString(xlun.get("vgName").toString()));
+        }
         if (xlun.containsKey("serial")) {
             lun.setSerial(xlun.get("serial").toString());
         }
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java
index 25b7e8d..83805a8 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java
@@ -17,12 +17,14 @@
         _result = getBroker().getVGInfo(getParameters().getVGID());
         proceedProxyReturnValue();
         // build temp data
+        String vgName = (String) _result.vgInfo.get("name");
         Object[] temp = (Object[]) _result.vgInfo.get("pvlist");
         Map<String, Object>[] pvList = new Map[0];
         if (temp != null) {
             pvList = new Map[temp.length];
             for (int i = 0; i < temp.length; i++) {
                 pvList[i] = (Map<String, Object>) temp[i];
+                pvList[i].put("vgName", vgName);
             }
         }
         setReturnValue(GetDeviceListVDSCommand.parseLUNList(pvList));


-- 
To view, visit http://gerrit.ovirt.org/29162
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ae7e54f76c4f3f42fad5d4559478fc6df4d662b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches