diff options
| author |   Benjamin, Max (mb388a) <mb388a@att.com> | 2020-04-03 12:23:50 -0400 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2020-04-03 13:57:25 -0400 |
| commit | d313b58558c9c6d30ea66132b16949b7f7063cc3 (patch) | |
| tree | f839b02dea4b78dca4f06f8e4ae2a2063df5ffe0 /nova-model/src/test/java/com/woorea/openstack/nova/model/ServerTest.java | |
| parent | c0a1515f05edb10daa92b08ebe86668d0309d196 (diff) | |
Addresses are not properly formatted
updated the format of addresses
updated unit test
Issue-ID: SO-2786
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I5b6d67ca95f33752360cfc2210420bfe2341058e
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.java | 31 |
1 files changed, 17 insertions, 14 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 a12536f..62212ee 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 @@ -20,36 +20,35 @@ package com.woorea.openstack.nova.model; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.woorea.openstack.nova.model.Server.Addresses; -import com.woorea.openstack.nova.model.Server.Fault; import java.util.List; import java.util.Map; import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.woorea.openstack.nova.model.Server.Addresses.Address; +import com.woorea.openstack.nova.model.Server.Fault; public class ServerTest { private static final String EOL = System.lineSeparator(); private static final String JSON_FULL = "{" + EOL + " \"server\" : {" + EOL + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"," + EOL + " \"addresses\" : {" + EOL + " \"addresses\" : {" + EOL - + " \"addresses-k1\" : [ {" + EOL + " \"version\" : \"version\"," + EOL - + " \"addr\" : \"addr\"," + EOL + " \"OS-EXT-IPS-MAC:mac_addr\" : \"macaddr\"," + EOL - + " \"OS-EXT-IPS:type\" : \"type\"" + EOL + " }, {" + EOL + + " \"name\" : \"name\"," + EOL + " \"addresses\" : {" + EOL + " \"addresses-k1\" : [ {" + 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\" : \"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 + " \"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 + " }" + EOL + " }," + 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 @@ -151,9 +150,13 @@ public class ServerTest { Server server = objectMapper.readValue(JSON_FULL, Server.class); server.toString(); - Addresses addresses = server.getAddresses(); + Map<String, List<Address>> addresses = server.getAddresses(); Assert.assertNotNull(addresses); + List<Address> address = addresses.get("addresses-k1"); + Assert.assertEquals(2, address.size()); + Assert.assertEquals("version", address.get(0).getVersion()); + Map<String, String> metadata = server.getMetadata(); Assert.assertNotNull(metadata); Assert.assertEquals(2, metadata.size()); |