Alona Kaplan has uploaded a new change for review.
Change subject: restapi: Adding "MIGRATION" role as a network usage.
......................................................................
restapi: Adding "MIGRATION" role as a network usage.
Migration role on a NetworkCluster indicates the migration of vm's
in the cluster will be done via this network.
Change-Id: If001d1388e3054f9f6215e3cb3d2f23cc84de05f
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkUsage.java
5 files changed, 56 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/13178/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java
index 527eede..788f2f7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java
@@ -4,7 +4,6 @@
import java.util.List;
import org.junit.Ignore;
-
import org.ovirt.engine.api.model.Network;
import static
org.ovirt.engine.api.restapi.resource.AbstractBackendNetworksResourceTest.setUpEntityExpectations;
@@ -27,23 +26,34 @@
return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
index);
}
- protected org.ovirt.engine.core.common.businessentities.network.Network
getEntity(int index, boolean isDisplay, boolean isRequired) {
- return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
isDisplay, isRequired, index);
+ protected org.ovirt.engine.core.common.businessentities.network.Network
getEntity(int index,
+ boolean isDisplay,
+ boolean isMigration,
+ boolean isRequired) {
+ return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
+ isDisplay,
+ isMigration,
+ isRequired,
+ index);
}
protected
List<org.ovirt.engine.core.common.businessentities.network.Network>
getEntityList() {
- return getEntities(false, false);
+ return getEntities(false, false, false);
}
- protected
List<org.ovirt.engine.core.common.businessentities.network.Network>
getEntityList(boolean isDisplay, boolean isRequired) {
- return getEntities(isDisplay, isRequired);
+ protected
List<org.ovirt.engine.core.common.businessentities.network.Network>
getEntityList(boolean isDisplay,
+ boolean isMigration,
+ boolean isRequired) {
+ return getEntities(isDisplay, isMigration, isRequired);
}
- private
List<org.ovirt.engine.core.common.businessentities.network.Network>
getEntities(boolean isDisplay, boolean isRequired) {
+ private
List<org.ovirt.engine.core.common.businessentities.network.Network>
getEntities(boolean isDisplay,
+ boolean isMigration,
+ boolean isRequired) {
List<org.ovirt.engine.core.common.businessentities.network.Network>
entities = new
ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>();
for (int i = 0; i < NAMES.length; i++) {
if (isDisplay) {
- entities.add(getEntity(i, isDisplay, isRequired));
+ entities.add(getEntity(i, isDisplay, isMigration, isRequired));
} else {
entities.add(getEntity(i));
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
index b2cbf29..8c5f2fb 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
@@ -48,17 +48,34 @@
return entities;
}
- protected org.ovirt.engine.core.common.businessentities.network.Network
getEntity(int index, boolean isDisplay, boolean isRequired) {
- return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
isDisplay, isRequired, index);
+ protected org.ovirt.engine.core.common.businessentities.network.Network
getEntity(int index,
+ boolean isDisplay,
+ boolean isMigration,
+ boolean isRequired) {
+ return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
+ isDisplay,
+ isMigration,
+ isRequired,
+ index);
}
+ @Override
protected org.ovirt.engine.core.common.businessentities.network.Network
getEntity(int index) {
- return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
false, false, index);
+ return
setUpEntityExpectations(control.createMock(org.ovirt.engine.core.common.businessentities.network.Network.class),
+ false,
+ false,
+ false,
+ index);
}
- static org.ovirt.engine.core.common.businessentities.network.Network
setUpEntityExpectations(org.ovirt.engine.core.common.businessentities.network.Network
entity, boolean isDisplay, boolean isRequired, int index) {
+ static org.ovirt.engine.core.common.businessentities.network.Network
setUpEntityExpectations(org.ovirt.engine.core.common.businessentities.network.Network
entity,
+ boolean isDisplay,
+ boolean isMigration,
+ boolean isRequired,
+ int index) {
NetworkCluster networkCluster = new NetworkCluster();
networkCluster.setDisplay(isDisplay);
+ networkCluster.setMigration(isMigration);
networkCluster.setRequired(isRequired);
expect(entity.getCluster()).andReturn(networkCluster).anyTimes();
return setUpEntityExpectations(entity, index);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java
index 870d65b..c8a7aa8 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java
@@ -57,7 +57,7 @@
@Test
public void testGet() throws Exception {
setUriInfo(setUpBasicUriExpectations());
- setUpEntityQueryExpectations(1, false, false);
+ setUpEntityQueryExpectations(1, false, false, false);
control.replay();
verifyModel(resource.get(), 1);
@@ -65,8 +65,8 @@
@Test
public void testUpdate() throws Exception {
- setUpEntityQueryExpectations(1, false, false);
- setUpEntityQueryExpectations(1, true, true);
+ setUpEntityQueryExpectations(1, false, false, false);
+ setUpEntityQueryExpectations(1, true, true, true);
setUpVDSGroupExpectations(GUIDS[1]);
setUriInfo(setUpActionExpectations(VdcActionType.UpdateNetworkOnCluster,
NetworkClusterParameters.class,
@@ -102,18 +102,20 @@
assertTrue(model.isSetUsages());
assertNotNull(model.getUsages().getUsages());
assertTrue(model.getUsages().getUsages().contains(NetworkUsage.DISPLAY.value()));
+
assertTrue(model.getUsages().getUsages().contains(NetworkUsage.MIGRATION.value()));
assertTrue(model.isSetRequired());
assertEquals(model.isRequired(), true);
}
- protected void setUpEntityQueryExpectations(int times, boolean isDisplay,
boolean isRequired) throws Exception {
+ protected void setUpEntityQueryExpectations(int times, boolean isDisplay,
boolean isMigration, boolean isRequired)
+ throws Exception {
while (times-- > 0) {
setUpEntityQueryExpectations(VdcQueryType.GetAllNetworksByClusterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { CLUSTER_ID },
- getEntityList(isDisplay, isRequired));
+ getEntityList(isDisplay, isMigration,
isRequired));
}
}
}
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
index a0b716f..1c7ff44 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
@@ -58,6 +58,7 @@
networkUsages.add(NetworkUsage.fromValue(usage));
}
entity.getCluster().setDisplay(networkUsages.contains(NetworkUsage.DISPLAY));
+
entity.getCluster().setMigration(networkUsages.contains(NetworkUsage.MIGRATION));
entity.setVmNetwork(networkUsages.contains(NetworkUsage.VM));
}
if (model.isSetMtu()) {
@@ -102,8 +103,13 @@
if (entity.isVmNetwork()) {
model.getUsages().getUsages().add(NetworkUsage.VM.value());
}
- if (entity.getCluster() != null && entity.getCluster().isDisplay()) {
- model.getUsages().getUsages().add(NetworkUsage.DISPLAY.value());
+ if (entity.getCluster() != null) {
+ if (entity.getCluster().isDisplay()) {
+
model.getUsages().getUsages().add(NetworkUsage.DISPLAY.value());
+ }
+ if (entity.getCluster().isMigration()) {
+
model.getUsages().getUsages().add(NetworkUsage.MIGRATION.value());
+ }
}
if (entity.getCluster() != null) {
if (entity.getCluster().getStatus() != null) {
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkUsage.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkUsage.java
index 3cf82ea..fcf5170a 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkUsage.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkUsage.java
@@ -2,7 +2,8 @@
public enum NetworkUsage {
DISPLAY,
- VM;
+ VM,
+ MIGRATION;
public String value() {
return name().toLowerCase();
--
To view, visit http://gerrit.ovirt.org/13178
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If001d1388e3054f9f6215e3cb3d2f23cc84de05f
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
