summaryrefslogtreecommitdiffstats
path: root/nova-model/src/test/java/com/woorea
diff options
context:
space:
mode:
authorSmokowski, Steve (ss835w) <ss835w@us.att.com>2020-04-02 16:19:51 -0400
committerSmokowski, Steve (ss835w) <ss835w@us.att.com>2020-04-03 08:05:23 -0400
commit1433d54a4dd40ea06c2fc16cc79f1d6ec08d3405 (patch)
treeca24e61fec6cbd9e6bf1eef0fa796306e791a07d /nova-model/src/test/java/com/woorea
parent1389746c1a81aca1b82a5e1e43d25a2d6e8c9229 (diff)
Fix Parsing issue on nova servers
Issue-ID: SO-2663 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com> Change-Id: I6b689ccb0baf6d87980e8439a11ecc5879951fa3
Diffstat (limited to 'nova-model/src/test/java/com/woorea')
-rw-r--r--nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java4
-rw-r--r--nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
index 290f4a5..a12536f 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
@@ -128,7 +128,7 @@ public class ServerTest {
+ " \"OS-EXT-AZ:availability_zone\" : \"availabilityzone\"," + EOL
+ " \"OS-SRV-USG:launched_at\" : \"launchedat\"," + EOL
+ " \"OS-SRV-USG:terminated_at\" : \"terminatedat\"," + EOL
- + " \"os-extended-volumes:volumes_attached\" : [ \"osextendedvolumesattached-v1\", \"osextendedvolumesattached-v2\" ]"
+ + " \"os-extended-volumes:volumes_attached\" : [ { \"id\":\"osextendedvolumesattached-v1\"},{\"id\": \"osextendedvolumesattached-v2\"} ]"
+ EOL + " }" + EOL + "}";
private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
@@ -221,7 +221,7 @@ public class ServerTest {
String instanceName = server.getInstanceName();
Assert.assertNotNull(instanceName);
- List<String> osExtendedVolumesAttached = server.getOsExtendedVolumesAttached();
+ List<IdResourceEntity> osExtendedVolumesAttached = server.getOsExtendedVolumesAttached();
Assert.assertNotNull(osExtendedVolumesAttached);
Assert.assertEquals(2, osExtendedVolumesAttached.size());
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
index bbf80ff..0e3f766 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java
@@ -260,7 +260,7 @@ public class ServersTest {
sb.append(" \"OS-SRV-USG:launched_at\" : \"launchedat\"," + EOL);
sb.append(" \"OS-SRV-USG:terminated_at\" : \"terminatedat\"," + EOL);
sb.append(
- " \"os-extended-volumes:volumes_attached\" : [ \"osextendedvolumesattached-v1\", \"osextendedvolumesattached-v2\" ]"
+ " \"os-extended-volumes:volumes_attached\" : [ { \"id\":\"osextendedvolumesattached-v1\"},{\"id\": \"osextendedvolumesattached-v2\"} ]"
+ EOL);
sb.append(" }, {" + EOL);
sb.append(" \"id\" : \"id\"," + EOL);
@@ -481,7 +481,7 @@ public class ServersTest {
sb.append(" \"OS-SRV-USG:launched_at\" : \"launchedat\"," + EOL);
sb.append(" \"OS-SRV-USG:terminated_at\" : \"terminatedat\"," + EOL);
sb.append(
- " \"os-extended-volumes:volumes_attached\" : [ \"osextendedvolumesattached-v1\", \"osextendedvolumesattached-v2\" ]"
+ " \"os-extended-volumes:volumes_attached\" : [ { \"id\":\"osextendedvolumesattached-v1\"},{\"id\": \"osextendedvolumesattached-v2\"} ]"
+ EOL);
sb.append(" } ]" + EOL);
sb.append("}");