summaryrefslogtreecommitdiffstats
path: root/nova-model
diff options
context:
space:
mode:
authorBoslet, Cory (cb645j) <cb645j@att.com>2020-07-31 15:21:34 -0500
committerBoslet, Cory (cb645j) <cb645j@att.com>2020-07-31 15:53:08 -0500
commitf858db6316657e763046f23560e2f5125ec427cd (patch)
tree28af07bc3ae953d1653cf79456d7f6e48dbda6e1 /nova-model
parent20f44bec2fc42ffe90373e267ac539dd6062d8ad (diff)
Nova client to support getting availability zones and UTs
Issue-ID: SO-3074 Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fb841 Signed-off-by: Boslet, Cory (cb645j) <cb645j@att.com>
Diffstat (limited to 'nova-model')
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java10
-rw-r--r--nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java5
-rw-r--r--nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java7
3 files changed, 5 insertions, 17 deletions
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java
index be30f8a..9f186f1 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java
@@ -30,8 +30,6 @@ public class AvailabilityZone implements Serializable {
@JsonProperty("zoneState")
private AvailabilityZoneState state;
- private String hosts;
-
public String getName() {
return name;
}
@@ -48,12 +46,4 @@ public class AvailabilityZone implements Serializable {
this.state = state;
}
- public String getHosts() {
- return hosts;
- }
-
- public void setHosts(String hosts) {
- this.hosts = hosts;
- }
-
}
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java
index a7adc13..930b40f 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java
@@ -32,8 +32,8 @@ public class AvailabilityZoneTest {
private static final String EOL = System.lineSeparator();
- private static final String JSON_FULL = "{" + EOL + "\"hosts\": null," + EOL + "\"zoneName\": \"zoneName1\"," + EOL
- + "\"zoneState\": {" + EOL + "\"available\": true" + EOL + "}" + EOL + "}";
+ private static final String JSON_FULL = "{" + EOL + "\"zoneName\": \"zoneName1\"," + EOL + "\"zoneState\": {" + EOL
+ + "\"available\": true" + EOL + "}" + EOL + "}";
private ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT)
.enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
@@ -55,6 +55,5 @@ public class AvailabilityZoneTest {
Assert.assertEquals("zoneName1", az.getName());
Assert.assertTrue(az.getState().isAvailable());
- Assert.assertNull(az.getHosts());
}
}
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java
index cebc748..8b6a533 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java
@@ -34,10 +34,9 @@ public class AvailabilityZonesTest {
private static final String EOL = System.lineSeparator();
private static final String JSON_FULL = "{" + EOL + "\"availabilityZoneInfo\": [" + EOL + "{" + EOL
- + "\"hosts\": null," + EOL + "\"zoneName\": \"zoneName1\"," + EOL + "\"zoneState\": {" + EOL
- + "\"available\": true" + EOL + "}" + EOL + "}," + EOL + "{" + EOL + "\"hosts\": null," + EOL
- + "\"zoneName\": \"zoneName2\"," + EOL + "\"zoneState\": {" + EOL + "\"available\": true" + EOL + "}" + EOL
- + "}" + EOL + "]" + EOL + "}";
+ + "\"zoneName\": \"zoneName1\"," + EOL + "\"zoneState\": {" + EOL + "\"available\": true" + EOL + "}" + EOL
+ + "}," + EOL + "{" + EOL + "\"zoneName\": \"zoneName2\"," + EOL + "\"zoneState\": {" + EOL
+ + "\"available\": true" + EOL + "}" + EOL + "}" + EOL + "]" + EOL + "}";
private ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT)
.enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)