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, 30 insertions, 47 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
index bf1a7e1..053821c 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeTest.java
@@ -24,10 +24,9 @@ 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.Date;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -37,38 +36,22 @@ public class VolumeTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"volume\" : {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"status\" : \"status\"," + EOL
-        + "    \"availabilityZone\" : \"availabilityzone\"," + EOL
-        + "    \"volumeType\" : \"volumetype\"," + EOL
-        + "    \"snapshotId\" : \"snapshotid\"," + EOL
-        + "    \"attachments\" : [ {" + EOL
-        + "      \"attachments-v1-k1\" : \"attachments-v1-v1\"," + EOL
-        + "      \"attachments-v1-k2\" : \"attachments-v1-v2\"" + EOL
-        + "    }, {" + EOL
-        + "      \"attachments-v2-k1\" : \"attachments-v2-v1\"," + EOL
-        + "      \"attachments-v2-k2\" : \"attachments-v2-v2\"" + EOL
-        + "    } ]," + EOL
-        + "    \"metadata\" : {" + EOL
-        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
-        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
-        + "    }," + EOL
-        + "    \"createdAt\" : \"createdat\"," + EOL
-        + "    \"size\" : 61," + EOL
-        + "    \"displayName\" : \"name\"," + EOL
-        + "    \"displayDescription\" : \"description\"" + 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 + "  \"volume\" : {" + EOL + "    \"id\" : \"id\"," + EOL
+            + "    \"status\" : \"status\"," + EOL + "    \"availabilityZone\" : \"availabilityzone\"," + EOL
+            + "    \"volumeType\" : \"volumetype\"," + EOL + "    \"snapshotId\" : \"snapshotid\"," + EOL
+            + "    \"attachments\" : [ {" + EOL + "      \"attachments-v1-k1\" : \"attachments-v1-v1\"," + EOL
+            + "      \"attachments-v1-k2\" : \"attachments-v1-v2\"" + EOL + "    }, {" + EOL
+            + "      \"attachments-v2-k1\" : \"attachments-v2-v1\"," + EOL
+            + "      \"attachments-v2-k2\" : \"attachments-v2-v2\"" + EOL + "    } ]," + EOL + "    \"metadata\" : {"
+            + EOL + "      \"metadata-k1\" : \"metadata-v1\"," + EOL + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
+            + "    }," + EOL + "    \"createdAt\" : \"createdat\"," + EOL + "    \"size\" : 61," + EOL
+            + "    \"displayName\" : \"name\"," + EOL + "    \"displayDescription\" : \"description\"" + 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 {
@@ -84,39 +67,39 @@ public class VolumeTest {
     public void testMethods() throws Exception {
         Volume volume = objectMapper.readValue(JSON_FULL, Volume.class);
         volume.toString();
-        
+
         String volumeType = volume.getVolumeType();
         Assert.assertNotNull(volumeType);
-        
+
         String createdAt = volume.getCreatedAt();
         Assert.assertNotNull(createdAt);
-        
-        Map<String,String> metadata = volume.getMetadata();
+
+        Map<String, String> metadata = volume.getMetadata();
         Assert.assertNotNull(metadata);
         Assert.assertEquals(2, metadata.size());
-        
-        List<Map<String,Object>> attachments = volume.getAttachments();
+
+        List<Map<String, Object>> attachments = volume.getAttachments();
         Assert.assertNotNull(attachments);
         Assert.assertEquals(2, attachments.size());
-        
+
         String snapshotId = volume.getSnapshotId();
         Assert.assertNotNull(snapshotId);
-        
+
         Integer size = volume.getSize();
         Assert.assertNotNull(size);
-        
+
         String name = volume.getName();
         Assert.assertNotNull(name);
-        
+
         String description = volume.getDescription();
         Assert.assertNotNull(description);
-        
+
         String id = volume.getId();
         Assert.assertNotNull(id);
-        
+
         String availabilityZone = volume.getAvailabilityZone();
         Assert.assertNotNull(availabilityZone);
-        
+
         String status = volume.getStatus();
         Assert.assertNotNull(status);
     }