Moti Asayag has uploaded a new change for review. Change subject: webadmin: Use Vnic parameters plug property ......................................................................
webadmin: Use Vnic parameters plug property The patch uses the explicit plug property as part of the command rather as a replacement of the VmNetworkInterface and its plugged property by the Vnic class. Change-Id: I8cce1a1956e7736ecaf9d33d3825c2f2075c318a Signed-off-by: Moti Asayag <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java 3 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/17364/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java index 09aab0e..9584f7c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java @@ -1,8 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; - import java.util.List; + import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -121,6 +121,8 @@ @Override protected VdcActionParametersBase createVdcActionParameters(VmNetworkInterface nicToSave) { - return new AddVmInterfaceParameters(getVm().getId(), nicToSave); + AddVmInterfaceParameters parameters = new AddVmInterfaceParameters(getVm().getId(), nicToSave); + parameters.setPlugged(nicToSave.isPlugged()); + return parameters; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java index b320bb3..6d556b3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -108,7 +109,9 @@ @Override protected VdcActionParametersBase createVdcActionParameters(VmNetworkInterface nicToSave) { - return new AddVmInterfaceParameters(getVm().getId(), nicToSave); + AddVmInterfaceParameters parameters = new AddVmInterfaceParameters(getVm().getId(), nicToSave); + parameters.setPlugged(nicToSave.isPlugged()); + return parameters; } protected VmNetworkInterface getNic() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java index 7358f96..5e43d6f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -79,7 +80,9 @@ if (sameNic && assignedProfileChanged) { created.setVnicProfileId(edited.getNetworkInterface().getVnicProfileId()); - parameters.add(new AddVmInterfaceParameters(vmId, created)); + AddVmInterfaceParameters params = new AddVmInterfaceParameters(vmId, created); + params.setPlugged(created.isPlugged()); + parameters.add(params); break; } } @@ -139,7 +142,10 @@ ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); for (VnicInstanceType vnicInstanceType : vnicInstanceTypes) { - parameters.add(new AddVmInterfaceParameters(vmId, vnicInstanceType.getNetworkInterface())); + AddVmInterfaceParameters params = + new AddVmInterfaceParameters(vmId, vnicInstanceType.getNetworkInterface()); + params.setPlugged(vnicInstanceType.getNetworkInterface().isPlugged()); + parameters.add(params); } return parameters; } -- To view, visit http://gerrit.ovirt.org/17364 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cce1a1956e7736ecaf9d33d3825c2f2075c318a 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
