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

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java
index 7a2b2c1..e4f33e6 100644
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.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,35 +34,24 @@ public class NetworkTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"network\" : {" + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"shared\" : \"shared\"," + EOL
-        + "    \"segments\" : [ {" + EOL
-        + "      \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
-        + "      \"provider:network_type\" : \"providernetworktype\"," + EOL
-        + "      \"provider:segmentation_id\" : 92" + EOL
-        + "    }, {" + EOL
-        + "      \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
-        + "      \"provider:network_type\" : \"providernetworktype\"," + EOL
-        + "      \"provider:segmentation_id\" : 92" + EOL
-        + "    } ]," + EOL
-        + "    \"admin_state_up\" : false," + EOL
-        + "    \"tenant_id\" : \"tenantid\"," + EOL
-        + "    \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
-        + "    \"provider:network_type\" : \"providernetworktype\"," + EOL
-        + "    \"provider:segmentation_id\" : 92," + EOL
-        + "    \"router:external\" : \"routerexternal\"" + 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 + "  \"network\" : {" + EOL + "    \"name\" : \"name\"," + EOL
+            + "    \"shared\" : true," + EOL + "    \"segments\" : [ {" + EOL
+            + "      \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
+            + "      \"provider:network_type\" : \"providernetworktype\"," + EOL
+            + "      \"provider:segmentation_id\" : 92" + EOL + "    }, {" + EOL
+            + "      \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
+            + "      \"provider:network_type\" : \"providernetworktype\"," + EOL
+            + "      \"provider:segmentation_id\" : 92" + EOL + "    } ]," + EOL + "    \"admin_state_up\" : false,"
+            + EOL + "    \"tenant_id\" : \"tenantid\"," + EOL
+            + "    \"provider:physical_network\" : \"providerphysicalnetwork\"," + EOL
+            + "    \"provider:network_type\" : \"providernetworktype\"," + EOL
+            + "    \"provider:segmentation_id\" : 92," + EOL + "    \"router:external\" : true" + 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 {
@@ -80,40 +67,40 @@ public class NetworkTest {
     public void testMethods() throws Exception {
         Network network = objectMapper.readValue(JSON_FULL, Network.class);
         network.toString();
-        
-        String shared = network.getShared();
+
+        Boolean shared = network.getShared();
         Assert.assertNotNull(shared);
         network.setShared(shared);
-        
+
         String providerNetworkType = network.getProviderNetworkType();
         Assert.assertNotNull(providerNetworkType);
         network.setProviderNetworkType(providerNetworkType);
-        
-        String routerExternal = network.getRouterExternal();
+
+        Boolean routerExternal = network.getRouterExternal();
         Assert.assertNotNull(routerExternal);
         network.setRouterExternal(routerExternal);
-        
+
         Integer providerSegmentationId = network.getProviderSegmentationId();
         Assert.assertNotNull(providerSegmentationId);
         network.setProviderSegmentationId(providerSegmentationId);
-        
+
         List<Segment> segments = network.getSegments();
         Assert.assertNotNull(segments);
         Assert.assertEquals(2, segments.size());
         network.setSegments(segments);
-        
+
         Boolean adminStateUp = network.getAdminStateUp();
         Assert.assertNotNull(adminStateUp);
         network.setAdminStateUp(adminStateUp);
-        
+
         String tenantId = network.getTenantId();
         Assert.assertNotNull(tenantId);
         network.setTenantId(tenantId);
-        
+
         String name = network.getName();
         Assert.assertNotNull(name);
         network.setName(name);
-        
+
         String providerPhysicalNetwork = network.getProviderPhysicalNetwork();
         Assert.assertNotNull(providerPhysicalNetwork);
         network.setProviderPhysicalNetwork(providerPhysicalNetwork);