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, 26 insertions, 48 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java
index 63fa405..3a1bfca 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorTest.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,40 +34,20 @@ public class FlavorTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"flavor\" : {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"vcpus\" : 79," + EOL
-        + "    \"ram\" : 38," + EOL
-        + "    \"disk\" : 45," + EOL
-        + "    \"swap\" : \"swap\"," + EOL
-        + "    \"links\" : [ {" + EOL
-        + "      \"rel\" : \"rel\"," + EOL
-        + "      \"href\" : \"href\"," + EOL
-        + "      \"type\" : \"type\"" + EOL
-        + "    }, {" + EOL
-        + "      \"rel\" : \"rel\"," + EOL
-        + "      \"href\" : \"href\"," + EOL
-        + "      \"type\" : \"type\"" + EOL
-        + "    } ]," + EOL
-        + "    \"public\" : false," + EOL
-        + "    \"OS-FLV-EXT-DATA:ephemeral\" : 65," + EOL
-        + "    \"rxtx_factor\" : 11.0," + EOL
-        + "    \"OS-FLV-DISABLED:disabled\" : true," + EOL
-        + "    \"rxtx_quota\" : 42," + EOL
-        + "    \"rxtx_cap\" : 96," + EOL
-        + "    \"os-flavor-access:is_public\" : false" + EOL
-        + "  }" + EOL
-        + "}";
-
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(SerializationFeature.WRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private static final String JSON_FULL = "{" + EOL + "  \"flavor\" : {" + EOL + "    \"id\" : \"id\"," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"vcpus\" : 79," + EOL + "    \"ram\" : 38," + EOL
+            + "    \"disk\" : 45," + EOL + "    \"swap\" : \"swap\"," + EOL + "    \"links\" : [ {" + EOL
+            + "      \"rel\" : \"rel\"," + EOL + "      \"href\" : \"href\"," + EOL + "      \"type\" : \"type\"" + EOL
+            + "    }, {" + EOL + "      \"rel\" : \"rel\"," + EOL + "      \"href\" : \"href\"," + EOL
+            + "      \"type\" : \"type\"" + EOL + "    } ]," + EOL + "    \"public\" : false," + EOL
+            + "    \"OS-FLV-EXT-DATA:ephemeral\" : 65," + EOL + "    \"rxtx_factor\" : 11.0," + EOL
+            + "    \"OS-FLV-DISABLED:disabled\" : true," + EOL + "    \"rxtx_quota\" : 42," + EOL
+            + "    \"rxtx_cap\" : 96," + EOL + "    \"os-flavor-access:is_public\" : false" + EOL + "  }" + EOL + "}";
+
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(SerializationFeature.WRAP_ROOT_VALUE)
+            .enable(DeserializationFeature.UNWRAP_ROOT_VALUE).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -85,52 +63,52 @@ public class FlavorTest {
     public void testMethods() throws Exception {
         Flavor flavor = objectMapper.readValue(JSON_FULL, Flavor.class);
         flavor.toString();
-        
+
         Integer rxtxQuota = flavor.getRxtxQuota();
         Assert.assertNotNull(rxtxQuota);
         flavor.setRxtxQuota(rxtxQuota);
-        
+
         String swap = flavor.getSwap();
         Assert.assertNotNull(swap);
         flavor.setSwap(swap);
-        
+
         Float rxtxFactor = flavor.getRxtxFactor();
         Assert.assertNotNull(rxtxFactor);
         flavor.setRxtxFactor(rxtxFactor);
-        
+
         Integer ephemeral = flavor.getEphemeral();
         Assert.assertNotNull(ephemeral);
         flavor.setEphemeral(ephemeral);
-        
+
         Integer vcpus = flavor.getVcpus();
         Assert.assertNotNull(vcpus);
         flavor.setVcpus(vcpus);
-        
+
         Integer rxtxCap = flavor.getRxtxCap();
         Assert.assertNotNull(rxtxCap);
         flavor.setRxtxCap(rxtxCap);
-        
+
         Integer disk = flavor.getDisk();
         Assert.assertNotNull(disk);
         flavor.setDisk(disk);
-        
+
         String name = flavor.getName();
         Assert.assertNotNull(name);
         flavor.setName(name);
-        
+
         List<Link> links = flavor.getLinks();
         Assert.assertNotNull(links);
         Assert.assertEquals(2, links.size());
         flavor.setLinks(links);
-        
+
         Boolean disabled = flavor.getDisabled();
         Assert.assertNotNull(disabled);
         flavor.setDisabled(disabled);
-        
+
         String id = flavor.getId();
         Assert.assertNotNull(id);
         flavor.setId(id);
-        
+
         Integer ram = flavor.getRam();
         Assert.assertNotNull(ram);
         flavor.setRam(ram);