Alona Kaplan has uploaded a new change for review.
Change subject: engine,restapi,webadmin: refactor VmNetworkInterface.active to
plugged
......................................................................
engine,restapi,webadmin: refactor VmNetworkInterface.active to plugged
The "active" property on VmNetworkInterface repersents if the vnic is
plugged to the vm, not if the vnic is active.
A vnic is active just if it is plugged, linked and the vm is up.
Change-Id: Ieda87b2045bc247f817db6b305bc0b049e056ae1
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NicMapper.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolInterfaceListModelTable.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListModelTable.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
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/VmInterfaceListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
14 files changed, 26 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/10507/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
index ec9a336..9b1ae32 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
@@ -463,7 +463,7 @@
Map<String, Network> networksByName,
boolean onlyRequiredNetworks) {
boolean networkRequiredOnVds = true;
- if (!vmIface.isActive()) {
+ if (!vmIface.isPlugged()) {
networkRequiredOnVds = false;
} else if (onlyRequiredNetworks) {
networkRequiredOnVds =
networksByName.get(vmIface.getNetworkName()).getCluster().isRequired();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
index 5582ad5..e58e543 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
@@ -43,7 +43,7 @@
getVmNetworkInterfaceDao().save(getParameters().getInterface());
VmDeviceUtils.addNetworkInterfaceDevice(
new VmDeviceId(getParameters().getInterface().getId(),
getParameters().getVmTemplateId()),
- getParameters().getInterface().isActive());
+ getParameters().getInterface().isPlugged());
setSucceeded(true);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
index f4e7928..8274a26 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
@@ -78,7 +78,7 @@
});
boolean succeeded = true;
- if (getParameters().getInterface().isActive()) {
+ if (getParameters().getInterface().isPlugged()) {
succeeded =
activateOrDeactivateNic(getParameters().getInterface().getId(),
PlugAction.PLUG);
}
setSucceeded(succeeded);
@@ -87,7 +87,7 @@
private void addInterfaceDeviceToDb() {
VmDevice vmDevice = VmDeviceUtils.addNetworkInterfaceDevice(
new VmDeviceId(getParameters().getInterface().getId(),
getParameters().getVmId()),
- getParameters().getInterface().isActive());
+ getParameters().getInterface().isPlugged());
getCompensationContext().snapshotNewEntity(vmDevice);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
index 51c9538..2aa5e47 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
@@ -68,9 +68,9 @@
private RequiredAction getRequiredAction() {
if (requiredAction == null) {
- if (!oldIface.isActive() && getInterface().isActive()) {
+ if (!oldIface.isPlugged() && getInterface().isPlugged()) {
requiredAction = RequiredAction.PLUG;
- } else if (oldIface.isActive() && !getInterface().isActive()) {
+ } else if (oldIface.isPlugged() && !getInterface().isPlugged()) {
requiredAction = RequiredAction.UNPLUG;
} else if (liveActionRequired() &&
properiesRequiringVmUpdateDeviceWereUpdated()) {
requiredAction = RequiredAction.UPDATE_VM_DEVICE;
@@ -81,7 +81,7 @@
}
private boolean liveActionRequired() {
- return oldIface.isActive() && getInterface().isActive() &&
getVm().getStatus() == VMStatus.Up;
+ return oldIface.isPlugged() && getInterface().isPlugged() &&
getVm().getStatus() == VMStatus.Up;
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java
index 2c0ba7c..3512f8b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java
@@ -28,8 +28,7 @@
private NGuid vmId;
private String vmName;
private NGuid vmTemplateId;
- /* status of the nic. Active nic is one that is plugged to its VM */
- private boolean active = true;
+ private boolean plugged = true;
/**
* Link State of the Nic. <BR>
@@ -116,12 +115,12 @@
return _changeablePropertiesList;
}
- public boolean isActive() {
- return active;
+ public boolean isPlugged() {
+ return plugged;
}
- public void setActive(boolean active) {
- this.active = active;
+ public void setPlugged(boolean active) {
+ this.plugged = active;
}
public boolean isLinked() {
@@ -169,7 +168,7 @@
.append(", macAddress=")
.append(getMacAddress())
.append(", active=")
- .append(isActive())
+ .append(isPlugged())
.append(", linked=")
.append(isLinked())
.append(", portMirroring=")
@@ -188,7 +187,7 @@
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
- result = prime * result + (active ? 1231 : 1237);
+ result = prime * result + (plugged ? 1231 : 1237);
result = prime * result + (linked ? 1231 : 1237);
result = prime * result + ((vmId == null) ? 0 : vmId.hashCode());
result = prime * result + ((vmName == null) ? 0 : vmName.hashCode());
@@ -208,7 +207,7 @@
return false;
}
VmNetworkInterface other = (VmNetworkInterface) obj;
- if (active != other.active) {
+ if (plugged != other.plugged) {
return false;
}
if (linked != other.linked) {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java
index 1ea952b..8d6ab1c 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java
@@ -38,7 +38,7 @@
entity.setVmName(rs.getString("vm_name"));
entity.setId(Guid.createGuidFromString(rs.getString("id")));
entity.setSpeed((Integer) rs.getObject("speed"));
- entity.setActive(rs.getBoolean("is_plugged"));
+ entity.setPlugged(rs.getBoolean("is_plugged"));
entity.setPortMirroring(rs.getBoolean("port_mirroring"));
entity.setLinked(rs.getBoolean("linked"));
return entity;
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NicMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NicMapper.java
index de6b38e..e703cba 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NicMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NicMapper.java
@@ -34,7 +34,7 @@
}
}
if (model.isSetActive()) {
- entity.setActive(model.isActive());
+ entity.setPlugged(model.isActive());
}
if (model.isSetPortMirroring() &&
model.getPortMirroring().isSetNetworks() &&
model.getPortMirroring().getNetworks().isSetNetworks()) {
@@ -68,7 +68,7 @@
model.getNetwork().setName(entity.getNetworkName());
}
model.setInterface(map(entity.getType()));
- model.setActive(entity.isActive());
+ model.setActive(entity.isPlugged());
return model;
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java
index e42a9a6..41bb960 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java
@@ -26,7 +26,7 @@
}
if (vnic != null) {
- return vnic.isActive() && vnic.isLinked() ?
+ return vnic.isPlugged() && vnic.isLinked() ?
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.upImage()).getHTML())
:
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.downImage()).getHTML());
}
@@ -44,7 +44,7 @@
}
StringBuilder tooltip = new StringBuilder(""); //$NON-NLS-1$
- if (vnic.isActive()) {
+ if (vnic.isPlugged()) {
tooltip =
tooltip.append(templates.cardStatus(constants.pluggedNetworkInteface()).asString());
} else {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolInterfaceListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolInterfaceListModelTable.java
index 39bed14..5447ee8 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolInterfaceListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolInterfaceListModelTable.java
@@ -44,7 +44,7 @@
CheckboxColumn<VmNetworkInterface> pluggedColumn = new
CheckboxColumn<VmNetworkInterface>() {
@Override
public Boolean getValue(VmNetworkInterface object) {
- return object.isActive();
+ return object.isPlugged();
}
@Override
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListModelTable.java
index 351e9a9..011203e 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListModelTable.java
@@ -82,7 +82,7 @@
CheckboxColumn<VmNetworkInterface> pluggedColumn = new
CheckboxColumn<VmNetworkInterface>() {
@Override
public Boolean getValue(VmNetworkInterface object) {
- return object.isActive();
+ return object.isPlugged();
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
index f714165..1fa5ce5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java
@@ -154,7 +154,7 @@
// If the vm is up and the vnic is active- remove enabled just if
hotplug is enabled on the cluster's
// version
- if (!isActivateSupported && pair.getFirst().isActive()
+ if (!isActivateSupported && pair.getFirst().isPlugged()
&& !VMStatus.Down.equals(pair.getSecond().getStatus()))
{
return false;
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 6958215..a85f137 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
@@ -64,7 +64,7 @@
initNetworks();
// Plug should be the last one updated, cause it controls the
changeability of the other editor
- getPlugged().setEntity(getNic().isActive());
+ getPlugged().setEntity(getNic().isPlugged());
if (!hotPlugSupported) {
getPlugged().getChangeProhibitionReasons().add(ConstantsManager.getInstance()
.getMessages()
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
index 8971758..0bebda2 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
@@ -240,7 +240,7 @@
for (VmNetworkInterface nic : nics)
{
- if (nic.isActive())
+ if (nic.isPlugged())
{
return false;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
index 352631f..2570589 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
@@ -396,7 +396,7 @@
}
onSaveMAC(nic);
- nic.setActive((Boolean) getPlugged().getEntity());
+ nic.setPlugged((Boolean) getPlugged().getEntity());
StartProgress(null);
--
To view, visit http://gerrit.ovirt.org/10507
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieda87b2045bc247f817db6b305bc0b049e056ae1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
