Added distro and version to the image bean for retrieveal

Issue-ID: SO-3074
Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fb712
Signed-off-by: Boslet, Cory (cb645j) <cb645j@att.com>

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 7078edc..8e3c1e3 100644 (file)
--- 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
@@ -129,6 +129,12 @@ public class Image implements Serializable {
     @JsonProperty("meta")
     private String meta;
 
+    @JsonProperty("os_version")
+    private String osVersion;
+
+    @JsonProperty("os_distro")
+    private String osDistro;
+
     @JsonProperty("tags")
     private List<String> tags;
 
@@ -508,6 +514,22 @@ public class Image implements Serializable {
         return properties;
     }
 
+    public String getOsVersion() {
+        return osVersion;
+    }
+
+    public void setOsVersion(String osVersion) {
+        this.osVersion = osVersion;
+    }
+
+    public String getOsDistro() {
+        return osDistro;
+    }
+
+    public void setOsDistro(String osDistro) {
+        this.osDistro = osDistro;
+    }
+
     /*
      * (non-Javadoc)
      * 

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
index 45d33f7..dd8e314 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
@@ -36,7 +36,8 @@ public class ImageTest {
     private static final String EOL = System.lineSeparator();
 
     private static final String JSON_FULL = "{" + EOL + "    \"id\" : \"id\"," + EOL + "    \"uri\" : \"uri\"," + EOL
-            + "    \"name\" : \"name\"," + EOL + "    \"size\" : 43," + EOL + "    \"checksum\" : \"checksum\"," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"os_distro\" : \"gw\"," + EOL + "    \"os_version\" : \"1\","
+            + EOL + "    \"size\" : 43," + EOL + "    \"checksum\" : \"checksum\"," + EOL
             + "    \"status\" : \"status\"," + EOL + "    \"owner\" : \"owner\"," + EOL + "    \"properties\" : {" + EOL
             + "      \"properties-k1\" : \"properties-v1\"," + EOL + "      \"properties-k2\" : \"properties-v2\"" + EOL
             + "    }," + EOL + "    \"public\" : false," + EOL + "    \"deleted\" : false," + EOL
@@ -128,5 +129,12 @@ public class ImageTest {
         Calendar updatedAt = image.getUpdatedAt();
         Assert.assertNotNull(updatedAt);
         image.setUpdatedAt(updatedAt);
+
+        String distro = image.getOsDistro();
+        Assert.assertNotNull(distro);
+
+        String version = image.getOsVersion();
+        Assert.assertNotNull(version);
+
     }
 }