summaryrefslogtreecommitdiffstats
path: root/nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java')
-rw-r--r--nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java15
1 files changed, 7 insertions, 8 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 62212ee..87789ff 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
@@ -39,16 +39,15 @@ public class ServerTest {
private static final String JSON_FULL = "{" + EOL + " \"server\" : {" + EOL + " \"id\" : \"id\"," + EOL
+ " \"name\" : \"name\"," + EOL + " \"addresses\" : {" + EOL + " \"addresses-k1\" : [ {" + EOL
- + " \"version\" : \"version\"," + EOL + " \"addr\" : \"addr\"," + EOL
+ + " \"version\" : 4," + EOL + " \"addr\" : \"addr\"," + EOL
+ " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\"," + EOL + " \"OS-EXT-IPS:type\" : \"type\""
- + EOL + " }, {" + EOL + " \"version\" : \"version\"," + EOL
- + " \"addr\" : \"addr\"," + EOL + " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\"," + EOL
- + " \"OS-EXT-IPS:type\" : \"type\"" + EOL + " } ]," + EOL + " \"addresses-k2\" : [ {"
- + EOL + " \"version\" : \"version\"," + EOL + " \"addr\" : \"addr\"," + EOL
+ + EOL + " }, {" + EOL + " \"version\" : 4," + EOL + " \"addr\" : \"addr\"," + EOL
+ " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\"," + EOL + " \"OS-EXT-IPS:type\" : \"type\""
- + EOL + " }, {" + EOL + " \"version\" : \"version\"," + EOL
+ + EOL + " } ]," + EOL + " \"addresses-k2\" : [ {" + EOL + " \"version\" : 4," + EOL
+ " \"addr\" : \"addr\"," + EOL + " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\"," + EOL
- + " \"OS-EXT-IPS:type\" : \"type\"" + EOL + " } ]" + EOL + " }," + EOL
+ + " \"OS-EXT-IPS:type\" : \"type\"" + EOL + " }, {" + EOL + " \"version\" : 4,"
+ + EOL + " \"addr\" : \"addr\"," + EOL + " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\","
+ + EOL + " \"OS-EXT-IPS:type\" : \"type\"" + EOL + " } ]" + EOL + " }," + EOL
+ " \"links\" : [ {" + EOL + " \"rel\" : \"rel\"," + EOL + " \"href\" : \"href\"," + EOL
+ " \"type\" : \"type\"" + EOL + " }, {" + EOL + " \"rel\" : \"rel\"," + EOL
+ " \"href\" : \"href\"," + EOL + " \"type\" : \"type\"" + EOL + " } ]," + EOL
@@ -155,7 +154,7 @@ public class ServerTest {
List<Address> address = addresses.get("addresses-k1");
Assert.assertEquals(2, address.size());
- Assert.assertEquals("version", address.get(0).getVersion());
+ Assert.assertEquals(4, address.get(0).getVersion());
Map<String, String> metadata = server.getMetadata();
Assert.assertNotNull(metadata);