Vitor de Lima has uploaded a new change for review.
Change subject: core, engine: sPAPR VLAN support
......................................................................
core, engine: sPAPR VLAN support
This adds support for a ppc64-specific network interface called sPAPR
VLAN. There are changes only in the VmInterfaceType Enum and a small
refactoring in the code to allow the interface type passed to libvirt
to be different from the Enum name.
Change-Id: I12b9d760631200a9ae6508ecceb150854b2e9e6b
Signed-off-by: Vitor de Lima <vitor.l...@eldorado.org.br>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java
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/VmInfoBuilder.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
5 files changed, 17 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/19878/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java
index 468f08d..986e706 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java
@@ -10,13 +10,15 @@
* @deprecated
*/
@Deprecated
- rtl8139_pv(0, "Dual mode rtl8139, VirtIO", 1000),
- rtl8139(1, "rtl8139", 100),
- e1000(2, "e1000", 1000),
- pv(3, "VirtIO", 1000);
+ rtl8139_pv(0, "Dual mode rtl8139, VirtIO", "rtl8139_pv", 1000),
+ rtl8139(1, "rtl8139", "rtl8139", 100),
+ e1000(2, "e1000", "e1000", 1000),
+ pv(3, "VirtIO", "pv", 1000),
+ spapr_vlan(4, "sPAPR VLAN", "spapr-vlan", 1000);
private int value;
private String description;
+ private String internalName;
private int speed;
private static final Map<Integer, VmInterfaceType> mappings = new
HashMap<Integer, VmInterfaceType>();
@@ -26,9 +28,10 @@
}
}
- private VmInterfaceType(int value, String description, int speed) {
+ private VmInterfaceType(int value, String description, String
internalName, int speed) {
this.value = value;
this.description = description;
+ this.internalName = internalName;
this.speed = speed;
}
@@ -40,6 +43,10 @@
return description;
}
+ public String getInternalName() {
+ return internalName;
+ }
+
public int getValue() {
return value;
}
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 f76b691..81297cc 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
@@ -47,7 +47,7 @@
addAddress(map, vmDevice.getAddress());
map.put(VdsProperties.SpecParams, vmDevice.getSpecParams());
- map.put(VdsProperties.NIC_TYPE,
VmInterfaceType.forValue(nic.getType()).name());
+ map.put(VdsProperties.NIC_TYPE,
VmInterfaceType.forValue(nic.getType()).getInternalName());
map.put(VdsProperties.DeviceId,
vmDevice.getId().getDeviceId().toString());
if (vmDevice.getBootOrder() > 0) {
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 e0a61dd..0e3975b 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
@@ -344,7 +344,7 @@
addNetworkInterfaceProperties(struct,
vmInterface,
vmDevice,
- ifaceType.toString(),
+ ifaceType.getInternalName(),
vm.getVdsGroupCompatibilityVersion());
}
devices.add(struct);
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
index edc860f..a187845 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
@@ -208,6 +208,8 @@
String VmInterfaceType___pv();
+ String VmInterfaceType___spapr_vlan();
+
String VDSType___VDS();
String VDSType___oVirtNode();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
index dbe5081..cf1a5e7 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
@@ -99,6 +99,7 @@
VmInterfaceType___rtl8139=rtl8139
VmInterfaceType___e1000=e1000
VmInterfaceType___pv=VirtIO
+VmInterfaceType___spapr_vlan=sPAPR VLAN
VDSType___VDS=RHEL
VDSType___oVirtNode=oVirt Node
StorageDomainType___Master=Data (Master)
--
To view, visit http://gerrit.ovirt.org/19878
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12b9d760631200a9ae6508ecceb150854b2e9e6b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vitor de Lima <vitor.l...@eldorado.org.br>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
