Enhance Openstack Client

Update Openstack Client to support additional fields
Updat all formatting issues

Issue-ID: SO-1844

Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

1 files changed, 20 insertions, 39 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
index 6fba9c2..1bbaa97 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregatesTest.java
@@ -24,9 +24,7 @@ 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 java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -36,41 +34,23 @@ public class HostAggregatesTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"aggregates\" : [ {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"deleted\" : false," + EOL
-        + "    \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL
-        + "    \"metadata\" : {" + EOL
-        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
-        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
-        + "    }," + EOL
-        + "    \"availability_zone\" : \"availabilityzone\"," + EOL
-        + "    \"created_at\" : \"createdat\"," + EOL
-        + "    \"updated_at\" : \"updatedat\"," + EOL
-        + "    \"deleted_at\" : \"deletedat\"" + EOL
-        + "  }, {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"deleted\" : false," + EOL
-        + "    \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL
-        + "    \"metadata\" : {" + EOL
-        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
-        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
-        + "    }," + EOL
-        + "    \"availability_zone\" : \"availabilityzone\"," + EOL
-        + "    \"created_at\" : \"createdat\"," + EOL
-        + "    \"updated_at\" : \"updatedat\"," + EOL
-        + "    \"deleted_at\" : \"deletedat\"" + EOL
-        + "  } ]" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"aggregates\" : [ {" + EOL + "    \"id\" : 1," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"deleted\" : false," + EOL
+            + "    \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL + "    \"metadata\" : {" + EOL
+            + "      \"metadata-k1\" : \"metadata-v1\"," + EOL + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
+            + "    }," + EOL + "    \"availability_zone\" : \"availabilityzone\"," + EOL
+            + "    \"created_at\" : \"createdat\"," + EOL + "    \"updated_at\" : \"updatedat\"," + EOL
+            + "    \"deleted_at\" : \"deletedat\"" + EOL + "  }, {" + EOL + "    \"id\" : 2," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"deleted\" : false," + EOL
+            + "    \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL + "    \"metadata\" : {" + EOL
+            + "      \"metadata-k1\" : \"metadata-v1\"," + EOL + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
+            + "    }," + EOL + "    \"availability_zone\" : \"availabilityzone\"," + EOL
+            + "    \"created_at\" : \"createdat\"," + EOL + "    \"updated_at\" : \"updatedat\"," + EOL
+            + "    \"deleted_at\" : \"deletedat\"" + 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);
+    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 {
@@ -86,13 +66,14 @@ public class HostAggregatesTest {
     public void testMethods() throws Exception {
         HostAggregates hostaggregates = objectMapper.readValue(JSON_FULL, HostAggregates.class);
         hostaggregates.toString();
-        
+
         List<HostAggregate> list = hostaggregates.getList();
         Assert.assertNotNull(list);
         Assert.assertEquals(2, list.size());
-        
+
         int cnt = 0;
-        for (@SuppressWarnings("unused") HostAggregate x : hostaggregates) {
+        for (@SuppressWarnings("unused")
+        HostAggregate x : hostaggregates) {
             ++cnt;
         }
         Assert.assertEquals(2, cnt);