Add a new template option - Image Compartment

jenkinsci · Oct 10, 2018 · bc9d94d · bc9d94d
1 parent 9bbe9c5
commit bc9d94d
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 3 deletions.
diff --git a/src/main/java/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate.java b/src/main/java/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate.java
@@ -48,6 +48,7 @@ public class BaremetalCloudAgentTemplate implements Describable<BaremetalCloudAg
     public final String availableDomain;
     public final String vcnId;
     public final String subnetId;
+    public final String imageCompartmentId;
     public final String imageId;
     public final String shape;
     public final String sshPublickey;
@@ -78,6 +79,7 @@ public BaremetalCloudAgentTemplate(
             final String availableDomain,
             final String vcnId,
             final String subnetId,
+            final String imageCompartmentId,
             final String imageId,
             final String shape,
             final String sshPublickey,
@@ -100,6 +102,7 @@ public BaremetalCloudAgentTemplate(
         this.availableDomain = availableDomain;
         this.vcnId = vcnId;
         this.subnetId = subnetId;
+        this.imageCompartmentId = imageCompartmentId;
         this.imageId = imageId;
         this.shape = shape;
         this.sshPublickey = sshPublickey;
@@ -137,6 +140,10 @@ public String getSubnet() {
         return subnetId;
     }
 
+    public String getImageCompartmentId() {
+        return imageCompartmentId;
+    }
+
     public String getImage() {
         return imageId;
     }
@@ -460,6 +467,36 @@ public ListBoxModel doFillAvailableDomainItems(
             }
         }
 
+        public ListBoxModel doFillImageCompartmentIdItems(
+                @QueryParameter @RelativePath("..") String userId,
+                @QueryParameter @RelativePath("..") String fingerprint,
+                @QueryParameter @RelativePath("..") String tenantId,
+                @QueryParameter @RelativePath("..") String apikey,
+                @QueryParameter @RelativePath("..") String passphrase,
+                @QueryParameter @RelativePath("..") String regionId,
+                @QueryParameter @RelativePath("..") String maxAsyncThreads)
+                        throws IOException, ServletException {
+            ListBoxModel model = new ListBoxModel();
+            model.add("<Select image compartmentId>", "");
+
+            if (anyRequiredFieldEmpty(userId, fingerprint, tenantId, apikey, regionId)) {
+                return model;
+            }
+
+            BaremetalCloudClient client = getClient(fingerprint, apikey, passphrase, tenantId, userId, regionId, maxAsyncThreads);
+
+            try{
+                List<Compartment> compartmentIds = client.getCompartmentsList(tenantId);
+                for (Compartment compartmentId : compartmentIds) {
+                    model.add(compartmentId.getName(), compartmentId.getId());
+                }
+            }catch (Exception e) {
+                LOGGER.log(Level.WARNING, "Failed to get compartment list", e);
+            }
+
+            return model;
+        }
+
         public ListBoxModel doFillImageIdItems(
                 @QueryParameter @RelativePath("..") String userId,
                 @QueryParameter @RelativePath("..") String fingerprint,
@@ -468,7 +505,8 @@ public ListBoxModel doFillImageIdItems(
                 @QueryParameter @RelativePath("..") String passphrase,
                 @QueryParameter @RelativePath("..") String regionId,
                 @QueryParameter @RelativePath("..") String maxAsyncThreads,
-                @QueryParameter String compartmentId) throws IOException, ServletException {
+                @QueryParameter String compartmentId,
+                @QueryParameter String imageCompartmentId) throws IOException, ServletException {
             ListBoxModel model = new ListBoxModel();
             model.add("<Select an Image>", "");
             if (anyRequiredFieldEmpty(userId, fingerprint, tenantId, apikey, regionId, compartmentId)) {
@@ -479,7 +517,7 @@ public ListBoxModel doFillImageIdItems(
 
             try {
                 List<String>  lstImage = new ArrayList<String>();
-                List<Image> list = client.getImagesList(compartmentId);
+                List<Image> list = client.getImagesList(imageCompartmentId);
                 for (Image imageId : list) {
                     if (lstImage.indexOf(imageId.getId()) < 0) {
                         model.add(imageId.getDisplayName(), imageId.getId());

diff --git a/...ain/resources/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/config.jelly b/...ain/resources/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/config.jelly
@@ -30,6 +30,10 @@
 	    <f:select />
 	  </f:entry>
 
+          <f:entry title="${%imageCompartmentId}" field="imageCompartmentId">
+            <f:select />
+          </f:entry>
+
 	  <f:entry title="${%imageId}" field="imageId">
 	    <f:select />
 	  </f:entry>

diff --git a/...m/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/help-imageCompartmentId.html b/...m/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/help-imageCompartmentId.html
@@ -0,0 +1,3 @@
+<div>
+    The compartment from which to select the image.
+</div>
diff --git a/...esources/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/help-imageId.html b/...esources/com/oracle/cloud/baremetal/jenkins/BaremetalCloudAgentTemplate/help-imageId.html
@@ -5,6 +5,5 @@
   <a href="https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/images.htm">Oracle-Provided Images</a>
   documentation for additional information.</li>
 
-   <li>The Drop Down values are in the format - Image(Compartment).</li>
  </ul>
 </div>
diff --git a/src/test/java/com/oracle/cloud/baremetal/jenkins/TestBaremetalCloudAgentTemplate.java b/src/test/java/com/oracle/cloud/baremetal/jenkins/TestBaremetalCloudAgentTemplate.java
@@ -31,6 +31,7 @@ public static class Builder {
         String availableDomain;
         String vcnId;
         String subnetId;
+        String imageCompartmentId;
         String imageId;
         String shape;
         String sshPublickey;
@@ -101,6 +102,11 @@ public Builder usePublicIP(Boolean usePublicIP) {
             return this;
         }
 
+        public Builder imageCompartmentId(String imageCompartmentId) {
+            this.imageCompartmentId = imageCompartmentId;
+            return this;
+        }
+
         public Builder imageId(String imageId) {
             this.imageId = imageId;
             return this;
@@ -173,6 +179,7 @@ public TestBaremetalCloudAgentTemplate(Builder builder) {
                 builder.availableDomain,
                 builder.vcnId,
                 builder.subnetId,
+                builder.imageCompartmentId,
                 builder.imageId,
                 builder.shape,
                 builder.sshPublickey,