[Engine-patches] Change in ovirt-engine[master]: core: Refactor code to use VdsProperties constants(#855651)

[emesika]

Eli Mesika has uploaded a new change for review.

Change subject: core: Refactor code to use VdsProperties constants(#855651)
......................................................................

core: Refactor code to use VdsProperties constants(#855651)

Refactor code handling Hot Plug Nics to use VdsProperties constants
rather than fixed strings.

Change-Id: Ic1df4183f6ebc0fd50733d4b8f934c30dca43020
Signed-off-by: Eli Mesika <emes...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
2 files changed, 13 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/7887/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
index f834dbb..f1b69d4 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
@@ -5,6 +5,7 @@
 import org.ovirt.engine.core.common.businessentities.VmDevice;
 import org.ovirt.engine.core.common.businessentities.VmInterfaceType;
 import org.ovirt.engine.core.common.businessentities.VmNetworkInterface;
+import org.ovirt.engine.core.common.utils.VmDeviceType;
 import org.ovirt.engine.core.common.vdscommands.HotPlugUnplgNicVDSParameters;
 import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStringUtils;
 import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStruct;
@@ -25,8 +26,8 @@
     }
 
     protected void init() {
-        struct.add("vmId", getParameters().getVm().getId().toString());
-        struct.add("nic", initNicStructure());
+        struct.add(VdsProperties.vm_guid, 
getParameters().getVm().getId().toString());
+        struct.add(VdsProperties.networkNic, initNicStructure());
     }
 
     private XmlRpcStruct initNicStructure() {
@@ -34,16 +35,17 @@
         VmNetworkInterface nic = getParameters().getNic();
         VmDevice vmDevice = getParameters().getVmDevice();
 
-        map.add("type", "interface");
-        map.add("device", "bridge");
-        map.add("macAddr", nic.getMacAddress());
-        map.add("network", nic.getNetworkName());
+        map.add(VdsProperties.Type, VmDeviceType.INTERFACE.getName());
+        map.add(VdsProperties.Device, VmDeviceType.BRIDGE.getName());
+        map.add(VdsProperties.mac_addr, nic.getMacAddress());
+        map.add(VdsProperties.network, nic.getNetworkName());
         addAddress(map, vmDevice.getAddress());
-        map.add("specParams", vmDevice.getSpecParams());
-        map.add("nicModel", VmInterfaceType.forValue(nic.getType()).name());
+        map.add(VdsProperties.SpecParams, vmDevice.getSpecParams());
+        map.add(VdsProperties.nic_type, 
VmInterfaceType.forValue(nic.getType()).name());
         map.add(VdsProperties.DeviceId, 
vmDevice.getId().getDeviceId().toString());
+
         if (vmDevice.getBootOrder() > 0) {
-            map.add("bootOrder", String.valueOf(vmDevice.getBootOrder()));
+            map.add(VdsProperties.BootOrder, 
String.valueOf(vmDevice.getBootOrder()));
         }
 
         if (nic.isPortMirroring()) {
@@ -56,7 +58,7 @@
 
     private void addAddress(XmlRpcStruct map, String address) {
         if (org.apache.commons.lang.StringUtils.isNotBlank(address)) {
-            map.add("address", 
XmlRpcStringUtils.string2Map(getParameters().getVmDevice().getAddress()));
+            map.add(VdsProperties.Address, 
XmlRpcStringUtils.string2Map(getParameters().getVmDevice().getAddress()));
         }
     }
 
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
index fb7fe69..16168b8 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
@@ -115,6 +115,7 @@
     public static final String monitorResponse = "monitorResponse";
 
     // Network related
+    public static final String networkNic = "nic";
     public static final String network_nics = "nics";
     public static final String network_vlans = "vlans";
     public static final String network_networks = "networks";


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

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