Lior Vernia has uploaded a new change for review. Change subject: webadmin: Don't add VNICs to a VM by default ......................................................................
webadmin: Don't add VNICs to a VM by default VNICs used to be added to VMs created from VNIC-less templates by default, to accommodate assigning some sort of network connection to a VM when creating it. This is no longer needed, as VNICs can now be added and removed by the user in the same dialog. Change-Id: I2d00fd6a4fb280d9604bc1ae586fcc588d4a7196 Bug-Url: https://bugzilla.redhat.com/1003779 Bug-Url: https://bugzilla.redhat.com/1009298 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 2 files changed, 15 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/19532/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index e11bdb4..c1acd90 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -218,20 +218,6 @@ query); } - @Override - protected void assignVnicProfiles(ProfileBehavior behavior, List argNics, List profiles) { - List<VmNetworkInterface> nics = (argNics == null) ? new ArrayList<VmNetworkInterface>() : argNics; - - if (nics.isEmpty() && profilesExist(profiles)) { - // create a default if none provided AND if there are profiles to choose from - VmNetworkInterface networkInterface = new VmNetworkInterface(); - networkInterface.setName(AsyncDataProvider.getNewNicName(null)); - nics.add(networkInterface); - } - - super.assignVnicProfiles(behavior, nics, profiles); - } - private boolean profilesExist(List<VnicProfileView> profiles) { return !profiles.isEmpty() && profiles.get(0) != null; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index a897f69..ec9d90c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -1013,7 +1013,7 @@ }), id); } - protected void updateNetworkInterfaces(final ProfileBehavior behavior, final List<VmNetworkInterface> nics) { + protected void updateNetworkInterfaces(final ProfileBehavior behavior, final List<VmNetworkInterface> argNics) { boolean hotUpdateSupported = (Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.NetworkLinkingSupported, getModel().getSelectedCluster().getcompatibility_version().toString()); @@ -1022,31 +1022,24 @@ @Override public void onSuccess(Object model, Object returnValue) { - assignVnicProfiles(behavior, nics, (List<VnicProfileView>) returnValue); - } + List<VnicProfileView> profiles = (List<VnicProfileView>) returnValue; + List<VnicInstanceType> vnicInstanceTypes = new ArrayList<VnicInstanceType>(); + List<VmNetworkInterface> nics = (argNics == null) ? new ArrayList<VmNetworkInterface>() : argNics; + for (VmNetworkInterface nic : nics) { + final VnicInstanceType vnicInstanceType = new VnicInstanceType(nic); + vnicInstanceType.setItems(profiles); + behavior.initSelectedProfile(vnicInstanceType, vnicInstanceType.getNetworkInterface()); + vnicInstanceTypes.add(vnicInstanceType); + } + + getModel().getVnicProfiles().setItems(profiles); + getModel().getNicsWithLogicalNetworks().setItems(vnicInstanceTypes); + getModel().getNicsWithLogicalNetworks().setSelectedItem(Linq.firstOrDefault(vnicInstanceTypes)); + } }); behavior.initProfiles(hotUpdateSupported, getModel().getSelectedCluster().getId(), getModel().getSelectedDataCenter().getId(), query); - } - - protected void assignVnicProfiles(ProfileBehavior behavior, List<VmNetworkInterface> nics, List<VnicProfileView> profiles) { - if (nics == null || nics.isEmpty()) { - return; - } - - List<VnicInstanceType> vnicInstanceTypes = new ArrayList<VnicInstanceType>(); - - for (VmNetworkInterface nic : nics) { - final VnicInstanceType vnicInstanceType = new VnicInstanceType(nic); - vnicInstanceType.setItems(profiles); - behavior.initSelectedProfile(vnicInstanceType, vnicInstanceType.getNetworkInterface()); - vnicInstanceTypes.add(vnicInstanceType); - } - - getModel().getVnicProfiles().setItems(profiles); - getModel().getNicsWithLogicalNetworks().setItems(vnicInstanceTypes); - getModel().getNicsWithLogicalNetworks().setSelectedItem(Linq.firstOrDefault(vnicInstanceTypes)); } public void updateSingleQxl(boolean visible) { -- To view, visit http://gerrit.ovirt.org/19532 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d00fd6a4fb280d9604bc1ae586fcc588d4a7196 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
