Daniel Erez has uploaded a new change for review.
Change subject: core: VdsProperties - rename NETWORK_INTERFACE
......................................................................
core: VdsProperties - rename NETWORK_INTERFACE
VdsProperties -> NETWORK_INTERFACE constant is used both for
network-interface and disk-interface.
Hence, renaming to the generic concept: INTERFACE.
Change-Id: I208f8369084d5a3d42cfb7ebb592569f6063a4d3
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
4 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/13875/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java
index 5c1dc1f..7827323 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java
@@ -39,7 +39,7 @@
drive.add(VdsProperties.Type, "disk");
drive.add(VdsProperties.Device, "disk");
addAddress(drive, getParameters().getVmDevice().getAddress());
- drive.add(VdsProperties.NETWORK_INTERFACE,
disk.getDiskInterface().toString().toLowerCase());
+ drive.add(VdsProperties.INTERFACE,
disk.getDiskInterface().toString().toLowerCase());
drive.add(VdsProperties.Shareable, String.valueOf(disk.isShareable()));
drive.add(VdsProperties.Optional, Boolean.FALSE.toString());
drive.add(VdsProperties.ReadOnly,
String.valueOf(vmDevice.getIsReadOnly()));
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index f157413..85bb682 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -976,7 +976,7 @@
List<VdsNetworkInterface> interfaces = new
ArrayList<VdsNetworkInterface>();
if
(FeatureSupported.bridgesReportByVdsm(vds.getVdsGroupCompatibilityVersion())) {
VdsNetworkInterface iface = null;
- String interfaceName = (String)
network.get(VdsProperties.NETWORK_INTERFACE);
+ String interfaceName = (String)
network.get(VdsProperties.INTERFACE);
if (interfaceName != null) {
iface = vdsInterfaces.get(interfaceName);
if (iface == null) {
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 b7069f3..a0f714c 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
@@ -67,6 +67,8 @@
public static final String images_last_check = "imagesLastCheck";
public static final String images_last_delay = "imagesLastDelay";
+ public static final String INTERFACE = "iface";
+
// Network related properties
public static final String NETWORK = "network";
public static final String LINK_ACTIVE = "linkActive";
@@ -93,7 +95,6 @@
public static final String NETWORK_BONDINGS = "bondings";
public static final String NETWORK_BRIDGES = "bridges";
public static final String NETWORK_LAST_CLIENT_INTERFACE =
"lastClientIface";
- public static final String NETWORK_INTERFACE = "iface";
public static final String VM_NETWORK_INTERFACES = "netIfaces";
public static final String VM_IPV4_ADDRESSES = "inet";
public static final String VM_IPV6_ADDRESSES = "inet6";
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
index 347ca61..5b33332 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
@@ -243,10 +243,10 @@
struct.add(VdsProperties.Device, vmDevice.getDevice());
switch (disk.getDiskInterface()) {
case IDE:
- struct.add(VdsProperties.NETWORK_INTERFACE, "ide");
+ struct.add(VdsProperties.INTERFACE, "ide");
break;
case VirtIO:
- struct.add(VdsProperties.NETWORK_INTERFACE,
VdsProperties.Virtio);
+ struct.add(VdsProperties.INTERFACE, VdsProperties.Virtio);
break;
default:
// ISCI not supported
@@ -495,7 +495,7 @@
struct.add(VdsProperties.Type, vmDevice.getType());
struct.add(VdsProperties.Device, vmDevice.getDevice());
struct.add(VdsProperties.Index, "0"); // IDE slot 2 is reserved by
VDSM to CDROM
- struct.add(VdsProperties.NETWORK_INTERFACE, VdsProperties.Fdc);
+ struct.add(VdsProperties.INTERFACE, VdsProperties.Fdc);
struct.add(VdsProperties.ReadOnly,
String.valueOf(vmDevice.getIsReadOnly()));
struct.add(VdsProperties.Shareable, Boolean.FALSE.toString());
}
@@ -504,7 +504,7 @@
struct.add(VdsProperties.Type, vmDevice.getType());
struct.add(VdsProperties.Device, vmDevice.getDevice());
struct.add(VdsProperties.Index, "2"); // IDE slot 2 is reserved by
VDSM to CDROM
- struct.add(VdsProperties.NETWORK_INTERFACE, VdsProperties.Ide);
+ struct.add(VdsProperties.INTERFACE, VdsProperties.Ide);
struct.add(VdsProperties.ReadOnly, Boolean.TRUE.toString());
struct.add(VdsProperties.Shareable, Boolean.FALSE.toString());
}
--
To view, visit http://gerrit.ovirt.org/13875
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I208f8369084d5a3d42cfb7ebb592569f6063a4d3
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
