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>

8 files changed, 219 insertions, 20 deletions

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
index aa7be87..b4b4c41 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
@@ -19,8 +19,8 @@ package com.woorea.openstack.glance.model;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
@@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Image implements Serializable {
 
+    @JsonProperty("id")
     private String id;
 
     private String uri;
@@ -46,6 +47,7 @@ public class Image implements Serializable {
     @JsonProperty("virtual_size")
     private Long virtualSize;
 
+    @JsonProperty("checksum")
     private String checksum;
 
     @JsonProperty("created_at")
@@ -68,6 +70,7 @@ public class Image implements Serializable {
     @JsonProperty("min_disk")
     private Integer minDisk;
 
+    @JsonProperty("owner")
     private String owner;
 
     @JsonProperty("deleted")
@@ -76,8 +79,174 @@ public class Image implements Serializable {
     @JsonProperty("protected")
     private boolean isProtected;
 
+    @JsonProperty("visibility")
+    private String visibility;
+
+    @JsonProperty("file")
+    private String file;
+
+    @JsonProperty("schema")
+    private String schema;
+
+    @JsonProperty("self")
+    private String self;
+
+    @JsonProperty("hw_cdrom_bus")
+    private String hwCDROMBus;
+
+    @JsonProperty("hw_disk_bus")
+    private String hwDiskBus;
+
+    @JsonProperty("hw_vif_mode")
+    private String hwVIFMode;
+
+    @JsonProperty("post_processing_networking")
+    private String postProcessingNetworking;
+
+    @JsonProperty("post_processing_tools")
+    private String postProccesingTools;
+
+    @JsonProperty("bypass_meta_validation")
+    private String bypassMetaValidation;
+
+    @JsonProperty("application_name")
+    private String applicationName;
+
+    @JsonProperty("application_type")
+    private String applicationType;
+
+    @JsonProperty("application_version")
+    private String applicationVersion;
+
+    @JsonProperty("application_vendor")
+    private String applicationVendor;
+
+    @JsonProperty("hw_scsi_model")
+    private String hwSCSIModel;
+
+    @JsonProperty("description")
+    private String description;
+
+    @JsonProperty("meta")
+    private String meta;
+
+    @JsonProperty("tags")
+    private List<String> tags;
+
     private Map<String, Object> properties;
 
+    public String getHwCDROMBus() {
+        return hwCDROMBus;
+    }
+
+    public void setHwCDROMBus(String hwCDROMBus) {
+        this.hwCDROMBus = hwCDROMBus;
+    }
+
+    public String getHwDiskBus() {
+        return hwDiskBus;
+    }
+
+    public void setHwDiskBus(String hwDiskBus) {
+        this.hwDiskBus = hwDiskBus;
+    }
+
+    public String getHwVIFMode() {
+        return hwVIFMode;
+    }
+
+    public void setHwVIFMode(String hwVIFMode) {
+        this.hwVIFMode = hwVIFMode;
+    }
+
+    public String getPostProcessingNetworking() {
+        return postProcessingNetworking;
+    }
+
+    public void setPostProcessingNetworking(String postProcessingNetworking) {
+        this.postProcessingNetworking = postProcessingNetworking;
+    }
+
+    public String getPostProccesingTools() {
+        return postProccesingTools;
+    }
+
+    public void setPostProccesingTools(String postProccesingTools) {
+        this.postProccesingTools = postProccesingTools;
+    }
+
+    public String getBypassMetaValidation() {
+        return bypassMetaValidation;
+    }
+
+    public void setBypassMetaValidation(String bypassMetaValidation) {
+        this.bypassMetaValidation = bypassMetaValidation;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+
+    public String getApplicationVersion() {
+        return applicationVersion;
+    }
+
+    public void setApplicationVersion(String applicationVersion) {
+        this.applicationVersion = applicationVersion;
+    }
+
+    public String getApplicationVendor() {
+        return applicationVendor;
+    }
+
+    public void setApplicationVendor(String applicationVendor) {
+        this.applicationVendor = applicationVendor;
+    }
+
+    public String getVisibility() {
+        return visibility;
+    }
+
+    public void setVisibility(String visibility) {
+        this.visibility = visibility;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    public String getSelf() {
+        return self;
+    }
+
+    public void setSelf(String self) {
+        this.self = self;
+    }
+
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
     /**
      * @return the id
      */
@@ -340,16 +509,17 @@ public class Image implements Serializable {
         return properties;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */
     @Override
     public String toString() {
         return String.format("Image [id=%s, uri=%s, name=%s, diskFormat=%s containerFormat=%s, size=%d, checksum=%s,"
                 + " createdAt=%s, updatedAt=%s, deletedAt=%s, status=%s, isPublic=%s, minRam=%d, minDisk=%d, owner=%s,"
-                + " isDeleted=%s, isProtected=%s, properties=%s]",
-            id, uri, name, diskFormat, containerFormat, size, checksum,
-            createdAt, updatedAt, deletedAt, status, isPublic, minRam, minDisk, owner,
-            isDeleted, isProtected, properties);
+                + " isDeleted=%s, isProtected=%s, properties=%s]", id, uri, name, diskFormat, containerFormat, size,
+                checksum, createdAt, updatedAt, deletedAt, status, isPublic, minRam, minDisk, owner, isDeleted,
+                isProtected, properties);
     }
 }
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java
index eb286ff..83935f8 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java
@@ -19,9 +19,9 @@ package com.woorea.openstack.glance.model;
 import java.io.InputStream;
 
 public class ImageDownload {
-    
+
     private Image image;
-    
+
     private InputStream inputStream;
 
     /**
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
index 8cecda9..e4b89d5 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java
@@ -17,19 +17,18 @@
 package com.woorea.openstack.glance.model;
 
 import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageMember implements Serializable {
 
     @JsonProperty("can_share")
     private boolean canShare;
-    
+
     @JsonProperty("member_id")
     private String memberId;
 
     public ImageMember() {
-        
+
     }
 
     public ImageMember(boolean canShare, String memberId) {
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
index fd977ed..750b196 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageMembers implements Iterable<ImageMember>, Serializable {
@@ -38,5 +37,5 @@ public class ImageMembers implements Iterable<ImageMember>, Serializable {
     public Iterator<ImageMember> iterator() {
         return list.iterator();
     }
-    
+
 }
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
index 428a5d2..a384214 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java
@@ -60,7 +60,7 @@ public class ImageUpload {
      * @return the properties
      */
     public Map<String, Object> getProperties() {
-        if(properties == null) {
+        if (properties == null) {
             properties = new HashMap<>();
         }
         return properties;
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
index b3b278c..baedb22 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Images implements Iterable<Image>, Serializable {
@@ -27,6 +26,15 @@ public class Images implements Iterable<Image>, Serializable {
     @JsonProperty("images")
     private List<Image> list;
 
+    @JsonProperty("next")
+    private String next;
+
+    @JsonProperty("first")
+    private String first;
+
+    @JsonProperty("schema")
+    private String schema;
+
     /**
      * @return the list
      */
@@ -34,9 +42,33 @@ public class Images implements Iterable<Image>, Serializable {
         return list;
     }
 
+    public String getNext() {
+        return next;
+    }
+
+    public void setNext(String next) {
+        this.next = next;
+    }
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
     @Override
     public Iterator<Image> iterator() {
         return list.iterator();
     }
-    
+
 }
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java
index b16897c..c4ddfdd 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java
@@ -17,5 +17,5 @@
 package com.woorea.openstack.glance.model;
 
 public class SharedImage {
-    
-}
\ No newline at end of file
+
+}
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
index 6239a2b..be3f77f 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class SharedImages implements Iterable<SharedImage>, Serializable {
@@ -38,5 +37,5 @@ public class SharedImages implements Iterable<SharedImage>, Serializable {
     public Iterator<SharedImage> iterator() {
         return list.iterator();
     }
-    
+
 }