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

1 files changed, 0 insertions, 74 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java
deleted file mode 100644
index 12dcc15..0000000
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/AddressesTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-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.Addresses.Address;
-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;
-
-public class AddressesTest {
-
-    private static final String EOL = System.lineSeparator();
-
-    private static final String JSON_FULL = "{" + 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 + "      \"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 + "}";
-
-    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
-            .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-
-    @Test
-    public void testSerialization() throws Exception {
-        System.out.println("CLASS: " + Addresses.class.getName());
-        System.out.println("TEST JSON: " + JSON_FULL);
-        Addresses addresses = objectMapper.readValue(JSON_FULL, Addresses.class);
-        String json = objectMapper.writeValueAsString(addresses);
-        System.out.println("RE-SERIALIZED OBJECT: " + json);
-        JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
-    }
-
-    @Test
-    public void testMethods() throws Exception {
-        Addresses addresses = objectMapper.readValue(JSON_FULL, Addresses.class);
-        addresses.toString();
-
-        Map<String, List<Address>> addressesProperty = addresses.getAddresses();
-        Assert.assertNotNull(addressesProperty);
-        Assert.assertEquals(2, addressesProperty.size());
-    }
-}