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>

15 files changed, 89 insertions, 85 deletions

diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/NovaTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/NovaTest.java
index 05314f6..5e8bc61 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/NovaTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/NovaTest.java
@@ -1,42 +1,39 @@
-/*-

- * ONAP-SO

- * ============LICENSE_START=======================================================

- * Copyright 2018 Huawei Intellectual Property. All rights reserved.

- * =================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package com.woorea.openstack.nova;

-

-

-

-import static org.junit.Assert.fail;

-

-import org.junit.Test;

-public class NovaTest {

-

-    @Test

-    public void test() {

-        try

-        {

-            Nova nova = new Nova(null);    

-        }

-        catch(Exception ex)

-        {

-            fail("Exception while creating Nova");

-        }

-        

-        

-    }

-

-}

+/*-
+ * ONAP-SO
+ * ============LICENSE_START=======================================================
+ * Copyright 2018 Huawei Intellectual Property. All rights reserved.
+ * =================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package com.woorea.openstack.nova;
+
+
+
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
+public class NovaTest {
+
+    @Test
+    public void test() {
+        try {
+            Nova nova = new Nova(null);
+        } catch (Exception ex) {
+            fail("Exception while creating Nova");
+        }
+
+
+    }
+
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/ImagesResourceTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/ImagesResourceTest.java
index 4ddc398..57e737b 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/ImagesResourceTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/ImagesResourceTest.java
@@ -85,8 +85,7 @@ public class ImagesResourceTest {
     public class ShowMetadata extends OpenStackRequest<Metadata> {
 
         public ShowMetadata(String id) {
-            super(client, HttpMethod.GET, "/images/" + id + "/metadata", null,
-                Metadata.class);
+            super(client, HttpMethod.GET, "/images/" + id + "/metadata", null, Metadata.class);
         }
     }
 
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/ServersResourceTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/ServersResourceTest.java
index 094a633..7468801 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/ServersResourceTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/ServersResourceTest.java
@@ -27,7 +27,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-
 import java.util.Collections;
 
 public class ServersResourceTest {
@@ -93,7 +92,8 @@ public class ServersResourceTest {
         final Metadata expectedServer = Mockito.mock(Metadata.class);
         OpenStackClientMockUtils.getInstance().mockRequestResponse(Metadata.class, expectedServer);
         Metadata metadata = Mockito.mock(Metadata.class);
-        final ServersResource.CreateOrUpdateMetadata metadataCreateUpdate = serversResource.createOrUpdateMetadata(SERVER_KEY, metadata);
+        final ServersResource.CreateOrUpdateMetadata metadataCreateUpdate =
+                serversResource.createOrUpdateMetadata(SERVER_KEY, metadata);
         final Metadata actualServer = metadataCreateUpdate.execute();
         Assert.assertEquals(expectedServer, actualServer);
     }
@@ -103,14 +103,16 @@ public class ServersResourceTest {
         final Metadata expectedServer = Mockito.mock(Metadata.class);
         OpenStackClientMockUtils.getInstance().mockRequestResponse(Metadata.class, expectedServer);
         Metadata metadata = Mockito.mock(Metadata.class);
-        final ServersResource.ReplaceMetadata metadataCreateUpdate = serversResource.replaceMetadata(SERVER_KEY, metadata);
+        final ServersResource.ReplaceMetadata metadataCreateUpdate =
+                serversResource.replaceMetadata(SERVER_KEY, metadata);
         final Metadata actualServer = metadataCreateUpdate.execute();
         Assert.assertEquals(expectedServer, actualServer);
     }
 
     @Test
     public void deleteMetadata() {
-        final ServersResource.DeleteMetadata metadataCreateUpdate = serversResource.deleteMetadata(SERVER_NAME, SERVER_KEY);
+        final ServersResource.DeleteMetadata metadataCreateUpdate =
+                serversResource.deleteMetadata(SERVER_NAME, SERVER_KEY);
         metadataCreateUpdate.execute();
     }
 
@@ -124,7 +126,8 @@ public class ServersResourceTest {
     public void update() {
         final Server expectedServer = Mockito.mock(Server.class);
         OpenStackClientMockUtils.getInstance().mockRequestResponse(Server.class, expectedServer);
-        final ServersResource.UpdateServer metadataCreateUpdate = serversResource.update(SERVER_NAME, SERVER_KEY, I_PV_4, "");
+        final ServersResource.UpdateServer metadataCreateUpdate =
+                serversResource.update(SERVER_NAME, SERVER_KEY, I_PV_4, "");
         final Server actualServer = metadataCreateUpdate.execute();
         Assert.assertEquals(expectedServer, actualServer);
     }
@@ -133,7 +136,8 @@ public class ServersResourceTest {
     public void changePassword() {
         final Server expectedServer = Mockito.mock(Server.class);
         OpenStackClientMockUtils.getInstance().mockRequestResponse(Server.class, expectedServer);
-        final ServersResource.ChangePasswordAction metadataCreateUpdate = serversResource.changePassword(SERVER_NAME, SERVER_NAME);
+        final ServersResource.ChangePasswordAction metadataCreateUpdate =
+                serversResource.changePassword(SERVER_NAME, SERVER_NAME);
         final Server actualServer = metadataCreateUpdate.execute();
         Assert.assertEquals(expectedServer, actualServer);
     }
@@ -158,7 +162,8 @@ public class ServersResourceTest {
     public void resize() {
         final Server expectedServer = Mockito.mock(Server.class);
         OpenStackClientMockUtils.getInstance().mockRequestResponse(Server.class, expectedServer);
-        final ServersResource.ResizeAction metadataCreateUpdate = serversResource.resize(SERVER_NAME, SERVER_FLAVOR, DISK_CONFIG);
+        final ServersResource.ResizeAction metadataCreateUpdate =
+                serversResource.resize(SERVER_NAME, SERVER_FLAVOR, DISK_CONFIG);
         final Server actualServer = metadataCreateUpdate.execute();
         Assert.assertEquals(expectedServer, actualServer);
     }
@@ -183,7 +188,8 @@ public class ServersResourceTest {
 
     @Test
     public void createImage() {
-        final ServersResource.CreateImageAction metadataCreateUpdate = serversResource.createImage(SERVER_NAME, SERVER_KEY, Collections.<String, String>emptyMap());
+        final ServersResource.CreateImageAction metadataCreateUpdate =
+                serversResource.createImage(SERVER_NAME, SERVER_KEY, Collections.<String, String>emptyMap());
         metadataCreateUpdate.execute();
     }
 
@@ -203,7 +209,8 @@ public class ServersResourceTest {
     public void getVncConsole() {
         final ServerAction.VncConsole console = new ServerAction.VncConsole();
         OpenStackClientMockUtils.getInstance().mockRequestResponse(ServerAction.VncConsole.class, console);
-        final ServersResource.GetVncConsoleServer metadataCreateUpdate = serversResource.getVncConsole(SERVER_NAME, CONSOLE_TYPE);
+        final ServersResource.GetVncConsoleServer metadataCreateUpdate =
+                serversResource.getVncConsole(SERVER_NAME, CONSOLE_TYPE);
         final ServerAction.VncConsole actualConsole = metadataCreateUpdate.execute();
         Assert.assertEquals(console, actualConsole);
     }
@@ -212,7 +219,8 @@ public class ServersResourceTest {
     public void getConsoleOutput() {
         final ServerAction.ConsoleOutput console = new ServerAction.ConsoleOutput();
         OpenStackClientMockUtils.getInstance().mockRequestResponse(ServerAction.ConsoleOutput.class, console);
-        final ServersResource.GetConsoleOutputServer metadataCreateUpdate = serversResource.getConsoleOutput(SERVER_NAME, Integer.MAX_VALUE);
+        final ServersResource.GetConsoleOutputServer metadataCreateUpdate =
+                serversResource.getConsoleOutput(SERVER_NAME, Integer.MAX_VALUE);
         final ServerAction.ConsoleOutput actualConsole = metadataCreateUpdate.execute();
         Assert.assertEquals(console, actualConsole);
     }
@@ -256,14 +264,16 @@ public class ServersResourceTest {
     @Test
     public void createBackup() {
         ServerAction.CreateBackup backup = new ServerAction.CreateBackup();
-        final ServersResource.CreateBackupServer metadataCreateUpdate = serversResource.createBackup(SERVER_NAME, backup);
+        final ServersResource.CreateBackupServer metadataCreateUpdate =
+                serversResource.createBackup(SERVER_NAME, backup);
         metadataCreateUpdate.execute();
     }
 
     @Test
     public void rescue() {
         final ServerAction.CreateBackup console = new ServerAction.CreateBackup();
-        final ServersResource.CreateBackupServer metadataCreateUpdate = serversResource.createBackup(SERVER_NAME, console);
+        final ServersResource.CreateBackupServer metadataCreateUpdate =
+                serversResource.createBackup(SERVER_NAME, console);
         metadataCreateUpdate.execute();
     }
 
@@ -275,25 +285,29 @@ public class ServersResourceTest {
 
     @Test
     public void associateFloatingIp() {
-        final ServersResource.AssociateFloatingIp metadataCreateUpdate = serversResource.associateFloatingIp(SERVER_NAME, I_PV_4);
+        final ServersResource.AssociateFloatingIp metadataCreateUpdate =
+                serversResource.associateFloatingIp(SERVER_NAME, I_PV_4);
         metadataCreateUpdate.execute();
     }
 
     @Test
     public void disassociateFloatingIp() {
-        final ServersResource.DisassociateFloatingIp metadataCreateUpdate = serversResource.disassociateFloatingIp(SERVER_NAME, I_PV_4);
+        final ServersResource.DisassociateFloatingIp metadataCreateUpdate =
+                serversResource.disassociateFloatingIp(SERVER_NAME, I_PV_4);
         metadataCreateUpdate.execute();
     }
 
     @Test
     public void attachVolume() {
-        final ServersResource.AttachVolume metadataCreateUpdate = serversResource.attachVolume(SERVER_NAME, "volume_id", "device");
+        final ServersResource.AttachVolume metadataCreateUpdate =
+                serversResource.attachVolume(SERVER_NAME, "volume_id", "device");
         metadataCreateUpdate.execute();
     }
 
     @Test
     public void detachVolume() {
-        final ServersResource.DetachVolume metadataCreateUpdate = serversResource.detachVolume(SERVER_NAME, "volume_id");
+        final ServersResource.DetachVolume metadataCreateUpdate =
+                serversResource.detachVolume(SERVER_NAME, "volume_id");
         metadataCreateUpdate.execute();
     }
 
@@ -301,7 +315,8 @@ public class ServersResourceTest {
     public void listVolumeAttachments() {
         final VolumeAttachments volumeAttachments = new VolumeAttachments();
         OpenStackClientMockUtils.getInstance().mockRequestResponse(VolumeAttachments.class, volumeAttachments);
-        final ServersResource.ListVolumeAttachments metadataCreateUpdate = serversResource.listVolumeAttachments(SERVER_NAME);
+        final ServersResource.ListVolumeAttachments metadataCreateUpdate =
+                serversResource.listVolumeAttachments(SERVER_NAME);
         final VolumeAttachments actualVolumeAttachments = metadataCreateUpdate.execute();
         Assert.assertEquals(volumeAttachments, actualVolumeAttachments);
     }
@@ -310,7 +325,8 @@ public class ServersResourceTest {
     public void showVolumeAttachment() {
         final VolumeAttachment volumeAttachment = new VolumeAttachment();
         OpenStackClientMockUtils.getInstance().mockRequestResponse(VolumeAttachment.class, volumeAttachment);
-        final ServersResource.ShowVolumeAttachment metadataCreateUpdate = serversResource.showVolumeAttachment(SERVER_NAME, "volume_id");
+        final ServersResource.ShowVolumeAttachment metadataCreateUpdate =
+                serversResource.showVolumeAttachment(SERVER_NAME, "volume_id");
         final VolumeAttachment actualVolumeAttachment = metadataCreateUpdate.execute();
         Assert.assertEquals(volumeAttachment, actualVolumeAttachment);
     }
@@ -326,4 +342,4 @@ public class ServersResourceTest {
         server.setUserData(SERVER_USER_DATA);
         return server;
     }
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/AggregatesExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/AggregatesExtensionTest.java
index c59c1a4..7a990a4 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/AggregatesExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/AggregatesExtensionTest.java
@@ -65,4 +65,4 @@ public class AggregatesExtensionTest {
         aggregatesExtension.setMetadata("test", "test", "test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CloudpipesExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CloudpipesExtensionTest.java
index b2782d4..1482f4e 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CloudpipesExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CloudpipesExtensionTest.java
@@ -36,4 +36,4 @@ public class CloudpipesExtensionTest {
         cloudpipesExtension.create(new Cloudpipe());
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CredentialsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CredentialsExtensionTest.java
index df575fe..c53fb8b 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CredentialsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/CredentialsExtensionTest.java
@@ -35,4 +35,4 @@ public class CredentialsExtensionTest {
         credentialsExtension.showCertificate("id");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpDnsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpDnsExtensionTest.java
index 5441a7d..1bc4d7c 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpDnsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpDnsExtensionTest.java
@@ -51,4 +51,4 @@ public class FloatingIpDnsExtensionTest {
         floatingIpDnsExtension.delete("id");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpPoolsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpPoolsExtensionTest.java
index e40fe5f..0b67b05 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpPoolsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpPoolsExtensionTest.java
@@ -30,4 +30,4 @@ public class FloatingIpPoolsExtensionTest {
         floatingIpPoolsExtension.list();
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpsExtensionTest.java
index 48dc825..2cbe224 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/FloatingIpsExtensionTest.java
@@ -40,4 +40,4 @@ public class FloatingIpsExtensionTest {
         floatingIpPoolsExtension.deallocate("test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/HostsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/HostsExtensionTest.java
index 3592286..a7d8752 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/HostsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/HostsExtensionTest.java
@@ -35,4 +35,4 @@ public class HostsExtensionTest {
         hostsExtension.show("test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/KeyPairsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/KeyPairsExtensionTest.java
index 691e149..a04b08c 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/KeyPairsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/KeyPairsExtensionTest.java
@@ -45,4 +45,4 @@ public class KeyPairsExtensionTest {
         keyPairsExtension.delete("test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/NetworksExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/NetworksExtensionTest.java
index 571c51a..15f7f1b 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/NetworksExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/NetworksExtensionTest.java
@@ -45,4 +45,4 @@ public class NetworksExtensionTest {
         networksExtension.disassociate("test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtensionTest.java
index 1f3c979..650181d 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtensionTest.java
@@ -72,20 +72,12 @@ public class SecurityGroupsExtensionTest {
 
     @Test
     public void createSecurityGroupRule2() throws Exception {
-        securityGroupsExtension.createSecurityGroupRule(12,
-                "test",
-                1,
-                1,
-                "test");
+        securityGroupsExtension.createSecurityGroupRule(12, "test", 1, 1, "test");
     }
 
     @Test
     public void createSecurityGroupRule3() throws Exception {
-        securityGroupsExtension.createSecurityGroupRule(1,
-                "test",
-                1,
-                1,
-                1);
+        securityGroupsExtension.createSecurityGroupRule(1, "test", 1, 1, 1);
     }
 
     @Test
@@ -98,4 +90,4 @@ public class SecurityGroupsExtensionTest {
         securityGroupsExtension.deleteSecurityGroup(1);
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SnapshotsExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SnapshotsExtensionTest.java
index 3ceb2ca..8ad61ae 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SnapshotsExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/SnapshotsExtensionTest.java
@@ -51,4 +51,4 @@ public class SnapshotsExtensionTest {
         snapshotsExtension.delete("test");
     }
 
-}
\ No newline at end of file
+}
diff --git a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/VolumesExtensionTest.java b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/VolumesExtensionTest.java
index 7713a70..b7785cf 100644
--- a/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/VolumesExtensionTest.java
+++ b/nova-client/src/test/java/com/woorea/openstack/nova/api/extensions/VolumesExtensionTest.java
@@ -56,4 +56,4 @@ public class VolumesExtensionTest {
         volumesExtension.delete("test");
     }
 
-}
\ No newline at end of file
+}