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, 17 insertions, 29 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
index 2d6e1a7..195a7b2 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/FlavorForCreateTest.java
@@ -24,7 +24,6 @@ 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 org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -34,26 +33,15 @@ public class FlavorForCreateTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"flavor\" : {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"vcpus\" : \"vcpus\"," + EOL
-        + "    \"ram\" : 38," + EOL
-        + "    \"disk\" : \"disk\"," + EOL
-        + "    \"swap\" : \"swap\"," + EOL
-        + "    \"OS-FLV-EXT-DATA:ephemeral\" : 65," + EOL
-        + "    \"rxtx_factor\" : 11.0" + 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\" : \"vcpus\"," + EOL + "    \"ram\" : 38," + EOL
+            + "    \"disk\" : \"disk\"," + EOL + "    \"swap\" : \"swap\"," + EOL
+            + "    \"OS-FLV-EXT-DATA:ephemeral\" : 65," + EOL + "    \"rxtx_factor\" : 11.0" + 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 {
@@ -69,35 +57,35 @@ public class FlavorForCreateTest {
     public void testMethods() throws Exception {
         FlavorForCreate flavorforcreate = objectMapper.readValue(JSON_FULL, FlavorForCreate.class);
         flavorforcreate.toString();
-        
+
         String disk = flavorforcreate.getDisk();
         Assert.assertNotNull(disk);
         flavorforcreate.setDisk(disk);
-        
+
         String swap = flavorforcreate.getSwap();
         Assert.assertNotNull(swap);
         flavorforcreate.setSwap(swap);
-        
+
         String name = flavorforcreate.getName();
         Assert.assertNotNull(name);
         flavorforcreate.setName(name);
-        
+
         Float rxtxFactor = flavorforcreate.getRxtxFactor();
         Assert.assertNotNull(rxtxFactor);
         flavorforcreate.setRxtxFactor(rxtxFactor);
-        
+
         Integer ephemeral = flavorforcreate.getEphemeral();
         Assert.assertNotNull(ephemeral);
         flavorforcreate.setEphemeral(ephemeral);
-        
+
         String id = flavorforcreate.getId();
         Assert.assertNotNull(id);
         flavorforcreate.setId(id);
-        
+
         String vcpus = flavorforcreate.getVcpus();
         Assert.assertNotNull(vcpus);
         flavorforcreate.setVcpus(vcpus);
-        
+
         Integer ram = flavorforcreate.getRam();
         Assert.assertNotNull(ram);
         flavorforcreate.setRam(ram);