Moti Asayag has uploaded a new change for review. Change subject: engine: Standardize network properties within VdsProperties ......................................................................
engine: Standardize network properties within VdsProperties The patch organizes VdsProperties networks properties and use standardize their name. It also removes few duplications and unused properties. Change-Id: Icd593cfd0f2bbae077dba5bb01783366bcfd7feb Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java 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/HotPlugNicVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.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 M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java 11 files changed, 99 insertions(+), 102 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/10609/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java index e90ac40..67653ee 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AddNetworkVDSCommand.java @@ -32,28 +32,28 @@ switch (getParameters().getBootProtocol()) { case DHCP: - options.put(VdsProperties.bootproto, VdsProperties.dhcp); + options.put(VdsProperties.BOOT_PROTOCOL, VdsProperties.DHCP); break; case STATIC_IP: if (!StringUtils.isEmpty(getParameters().getInetAddr())) { - options.put(VdsProperties.ipaddr, getParameters().getInetAddr()); + options.put(VdsProperties.IP_ADDRESS, getParameters().getInetAddr()); } if (!StringUtils.isEmpty(getParameters().getNetworkMask())) { - options.put(VdsProperties.netmask, getParameters().getNetworkMask()); + options.put(VdsProperties.NETMASK, getParameters().getNetworkMask()); } if (!StringUtils.isEmpty(getParameters().getGateway())) { - options.put(VdsProperties.gateway, getParameters().getGateway()); + options.put(VdsProperties.GATEWAY, getParameters().getGateway()); } break; } - options.put(VdsProperties.stp, (getParameters().getStp()) ? "yes" : "no"); + options.put(VdsProperties.STP, (getParameters().getStp()) ? "yes" : "no"); if (!StringUtils.isEmpty(getParameters().getBondingOptions())) { - options.put(VdsProperties.bonding_opts, getParameters().getBondingOptions()); + options.put(VdsProperties.BONDING_OPTIONS, getParameters().getBondingOptions()); } - options.put(VdsProperties.stp, (getParameters().getStp()) ? "yes" : "no"); + options.put(VdsProperties.STP, (getParameters().getStp()) ? "yes" : "no"); // options[VdsProperties.force] = "true"; options.put("bridged", Boolean.toString(getParameters().isVmNetwork())); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java index eb415fb..6d8055a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/EditNetworkVDSCommand.java @@ -26,26 +26,26 @@ switch (getParameters().getBootProtocol()) { case DHCP: - options.put(VdsProperties.bootproto, VdsProperties.dhcp); + options.put(VdsProperties.BOOT_PROTOCOL, VdsProperties.DHCP); break; case STATIC_IP: if (!StringUtils.isEmpty(getParameters().getInetAddr())) { - options.put(VdsProperties.ipaddr, getParameters().getInetAddr()); + options.put(VdsProperties.IP_ADDRESS, getParameters().getInetAddr()); } if (!StringUtils.isEmpty(getParameters().getNetworkMask())) { - options.put(VdsProperties.netmask, getParameters().getNetworkMask()); + options.put(VdsProperties.NETMASK, getParameters().getNetworkMask()); } if (!StringUtils.isEmpty(getParameters().getGateway())) { - options.put(VdsProperties.gateway, getParameters().getGateway()); + options.put(VdsProperties.GATEWAY, getParameters().getGateway()); } break; } if (!StringUtils.isEmpty(getParameters().getBondingOptions())) { - options.put(VdsProperties.bonding_opts, getParameters().getBondingOptions()); + options.put(VdsProperties.BONDING_OPTIONS, getParameters().getBondingOptions()); } - options.put(VdsProperties.stp, (getParameters().getStp()) ? "yes" : "no"); + options.put(VdsProperties.STP, (getParameters().getStp()) ? "yes" : "no"); options.put("bridged", Boolean.toString(getParameters().isVmNetwork())); Network network = getParameters().getNetwork(); @@ -55,8 +55,8 @@ // options[VdsProperties.force] = "true"; if (getParameters().getCheckConnectivity()) { - options.put(VdsProperties.connectivityCheck, "true"); - options.put(VdsProperties.connectivityTimeout, + options.put(VdsProperties.CONNECTIVITY_CHECK, "true"); + options.put(VdsProperties.CONNECTIVITY_TIMEOUT, (new Integer(getParameters().getConnectionTimeout())).toString()); } 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 51b1345..39c4ca8 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.Iface, disk.getDiskInterface().toString().toLowerCase()); + drive.add(VdsProperties.NETWORK_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/HotPlugNicVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java index 28f43a9..eb6163e 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 @@ -39,15 +39,15 @@ 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, StringUtils.defaultString(nic.getNetworkName())); + map.add(VdsProperties.MAC_ADDR, nic.getMacAddress()); + map.add(VdsProperties.NETWORK, StringUtils.defaultString(nic.getNetworkName())); if (FeatureSupported.networkLinking(getParameters().getVm().getVdsGroupCompatibilityVersion())) { - map.add(VdsProperties.linkActive, String.valueOf(nic.isLinked())); + map.add(VdsProperties.LINK_ACTIVE, String.valueOf(nic.isLinked())); } addAddress(map, vmDevice.getAddress()); map.add(VdsProperties.SpecParams, vmDevice.getSpecParams()); - map.add(VdsProperties.nic_type, VmInterfaceType.forValue(nic.getType()).name()); + map.add(VdsProperties.NIC_TYPE, VmInterfaceType.forValue(nic.getType()).name()); map.add(VdsProperties.DeviceId, vmDevice.getId().getDeviceId().toString()); if (vmDevice.getBootOrder() > 0) { @@ -55,7 +55,7 @@ } if (nic.isPortMirroring()) { - map.add(VdsProperties.portMirroring, nic.getNetworkName() == null + map.add(VdsProperties.PORT_MIRRORING, nic.getNetworkName() == null ? Collections.<String> emptyList() : Collections.singletonList(nic.getNetworkName())); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index 4500882..035b014 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -67,7 +67,7 @@ opts.put("bridged", Boolean.toString(net.isVmNetwork())); if (net.isVmNetwork()) { - opts.put(VdsProperties.stp, net.getStp() ? "yes" : "no"); + opts.put(VdsProperties.STP, net.getStp() ? "yes" : "no"); } networks.add(net.getName(), opts); @@ -107,11 +107,11 @@ private XmlRpcStruct generateOptions() { XmlRpcStruct options = new XmlRpcStruct(); - options.add(VdsProperties.connectivityCheck, Boolean.toString(getParameters().isCheckConnectivity())); + options.add(VdsProperties.CONNECTIVITY_CHECK, Boolean.toString(getParameters().isCheckConnectivity())); // VDSM uses the connectivity timeout only if 'connectivityCheck' is set to true if (getParameters().isCheckConnectivity()) { - options.add(VdsProperties.connectivityTimeout, getParameters().getConectivityTimeout()); + options.add(VdsProperties.CONNECTIVITY_TIMEOUT, getParameters().getConectivityTimeout()); } return options; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.java index d0e7bbe..20ee97b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UpdateVmInterfaceVDSCommand.java @@ -25,9 +25,9 @@ deviceStruct.add(VdsProperties.Alias, getParameters().getVmDevice().getAlias()); VmNetworkInterface nic = getParameters().getNic(); - deviceStruct.add(VdsProperties.network, StringUtils.defaultString(nic.getNetworkName())); - deviceStruct.add(VdsProperties.linkActive, String.valueOf(nic.isLinked())); - deviceStruct.add(VdsProperties.portMirroring, + deviceStruct.add(VdsProperties.NETWORK, StringUtils.defaultString(nic.getNetworkName())); + deviceStruct.add(VdsProperties.LINK_ACTIVE, String.valueOf(nic.isLinked())); + deviceStruct.add(VdsProperties.PORT_MIRRORING, nic.isPortMirroring() && nic.getNetworkName() != null ? Collections.singletonList(nic.getNetworkName()) : Collections.<String> emptyList()); 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 9dc3eee..fd9eded 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 @@ -205,7 +205,7 @@ initAppsList(xmlRpcStruct, vm); vm.setguest_os(AssignStringValue(xmlRpcStruct, VdsProperties.guest_os)); - vm.setvm_ip(AssignStringValue(xmlRpcStruct, VdsProperties.vm_ip)); + vm.setvm_ip(AssignStringValue(xmlRpcStruct, VdsProperties.VM_IP)); if (vm.getvm_ip() != null) { if (vm.getvm_ip().startsWith("127.0.")) { vm.setvm_ip(null); @@ -261,8 +261,8 @@ vm.setelapsed_time(AssignDoubleValue(xmlRpcStruct, VdsProperties.elapsed_time)); // ------------- vm network statistics ----------------------- - if (xmlRpcStruct.containsKey(VdsProperties.vm_network)) { - Map networkStruct = (Map) xmlRpcStruct.getItem(VdsProperties.vm_network); + if (xmlRpcStruct.containsKey(VdsProperties.VM_NETWORK)) { + Map networkStruct = (Map) xmlRpcStruct.getItem(VdsProperties.VM_NETWORK); vm.setInterfaceStatistics(new ArrayList<VmNetworkInterface>()); for (Object tempNic : networkStruct.values()) { XmlRpcStruct nic = new XmlRpcStruct((Map) tempNic); @@ -281,9 +281,9 @@ stats.getStatistics().setReceiveDropRate(rx_dropped != null ? rx_dropped : 0); stats.getStatistics().setTransmitRate(tx_rate != null ? tx_rate : 0); stats.getStatistics().setTransmitDropRate(tx_dropped != null ? tx_dropped : 0); - stats.setMacAddress((String) ((nic.getItem(VdsProperties.mac_addr) instanceof String) ? nic - .getItem(VdsProperties.mac_addr) : null)); - stats.setSpeed(AssignIntValue(nic, VdsProperties.if_speed)); + stats.setMacAddress((String) ((nic.getItem(VdsProperties.MAC_ADDR) instanceof String) ? nic + .getItem(VdsProperties.MAC_ADDR) : null)); + stats.setSpeed(AssignIntValue(nic, VdsProperties.INTERFACE_SPEED)); } } @@ -504,7 +504,7 @@ // ------------- vds network statistics --------------------- Map<String, Object> interfaces = (Map<String, Object>) ((xmlRpcStruct - .getItem(VdsProperties.network) instanceof Map) ? xmlRpcStruct.getItem(VdsProperties.network) + .getItem(VdsProperties.NETWORK) instanceof Map) ? xmlRpcStruct.getItem(VdsProperties.NETWORK) : null); if (interfaces != null) { int networkUsage = 0; @@ -531,7 +531,7 @@ iface.getStatistics().setReceiveDropRate(rx_dropped != null ? rx_dropped : 0); iface.getStatistics().setTransmitRate(tx_rate != null ? tx_rate : 0); iface.getStatistics().setTransmitDropRate(tx_dropped != null ? tx_dropped : 0); - iface.setSpeed(AssignIntValue(dict, VdsProperties.if_speed)); + iface.setSpeed(AssignIntValue(dict, VdsProperties.INTERFACE_SPEED)); iface.getStatistics().setStatus(AssignInterfaceStatusValue(dict, VdsProperties.iface_status)); int hold = @@ -925,7 +925,7 @@ Map<String, Integer> networkVlans) { // Networks collection (name point to list of nics or bonds) - Map<String, Object> networks = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.network_networks); + Map<String, Object> networks = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.NETWORKS); if (networks != null) { vds.getNetworks().clear(); @@ -1007,8 +1007,8 @@ net.setAddr((String) network.get("addr")); net.setSubnet((String) network.get("netmask")); net.setGateway((String) network.get(VdsProperties.GLOBAL_GATEWAY)); - if (StringUtils.isNotBlank((String) network.get(VdsProperties.mtu))) { - net.setMtu(Integer.parseInt((String) network.get(VdsProperties.mtu))); + if (StringUtils.isNotBlank((String) network.get(VdsProperties.MTU))) { + net.setMtu(Integer.parseInt((String) network.get(VdsProperties.MTU))); } return net; } @@ -1028,7 +1028,7 @@ } private static void addHostBondDevices(VDS vds, XmlRpcStruct xmlRpcStruct) { - Map<String, Object> bonds = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.network_bondings); + Map<String, Object> bonds = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.NETWORK_BONDINGS); if (bonds != null) { for (Entry<String, Object> entry : bonds.entrySet()) { VdsNetworkInterface iface = new VdsNetworkInterface(); @@ -1051,8 +1051,8 @@ addBondDeviceToHost(vds, iface, (Object[]) bond.get("slaves")); } - if (StringUtils.isNotBlank((String) bond.get(VdsProperties.mtu))) { - iface.setMtu(Integer.parseInt((String) bond.get(VdsProperties.mtu))); + if (StringUtils.isNotBlank((String) bond.get(VdsProperties.MTU))) { + iface.setMtu(Integer.parseInt((String) bond.get(VdsProperties.MTU))); } Map<String, Object> config = @@ -1081,7 +1081,7 @@ Map<String, Integer> currVlans = new HashMap<String, Integer>(); // vlans - Map<String, Object> vlans = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.network_vlans); + Map<String, Object> vlans = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.NETWORK_VLANS); if (vlans != null) { for (Entry<String, Object> entry : vlans.entrySet()) { VdsNetworkInterface iface = new VdsNetworkInterface(); @@ -1105,8 +1105,8 @@ iface.setAddress((String) vlan.get("addr")); iface.setSubnet((String) vlan.get("netmask")); - if (StringUtils.isNotBlank((String) vlan.get(VdsProperties.mtu))) { - iface.setMtu(Integer.parseInt((String) vlan.get(VdsProperties.mtu))); + if (StringUtils.isNotBlank((String) vlan.get(VdsProperties.MTU))) { + iface.setMtu(Integer.parseInt((String) vlan.get(VdsProperties.MTU))); } iStats.setVdsId(vds.getId()); @@ -1126,7 +1126,7 @@ * A nested map contains network interfaces data */ private static void addHostNetworkInterfaces(VDS vds, XmlRpcStruct xmlRpcStruct) { - Map<String, Object> nics = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.network_nics); + Map<String, Object> nics = (Map<String, Object>) xmlRpcStruct.getItem(VdsProperties.NETWORK_NICS); if (nics != null) { for (String key : nics.keySet()) { VdsNetworkInterface iface = new VdsNetworkInterface(); @@ -1166,8 +1166,8 @@ if (nic.get("permhwaddr") != null) { iface.setMacAddress((String) nic.get("permhwaddr")); } - if (StringUtils.isNotBlank((String) nic.get(VdsProperties.mtu))) { - iface.setMtu(Integer.parseInt((String) nic.get(VdsProperties.mtu))); + if (StringUtils.isNotBlank((String) nic.get(VdsProperties.MTU))) { + iface.setMtu(Integer.parseInt((String) nic.get(VdsProperties.MTU))); } addBootProtocol((Map<String, Object>) nic.get("cfg"), iface); } @@ -1268,7 +1268,7 @@ } if (bootproto == NetworkBootProtocol.STATIC_IP) { - String gateway = (String) cfg.get(VdsProperties.gateway); + String gateway = (String) cfg.get(VdsProperties.GATEWAY); if (StringUtils.isNotEmpty(gateway)) { setGatewayIfManagementNetwork(iface, gateway.toString()); } 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 64e34c6..9226521 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 @@ -66,21 +66,44 @@ public static final String vm_migrating = "vmMigrating"; public static final String images_last_check = "imagesLastCheck"; public static final String images_last_delay = "imagesLastDelay"; - public static final String network = "network"; - public static final String linkActive = "linkActive"; - public static final String bootproto = "BOOTPROTO"; - public static final String stp = "STP"; - public static final String mtu = "mtu"; - public static final String bonding_opts = "BONDING_OPTS"; - public static final String dhcp = "dhcp"; - public static final String force = "force"; - public static final String connectivityCheck = "connectivityCheck"; - public static final String connectivityTimeout = "connectivityTimeout"; - public static final String ipaddr = "IPADDR"; - public static final String netmask = "NETMASK"; - public static final String gateway = "GATEWAY"; + + // Network related properties + public static final String NETWORK = "network"; + public static final String LINK_ACTIVE = "linkActive"; + public static final String BOOT_PROTOCOL = "BOOTPROTO"; + public static final String STP = "STP"; + public static final String MTU = "mtu"; + public static final String BONDING_OPTIONS = "BONDING_OPTS"; + public static final String DHCP = "dhcp"; + public static final String FORCE = "force"; + public static final String CONNECTIVITY_CHECK = "connectivityCheck"; + public static final String CONNECTIVITY_TIMEOUT = "connectivityTimeout"; + public static final String IP_ADDRESS = "IPADDR"; + public static final String NETMASK = "NETMASK"; + public static final String GATEWAY = "GATEWAY"; public static final String GLOBAL_GATEWAY = "gateway"; - public static final String displaynetwork = "displayNetwork"; + public static final String DISPLAY_NETWORK = "displayNetwork"; + public static final String VM_NETWORK = "network"; + public static final String VM_INTERFACE_NAME = "name"; + public static final String INTERFACE_SPEED = "speed"; + public static final String VM_NETWORK_INTERFACE = "nic"; + public static final String NETWORK_NICS = "nics"; + public static final String NETWORK_VLANS = "vlans"; + public static final String NETWORKS = "networks"; + 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"; + public static final String VM_INTERFACE_MAC_ADDRESS = "hw"; + public static final String NIC_TYPE = "nicModel"; + public static final String PORT_MIRRORING = "portMirroring"; + public static final String BRIDGE = "bridge"; + public static final String NW_FILTER = "filter"; + public static final String MAC_ADDR = "macAddr"; + public static final String supported_cluster_levels = "clusterLevels"; public static final String supported_engines = "supportedENGINEs"; public static final String emulatedMachine = "emulatedMachine"; @@ -116,27 +139,10 @@ public static final String anonymous_transparent_huge_pages = "anonHugePages"; public static final String transparent_huge_pages = "transparentHugePages"; - public static final String vm_network = "network"; - public static final String VM_INTERFACE_NAME = "name"; - public static final String if_speed = "speed"; public static final String exit_code = "exitCode"; public static final String exit_message = "exitMessage"; public static final String multimedia_ports = "multimediaPorts"; public static final String monitorResponse = "monitorResponse"; - - // Network related - public static final String VM_NETWORK_INTERFACE = "nic"; - public static final String network_nics = "nics"; - public static final String network_vlans = "vlans"; - public static final String network_networks = "networks"; - public static final String network_bondings = "bondings"; - public static final String NETWORK_BRIDGES = "bridges"; - public static final String network_lastclientinterface = "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"; - public static final String VM_INTERFACE_MAC_ADDRESS = "hw"; // Disks usage configuration public static final String VM_DISKS_USAGE = "disksUsage"; @@ -154,10 +160,6 @@ public static final String image_group_id = "imageID"; // vm configuration (i.e. VmStatic) public static final String mem_size_mb = "memSize"; - public static final String nic_type = "nicModel"; - public static final String portMirroring = "portMirroring"; - public static final String bridge = "bridge"; - public static final String NW_FILTER = "filter"; public static final String num_of_monitors = "spiceMonitors"; public static final String num_of_cpus = "smp"; public static final String cores_per_socket = "smpCoresPerSocket"; @@ -167,12 +169,8 @@ public static final String smartcardEnabled = "smartcardEnable"; // vm configuration (i.e. VmDynamic) public static final String guest_cur_user_name = "username"; - public static final String vm_ip = "guestIPs"; + public static final String VM_IP = "guestIPs"; public static final String vm_usage_mem_percent = "memUsage"; - public static final String vm_if_id = "ifid"; // currently not in use - public static final String vm_if_name = "name"; - public static final String vm_line_rate = "speed"; - public static final String mac_addr = "macAddr"; public static final String vm_host = "guestName"; public static final String app_list = "appsList"; public static final String guest_os = "guestOs"; @@ -223,7 +221,6 @@ public static final String DeviceType = "deviceType"; public static final String Devices = "devices"; public static final String Index = "index"; - public static final String Iface = "iface"; public static final String PoolId = "poolID"; public static final String DomainId = "domainID"; public static final String ImageId = "imageID"; 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 c62f14c..5f2e4e1 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.Iface, "ide"); + struct.add(VdsProperties.NETWORK_INTERFACE, "ide"); break; case VirtIO: - struct.add(VdsProperties.Iface, VdsProperties.Virtio); + struct.add(VdsProperties.NETWORK_INTERFACE, VdsProperties.Virtio); break; default: // ISCI not supported @@ -469,24 +469,24 @@ Version clusterVersion) { struct.add(VdsProperties.Type, vmDevice.getType()); struct.add(VdsProperties.Device, vmDevice.getDevice()); - struct.add(VdsProperties.network, StringUtils.defaultString(vmInterface.getNetworkName())); + struct.add(VdsProperties.NETWORK, StringUtils.defaultString(vmInterface.getNetworkName())); if (FeatureSupported.networkLinking(clusterVersion)) { - struct.add(VdsProperties.linkActive, String.valueOf(vmInterface.isLinked())); + struct.add(VdsProperties.LINK_ACTIVE, String.valueOf(vmInterface.isLinked())); } addAddress(vmDevice, struct); - struct.add(VdsProperties.mac_addr, vmInterface.getMacAddress()); + struct.add(VdsProperties.MAC_ADDR, vmInterface.getMacAddress()); addBootOrder(vmDevice, struct); struct.add(VdsProperties.SpecParams, vmDevice.getSpecParams()); struct.add(VdsProperties.DeviceId, String.valueOf(vmDevice.getId().getDeviceId())); - struct.add(VdsProperties.nic_type, nicModel); + struct.add(VdsProperties.NIC_TYPE, nicModel); if (vmInterface.isPortMirroring()) { List<String> networks = new ArrayList<String>(); if (vmInterface.getNetworkName() != null) { networks.add(vmInterface.getNetworkName()); } - struct.add(VdsProperties.portMirroring, networks); + struct.add(VdsProperties.PORT_MIRRORING, networks); } addNetworkFiltersToNic(struct, clusterVersion); @@ -502,7 +502,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.Iface, VdsProperties.Fdc); + struct.add(VdsProperties.NETWORK_INTERFACE, VdsProperties.Fdc); struct.add(VdsProperties.ReadOnly, String.valueOf(vmDevice.getIsReadOnly())); struct.add(VdsProperties.Shareable, Boolean.FALSE.toString()); } @@ -511,7 +511,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.Iface, VdsProperties.Ide); + struct.add(VdsProperties.NETWORK_INTERFACE, VdsProperties.Ide); struct.add(VdsProperties.ReadOnly, Boolean.TRUE.toString()); struct.add(VdsProperties.Shareable, Boolean.FALSE.toString()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java index d7b4a63..d64fa93 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java @@ -136,7 +136,7 @@ } } if (net != null) { - createInfo.add(VdsProperties.displaynetwork, net.getName()); + createInfo.add(VdsProperties.DISPLAY_NETWORK, net.getName()); } } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java index 1871834..d57cdb6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java @@ -169,9 +169,9 @@ } } if (!StringUtils.isEmpty(macs.toString().trim())) { - createInfo.add(VdsProperties.mac_addr, macs.toString()); - createInfo.add(VdsProperties.nic_type, nics.toString()); - createInfo.add(VdsProperties.bridge, networks.toString()); + createInfo.add(VdsProperties.MAC_ADDR, macs.toString()); + createInfo.add(VdsProperties.NIC_TYPE, nics.toString()); + createInfo.add(VdsProperties.BRIDGE, networks.toString()); } } -- To view, visit http://gerrit.ovirt.org/10609 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd593cfd0f2bbae077dba5bb01783366bcfd7feb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
