diff options
author | 2020-04-03 12:43:24 +0000 | |
---|---|---|
committer | 2020-04-03 12:43:24 +0000 | |
commit | c0a1515f05edb10daa92b08ebe86668d0309d196 (patch) | |
tree | 2e23ff8b7d8f30c371155c0745c139024290139b /nova-model/src/test/java/com/woorea/openstack/nova | |
parent | 720654dcb4ec033cf16892d1aa730100f057ff61 (diff) | |
parent | 1433d54a4dd40ea06c2fc16cc79f1d6ec08d3405 (diff) |
Merge "Fix Parsing issue on nova servers"
Diffstat (limited to 'nova-model/src/test/java/com/woorea/openstack/nova')
-rw-r--r-- | nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java | 4 | ||||
-rw-r--r-- | nova-model/src/test/java/com/woorea/openstack/nova/model/ServersTest.java | 4 |
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("}"); |