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

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java
index 73b871d..54e2f8b 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/NetworkTest.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,46 +33,26 @@ public class NetworkTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"network\" : {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"bridge\" : \"bridge\"," + EOL
-        + "    \"deleted\" : false," + EOL
-        + "    \"vlan\" : \"vlan\"," + EOL
-        + "    \"broadcast\" : \"broadcast\"," + EOL
-        + "    \"netmask\" : \"netmask\"," + EOL
-        + "    \"injected\" : true," + EOL
-        + "    \"host\" : \"host\"," + EOL
-        + "    \"cidr\" : \"cidr\"," + EOL
-        + "    \"gateway\" : \"gateway\"," + EOL
-        + "    \"dns1\" : \"dns1\"," + EOL
-        + "    \"dns2\" : \"dns2\"," + EOL
-        + "    \"label\" : \"label\"," + EOL
-        + "    \"priority\" : \"priority\"," + EOL
-        + "    \"vpn_public_address\" : \"vpnpublicaddress\"," + EOL
-        + "    \"vpn_private_address\" : \"vpnprivateaddress\"," + EOL
-        + "    \"vpn_public_port\" : \"vpnpublicport\"," + EOL
-        + "    \"dhcp_start\" : \"dhcpstart\"," + EOL
-        + "    \"bridge_interface\" : \"bridgeinterface\"," + EOL
-        + "    \"updated_at\" : \"updatedat\"," + EOL
-        + "    \"multi_host\" : false," + EOL
-        + "    \"created_at\" : \"createdat\"," + EOL
-        + "    \"deleted_at\" : \"deletedat\"," + EOL
-        + "    \"cidr_v6\" : \"cidrv6\"," + EOL
-        + "    \"gateway_v6\" : \"gatewayv6\"," + EOL
-        + "    \"netmask_v6\" : \"netmaskv6\"," + EOL
-        + "    \"project_id\" : \"projectid\"," + EOL
-        + "    \"rxtx_base\" : \"rxtxbase\"" + 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 + "    \"id\" : \"id\"," + EOL
+            + "    \"bridge\" : \"bridge\"," + EOL + "    \"deleted\" : false," + EOL + "    \"vlan\" : \"vlan\"," + EOL
+            + "    \"broadcast\" : \"broadcast\"," + EOL + "    \"netmask\" : \"netmask\"," + EOL
+            + "    \"injected\" : true," + EOL + "    \"host\" : \"host\"," + EOL + "    \"cidr\" : \"cidr\"," + EOL
+            + "    \"gateway\" : \"gateway\"," + EOL + "    \"dns1\" : \"dns1\"," + EOL + "    \"dns2\" : \"dns2\","
+            + EOL + "    \"label\" : \"label\"," + EOL + "    \"priority\" : \"priority\"," + EOL
+            + "    \"vpn_public_address\" : \"vpnpublicaddress\"," + EOL
+            + "    \"vpn_private_address\" : \"vpnprivateaddress\"," + EOL
+            + "    \"vpn_public_port\" : \"vpnpublicport\"," + EOL + "    \"dhcp_start\" : \"dhcpstart\"," + EOL
+            + "    \"bridge_interface\" : \"bridgeinterface\"," + EOL + "    \"updated_at\" : \"updatedat\"," + EOL
+            + "    \"multi_host\" : false," + EOL + "    \"created_at\" : \"createdat\"," + EOL
+            + "    \"deleted_at\" : \"deletedat\"," + EOL + "    \"cidr_v6\" : \"cidrv6\"," + EOL
+            + "    \"gateway_v6\" : \"gatewayv6\"," + EOL + "    \"netmask_v6\" : \"netmaskv6\"," + EOL
+            + "    \"project_id\" : \"projectid\"," + EOL + "    \"rxtx_base\" : \"rxtxbase\"" + 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 {
@@ -89,85 +68,85 @@ public class NetworkTest {
     public void testMethods() throws Exception {
         Network network = objectMapper.readValue(JSON_FULL, Network.class);
         network.toString();
-        
+
         String broadcast = network.getBroadcast();
         Assert.assertNotNull(broadcast);
-        
+
         String gatewayV6 = network.getGatewayV6();
         Assert.assertNotNull(gatewayV6);
-        
+
         String dns2 = network.getDns2();
         Assert.assertNotNull(dns2);
-        
+
         String bridgeInterface = network.getBridgeInterface();
         Assert.assertNotNull(bridgeInterface);
-        
+
         String dns1 = network.getDns1();
         Assert.assertNotNull(dns1);
-        
+
         String cidrV6 = network.getCidrV6();
         Assert.assertNotNull(cidrV6);
-        
+
         String deletedAt = network.getDeletedAt();
         Assert.assertNotNull(deletedAt);
-        
+
         String vlan = network.getVlan();
         Assert.assertNotNull(vlan);
-        
+
         String netmask = network.getNetmask();
         Assert.assertNotNull(netmask);
-        
+
         String netmaskV6 = network.getNetmaskV6();
         Assert.assertNotNull(netmaskV6);
-        
+
         Boolean injected = network.getInjected();
         Assert.assertNotNull(injected);
-        
+
         String host = network.getHost();
         Assert.assertNotNull(host);
-        
+
         String cidr = network.getCidr();
         Assert.assertNotNull(cidr);
-        
+
         String id = network.getId();
         Assert.assertNotNull(id);
-        
+
         String projectId = network.getProjectId();
         Assert.assertNotNull(projectId);
-        
+
         String vpnPublicAddress = network.getVpnPublicAddress();
         Assert.assertNotNull(vpnPublicAddress);
-        
+
         String label = network.getLabel();
         Assert.assertNotNull(label);
-        
+
         String priority = network.getPriority();
         Assert.assertNotNull(priority);
-        
+
         String vpnPublicPort = network.getVpnPublicPort();
         Assert.assertNotNull(vpnPublicPort);
-        
+
         String createdAt = network.getCreatedAt();
         Assert.assertNotNull(createdAt);
-        
+
         Boolean deleted = network.getDeleted();
         Assert.assertNotNull(deleted);
-        
+
         String rxtxBase = network.getRxtxBase();
         Assert.assertNotNull(rxtxBase);
-        
+
         String dhcpStart = network.getDhcpStart();
         Assert.assertNotNull(dhcpStart);
-        
+
         Boolean multiHost = network.getMultiHost();
         Assert.assertNotNull(multiHost);
-        
+
         String bridge = network.getBridge();
         Assert.assertNotNull(bridge);
-        
+
         String gateway = network.getGateway();
         Assert.assertNotNull(gateway);
-        
+
         String updatedAt = network.getUpdatedAt();
         Assert.assertNotNull(updatedAt);
     }