Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: engine: rename AddClusterOperationParameters
......................................................................
engine: rename AddClusterOperationParameters
Rename AddClusterOperationParameters class to
ManagementNetworkOnClusterOperationParameters. The new named class will
be used in UpdateVdsGroupCommand so its previous name wouldn't suit
that.
Change-Id: If331d3fd347612242d7287df03b349ed6b93380a
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddClusterOperationParameters.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ManagementNetworkOnClusterOperationParameters.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
9 files changed, 48 insertions(+), 48 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/37731/1
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 fc40073..5d744f2 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
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.FeatureSupported;
import org.ovirt.engine.core.common.VdcObjectType;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
@@ -25,7 +25,7 @@
import org.ovirt.engine.core.dao.network.NetworkClusterDao;
import org.ovirt.engine.core.dao.network.NetworkDao;
-public class AddVdsGroupCommand<T extends AddClusterOperationParameters>
+public class AddVdsGroupCommand<T extends
ManagementNetworkOnClusterOperationParameters>
extends VdsGroupOperationCommandBase<T> {
public static final String DefaultNetworkDescription = "Management
Network";
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddClusterOperationParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddClusterOperationParameters.java
deleted file mode 100644
index 13c8277..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddClusterOperationParameters.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.ovirt.engine.core.common.action;
-
-import org.ovirt.engine.core.common.businessentities.VDSGroup;
-import org.ovirt.engine.core.compat.Guid;
-
-public class AddClusterOperationParameters extends VdsGroupOperationParameters
{
-
- private static final long serialVersionUID = 1L;
-
- private Guid managementNetworkId;
-
- public AddClusterOperationParameters(VDSGroup cluster) {
- this(cluster, null);
- }
-
- public AddClusterOperationParameters(VDSGroup cluster, Guid
managementNetworkId) {
- super(cluster);
-
- this.managementNetworkId = managementNetworkId;
- }
-
- public Guid getManagementNetworkId() {
- return managementNetworkId;
- }
-
- public AddClusterOperationParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ManagementNetworkOnClusterOperationParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ManagementNetworkOnClusterOperationParameters.java
new file mode 100644
index 0000000..ff0a3b5
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ManagementNetworkOnClusterOperationParameters.java
@@ -0,0 +1,28 @@
+package org.ovirt.engine.core.common.action;
+
+import org.ovirt.engine.core.common.businessentities.VDSGroup;
+import org.ovirt.engine.core.compat.Guid;
+
+public class ManagementNetworkOnClusterOperationParameters extends
VdsGroupOperationParameters {
+
+ private static final long serialVersionUID = 1L;
+
+ private Guid managementNetworkId;
+
+ public ManagementNetworkOnClusterOperationParameters(VDSGroup cluster) {
+ this(cluster, null);
+ }
+
+ public ManagementNetworkOnClusterOperationParameters(VDSGroup cluster,
Guid managementNetworkId) {
+ super(cluster);
+
+ this.managementNetworkId = managementNetworkId;
+ }
+
+ public Guid getManagementNetworkId() {
+ return managementNetworkId;
+ }
+
+ public ManagementNetworkOnClusterOperationParameters() {
+ }
+}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
index 6629aea..13eac67 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
@@ -10,7 +10,7 @@
import org.ovirt.engine.api.resource.ClusterResource;
import org.ovirt.engine.api.resource.ClustersResource;
import org.ovirt.engine.api.restapi.utils.GuidUtils;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.StoragePool;
@@ -111,7 +111,7 @@
return managementNetworkId;
}
- protected AddClusterOperationParameters createAddCommandParams(Cluster
cluster, StoragePool dataCenter) {
+ protected ManagementNetworkOnClusterOperationParameters
createAddCommandParams(Cluster cluster, StoragePool dataCenter) {
VDSGroup clusterEntity = map(cluster, map(dataCenter));
if (!(cluster.isSetErrorHandling() &&
cluster.getErrorHandling().isSetOnError())) {
@@ -120,7 +120,7 @@
final Guid managementNetworkId = getManagementNetworkId(cluster,
dataCenter.getId());
- return new AddClusterOperationParameters(clusterEntity,
managementNetworkId);
+ return new
ManagementNetworkOnClusterOperationParameters(clusterEntity,
managementNetworkId);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
index 31fc494..ccae3ee 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.api.model.Cluster;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Version;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.StoragePool;
@@ -103,7 +103,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {
"VdsGroup.CompatibilityVersion" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 2) },
true,
@@ -134,7 +134,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {
"VdsGroup.CompatibilityVersion" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 3) },
true,
@@ -177,7 +177,7 @@
setUpStoragePool(-1));
setUriInfo(setUpActionExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {},
new Object[] {},
canDo,
@@ -204,7 +204,7 @@
setUpStoragePool(1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {},
new Object[] {},
true,
@@ -244,7 +244,7 @@
setUpStoragePool(1));
setUriInfo(setUpActionExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {},
new Object[] {},
canDo,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
index 8f2757b..d6872fb 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
@@ -11,7 +11,7 @@
import org.ovirt.engine.api.model.Cluster;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Version;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.StoragePool;
@@ -113,7 +113,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {
"VdsGroup.CompatibilityVersion" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 2) },
true,
@@ -144,7 +144,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- AddClusterOperationParameters.class,
+
ManagementNetworkOnClusterOperationParameters.class,
new String[] {
"VdsGroup.CompatibilityVersion" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 3) },
true,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
index fb8ee03..f9401cf 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
@@ -4,8 +4,8 @@
import java.util.List;
import java.util.Map;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
import org.ovirt.engine.core.common.action.AddVdsActionParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -731,7 +731,7 @@
model.startProgress(null);
Frontend.getInstance().runAction(model.getIsNew() ?
VdcActionType.AddVdsGroup : VdcActionType.UpdateVdsGroup,
- model.getIsNew() ? new AddClusterOperationParameters(cluster) :
+ model.getIsNew() ? new
ManagementNetworkOnClusterOperationParameters(cluster) :
new VdsGroupOperationParameters(cluster),
new IFrontendActionAsyncCallback() {
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 44d08e8..7945545 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -5,7 +5,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.AddSANStorageDomainParameters;
import org.ovirt.engine.core.common.action.AddVdsActionParameters;
import org.ovirt.engine.core.common.action.ApproveVdsParameters;
@@ -1348,7 +1348,7 @@
model.startProgress(null);
- Frontend.getInstance().runAction(VdcActionType.AddVdsGroup, new
AddClusterOperationParameters(cluster),
+ Frontend.getInstance().runAction(VdcActionType.AddVdsGroup, new
ManagementNetworkOnClusterOperationParameters(cluster),
new IFrontendActionAsyncCallback() {
@Override
public void executed(FrontendActionAsyncResult result) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
index 6598f77..3a2d56f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.ui.uicommonweb.models.hosts;
-import org.ovirt.engine.core.common.action.AddClusterOperationParameters;
+import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
@@ -100,7 +100,7 @@
cluster.setTransparentHugepages(version.compareTo(new
Version("3.0")) >= 0); //$NON-NLS-1$
cluster.setCompatibilityVersion(version);
cluster.setMigrateOnError(clusterModel.getMigrateOnErrorOption());
- VdsGroupOperationParameters parameters = new
AddClusterOperationParameters(cluster);
+ VdsGroupOperationParameters parameters = new
ManagementNetworkOnClusterOperationParameters(cluster);
parameters.setCorrelationId(getCorrelationId());
Frontend.getInstance().runAction(VdcActionType.AddVdsGroup,
parameters,
new IFrontendActionAsyncCallback() {
--
To view, visit http://gerrit.ovirt.org/37731
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If331d3fd347612242d7287df03b349ed6b93380a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
