Added a configuration parameter to enable/disable image status checki…

…ng via openstack4j libraries openbaton/NFVO#291
openbaton · May 9, 2018 · 3a498d7 · 3a498d7
1 parent d40226e
commit 3a498d7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/org/openbaton/drivers/openstack4j/OpenStack4JDriver.java b/src/main/java/org/openbaton/drivers/openstack4j/OpenStack4JDriver.java
@@ -276,7 +276,6 @@ public static void main(String[] args)
   private void checkImageStatus(
       OSClient os, OpenstackVimInstance openstackVimInstance, String imageId, String imageName)
       throws VimException {
-
     log.debug("Retrieved imageId(" + imageId + ") from image with name " + imageName);
     org.openstack4j.model.image.Image imageFromVim = os.images().get(imageId);
     log.trace(
@@ -300,13 +299,21 @@ else if (imageFromVim.getId() == null) {
       } else if (imageV2FromVim.getStatus() == null
           || imageV2FromVim.getStatus()
               != (org.openstack4j.model.image.v2.Image.ImageStatus.ACTIVE)) {
-        throw new VimException(
-            "Image (name: " + imageName + ") is not yet in active. Try again later...");
+        if (Boolean.parseBoolean(properties.getProperty("enable-image-status-check", "false"))) {
+          throw new VimException(
+              "Image (name: " + imageName + ") is not yet in active. Try again later...");
+        } else {
+          log.debug("Disabled check for image status");
+        }
       }
     } else if (imageFromVim.getStatus() == null
         || imageFromVim.getStatus() != (org.openstack4j.model.image.Image.Status.ACTIVE)) {
-      throw new VimException(
-          "Image (name: " + imageName + ") is not yet in active. Try again later...");
+      if (Boolean.parseBoolean(properties.getProperty("enable-image-status-check", "false"))) {
+        throw new VimException(
+            "Image (name: " + imageName + ") is not yet in active. Try again later...");
+      } else {
+        log.debug("Disabled check for image status");
+      }
     }
   }
 

diff --git a/src/main/resources/plugin.conf.properties b/src/main/resources/plugin.conf.properties
@@ -35,4 +35,7 @@ deallocate-floating-ip=true
 wait-for-vm=5000
 
 # ignore ssl verification
-disable-ssl-verification = true
+disable-ssl-verification = true
+
+# ignore ready status for images
+enable-image-status-check = false