Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: restapi: Add management value to NetworkUsage enum
......................................................................
restapi: Add management value to NetworkUsage enum
Add management value to NetworkUsage enum and pass mapp that
in the NetworkMapper + test.
Change-Id: I6b197e613b78f1f34b8052544bf06e4108c3183f
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
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
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
3 files changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/33714/14
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 37b35cc..acdb805 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
@@ -61,6 +61,7 @@
}
entity.getCluster().setDisplay(networkUsages.contains(NetworkUsage.DISPLAY));
entity.getCluster().setMigration(networkUsages.contains(NetworkUsage.MIGRATION));
+
entity.getCluster().setManagement(networkUsages.contains(NetworkUsage.MANAGEMENT));
entity.setVmNetwork(networkUsages.contains(NetworkUsage.VM));
}
if (model.isSetMtu()) {
@@ -110,6 +111,9 @@
if (entity.getCluster().isMigration()) {
model.getUsages().getUsages().add(NetworkUsage.MIGRATION.value());
}
+ if (entity.getCluster().isManagement()) {
+
model.getUsages().getUsages().add(NetworkUsage.MANAGEMENT.value());
+ }
if (entity.getCluster().getStatus() != null) {
model.setStatus(StatusUtils.create(map(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 fcf5170a..9332431 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
@@ -3,7 +3,8 @@
public enum NetworkUsage {
DISPLAY,
VM,
- MIGRATION;
+ MIGRATION,
+ MANAGEMENT;
public String value() {
return name().toLowerCase();
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
index 99290e3..13f4574 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
@@ -1,11 +1,17 @@
package org.ovirt.engine.api.restapi.types;
+import java.util.HashSet;
+import java.util.Set;
+
import org.ovirt.engine.api.common.util.StatusUtils;
import org.ovirt.engine.api.model.Network;
import org.ovirt.engine.api.model.NetworkStatus;
import org.ovirt.engine.api.model.Usages;
-public class NetworkMapperTest extends AbstractInvertibleMappingTest<Network,
org.ovirt.engine.core.common.businessentities.network.Network,
org.ovirt.engine.core.common.businessentities.network.Network> {
+public class NetworkMapperTest extends AbstractInvertibleMappingTest<
+ Network,
+
org.ovirt.engine.core.common.businessentities.network.Network,
+
org.ovirt.engine.core.common.businessentities.network.Network> {
public NetworkMapperTest() {
super(Network.class,
@@ -29,6 +35,11 @@
assertNotNull(transform.getVlan());
assertEquals(model.getVlan().getId(), transform.getVlan().getId());
assertEquals(model.isStp(), transform.isStp());
+ final Set<String> usagesSet = new
HashSet<>(model.getUsages().getUsages());
+ assertTrue(usagesSet.contains(NetworkUsage.DISPLAY.value()));
+ assertTrue(usagesSet.contains(NetworkUsage.MIGRATION.value()));
+ assertTrue(usagesSet.contains(NetworkUsage.MANAGEMENT.value()));
+ assertTrue(usagesSet.contains(NetworkUsage.VM.value()));
}
@Override
@@ -36,6 +47,10 @@
model.setStatus(StatusUtils.create(MappingTestHelper.shuffle(NetworkStatus.class)));
model.setUsages(new Usages());
model.getUsages().getUsages().add("aaa");
+ model.getUsages().getUsages().add(NetworkUsage.DISPLAY.value());
+ model.getUsages().getUsages().add(NetworkUsage.MIGRATION.value());
+ model.getUsages().getUsages().add(NetworkUsage.MANAGEMENT.value());
+ model.getUsages().getUsages().add(NetworkUsage.VM.value());
return super.postPopulate(model);
}
}
--
To view, visit http://gerrit.ovirt.org/33714
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b197e613b78f1f34b8052544bf06e4108c3183f
Gerrit-PatchSet: 14
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
