Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Accept vlan devices identified by any name ......................................................................
webadmin: Accept vlan devices identified by any name Vlan device name is no longer in the format baseInterface.vlanId. Vlan id and base interface name can be detemined by- vlanDevice.getVlanId(), vlanDevice.getBaseInterface(). Change-Id: Ic871fe32377e1b972315aa9c21d9e5cfabd03a03 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java 4 files changed, 29 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/27154/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index af92ece..b395f7f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -516,7 +516,7 @@ } } } else if (nic instanceof Vlan) { - String nameWithoutVlan = nic.getName().substring(0, nic.getName().lastIndexOf('.')); + String nameWithoutVlan = nic.getBaseInterface(); if (nicToVlans.containsKey(nameWithoutVlan)) { nicToVlans.get(nameWithoutVlan).add((Vlan) nic); } else { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index ad7c314..1824450 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -370,7 +370,7 @@ *****************/ final LogicalNetworkModel logicalNetwork = (LogicalNetworkModel) item; final VdsNetworkInterface entity = - logicalNetwork.hasVlan() ? logicalNetwork.getVlanNic().getEntity() + logicalNetwork.hasVlan() ? logicalNetwork.getVlanNicModel().getEntity() : logicalNetwork.getAttachedToNic().getEntity(); final HostInterfaceModel networkDialogModel; @@ -646,10 +646,9 @@ final String nicName = nic.getName(); final String networkName = nic.getNetworkName(); final String bondName = nic.getBondName(); - final Integer vlanId = nic.getVlanId(); - final int dotpos = nicName.indexOf('.'); + final boolean isVlan = nic.getVlanId() != null; - if (vlanId == null) { // physical interface (rather than virtual VLAN interface) + if (!isVlan) { // physical interface (rather than virtual VLAN interface) physicalNics.add(nic); } @@ -666,8 +665,8 @@ // bridge name is either <nic>, <nic.vlanid> or <bond.vlanid> String ifName; - if (dotpos > 0) { - ifName = nicName.substring(0, dotpos); + if (isVlan) { + ifName = nic.getBaseInterface(); } else { ifName = nicName; } @@ -699,11 +698,12 @@ Collection<LogicalNetworkModel> nicNetworks = new ArrayList<LogicalNetworkModel>(); nicNetworks.add(networkModel); - // set iface bridge to network - NetworkInterfaceModel existingEridge = networkModel.getVlanNic(); - assert existingEridge == null : "should have only one bridge, but found " + existingEridge; //$NON-NLS-1$ - networkModel.setBridge(new NetworkInterfaceModel(nic, nicNetworks, null, this)); - + // set vlan device on the network + if (networkModel.hasVlan()) { + NetworkInterfaceModel existingEridge = networkModel.getVlanNicModel(); + assert existingEridge == null : "should have only one bridge, but found " + existingEridge; //$NON-NLS-1$ + networkModel.setVlanNicModel(new NetworkInterfaceModel(nic, nicNetworks, null, this)); + } nicToNetwork.get(ifName).add(networkModel); if (!networkModel.isInSync() && networkModel.isManaged()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java index ff2785d..6af4a54 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/LogicalNetworkModel.java @@ -22,7 +22,7 @@ private boolean attachedViaLabel; private String errorMessage; private NetworkInterfaceModel attachedToNic; - private NetworkInterfaceModel vlanNic; + private NetworkInterfaceModel vlanNicModel; public LogicalNetworkModel(HostSetupNetworksModel setupModel) { super(setupModel); @@ -80,6 +80,7 @@ VdsNetworkInterface bridge = new VdsNetworkInterface(); bridge.setName(targetNic.getName() + "." + getVlanId()); //$NON-NLS-1$ bridge.setNetworkName(getName()); + bridge.setBaseInterface(targetNic.getName()); bridge.setVlanId(getVlanId()); bridge.setMtu(getEntity().getMtu()); bridge.setVdsId(targetNicEntity.getVdsId()); @@ -131,10 +132,10 @@ netParams.setSubnet(nicEntity.getSubnet()); netParams.setGateway(nicEntity.getGateway()); } else { - netParams.setBootProtocol(vlanNic.getEntity().getBootProtocol()); - netParams.setAddress(vlanNic.getEntity().getAddress()); - netParams.setSubnet(vlanNic.getEntity().getSubnet()); - netParams.setGateway(vlanNic.getEntity().getGateway()); + netParams.setBootProtocol(vlanNicModel.getEntity().getBootProtocol()); + netParams.setAddress(vlanNicModel.getEntity().getAddress()); + netParams.setSubnet(vlanNicModel.getEntity().getSubnet()); + netParams.setGateway(vlanNicModel.getEntity().getGateway()); } getSetupModel().getNetworkToLastDetachParams().put(getName(), netParams); @@ -147,7 +148,7 @@ nicEntity.setGateway(null); nicEntity.setNetworkImplementationDetails(null); } - setBridge(null); + setVlanNicModel(null); // is this a management nic? if (nicEntity.getIsManagement()) { nicEntity.setType(0); @@ -174,8 +175,8 @@ return attachedToNic; } - public NetworkInterfaceModel getVlanNic() { - return vlanNic; + public NetworkInterfaceModel getVlanNicModel() { + return vlanNicModel; } @Override @@ -230,8 +231,8 @@ return selected; } - public void setBridge(NetworkInterfaceModel bridge) { - this.vlanNic = bridge; + public void setVlanNicModel(NetworkInterfaceModel vlanNicmodel) { + this.vlanNicModel = vlanNicmodel; } public void setManagement(boolean management) { @@ -257,7 +258,7 @@ return null; } - VdsNetworkInterface nic = hasVlan() ? getVlanNic().getEntity() : getAttachedToNic().getEntity(); + VdsNetworkInterface nic = hasVlan() ? getVlanNicModel().getEntity() : getAttachedToNic().getEntity(); return nic.getNetworkImplementationDetails(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java index 059ec19..3a45acc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java @@ -124,7 +124,8 @@ // If a vlan device with the same name as the new one already exists- remove it while (i.hasNext()) { VdsNetworkInterface nic = i.next(); - if (nic.getName().equals(vlanBridge.getName())) { + if (vlanBridge.getVlanId().equals(nic.getVlanId())) { + vlanBridge.setName(nic.getName()); i.remove(); break; } @@ -509,10 +510,9 @@ private static void detachNetwork(List<VdsNetworkInterface> allNics, LogicalNetworkModel networkToDetach) { - // get the bridge and remove it - NetworkInterfaceModel bridge = networkToDetach.getVlanNic(); - if (bridge.getName().indexOf('.') > 0) { - allNics.remove(bridge.getEntity()); + // remove the vlan device + if (networkToDetach.hasVlan()) { + allNics.remove(networkToDetach.getVlanNicModel().getEntity()); } networkToDetach.detach(); } -- To view, visit http://gerrit.ovirt.org/27154 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic871fe32377e1b972315aa9c21d9e5cfabd03a03 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
