Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: Add management member to NetworkCluster business entity class ......................................................................
engine: Add management member to NetworkCluster business entity class Add management member to NetworkCluster business entity class. Change-Id: I9d9e4bedec143511da8ffc0034f9109908af8b96 Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java 5 files changed, 49 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/32772/6 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java index 35868ef..f0bada2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java @@ -62,7 +62,7 @@ if (net != null) { DbFacade.getInstance().getNetworkClusterDao().save( new NetworkCluster(getParameters().getVdsGroup().getId(), net.getId(), - NetworkStatus.OPERATIONAL, true, true, true)); + NetworkStatus.OPERATIONAL, true, true, true, false)); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index ac00408..eb758b4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -124,7 +124,8 @@ NetworkStatus.OPERATIONAL, true, true, - true)); + true, + false)); } alertIfFencingDisabled(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index f67c919..8f706e3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -194,6 +194,7 @@ NetworkStatus.OPERATIONAL, false, networkCluster.isRequired(), + false, false)); if (network.getCluster().isDisplay()) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java index 57b8dce..b89830c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java @@ -21,7 +21,9 @@ // Cluster attachment data can sometimes be missing, so use defaults in that case. net.getCluster() == null ? false : net.getCluster().isDisplay(), net.getCluster() == null ? true : net.getCluster().isRequired(), - net.getCluster() == null ? false : net.getCluster().isMigration())); + net.getCluster() == null ? false : net.getCluster().isMigration(), + net.getCluster() == null ? false : net.getCluster().isManagement())); + _network = net; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java index da42b82..ea80fb7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java @@ -17,9 +17,10 @@ */ private boolean required; private boolean migration; + private boolean management; public NetworkCluster() { - this (null, null, NetworkStatus.NON_OPERATIONAL, false, true, false); + this(null, null, NetworkStatus.NON_OPERATIONAL, false, true, false, false); } public NetworkCluster(boolean required) { @@ -27,11 +28,12 @@ } public NetworkCluster(Guid clusterId, - Guid networkId, - NetworkStatus status, - boolean display, - boolean required, - boolean migration) { + Guid networkId, + NetworkStatus status, + boolean display, + boolean required, + boolean migration, + boolean management) { this(required); id = new NetworkClusterId(); id.setClusterId(clusterId); @@ -39,6 +41,7 @@ this.status = status; this.display = display; this.migration = migration; + this.management = management; } @Override @@ -101,6 +104,14 @@ this.migration = migration; } + public boolean isManagement() { + return management; + } + + public void setManagement(boolean management) { + this.management = management; + } + @Override public Object getQueryableId() { return getId(); @@ -119,6 +130,8 @@ .append(isRequired()) .append(", migration=") .append(isMigration()) + .append(", management=") + .append(isManagement()) .append("}"); return builder.toString(); } @@ -132,36 +145,51 @@ result = prime * result + ((id == null) ? 0 : id.hashCode()); result = prime * result + (required ? 11 : 13); result = prime * result + (migration ? 1231 : 1237); + result = prime * result + (management ? 1231 : 1237); return result; } @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } + NetworkCluster other = (NetworkCluster) obj; - if (display != other.display) + + if (display != other.display) { return false; + } if (status == null) { - if (other.status != null) + if (other.status != null) { return false; - } else if (!status.equals(other.status)) + } + } else if (!status.equals(other.status)) { return false; + } if (id == null) { - if (other.id != null) + if (other.id != null) { return false; - } else if (!id.equals(other.id)) + } + } else if (!id.equals(other.id)) { return false; + } if (required != other.required) { return false; } if (migration != other.migration) { return false; } + if (management != other.management) { + return false; + } + return true; } } -- To view, visit http://gerrit.ovirt.org/32772 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d9e4bedec143511da8ffc0034f9109908af8b96 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: Alona Kaplan <[email protected]> Gerrit-Reviewer: Lior Vernia <[email protected]> Gerrit-Reviewer: Moti Asayag <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
