fix(provider/openstack): fix several issues in glance v2 support (#2787)

* location value can be empty * convert image properties to Map<String, String>
spinnaker · Jul 26, 2018 · dae28e6 · dae28e6
1 parent 6c38ffc
commit dae28e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...groovy/com/netflix/spinnaker/clouddriver/openstack/client/OpenstackImageV2Provider.groovy b/...groovy/com/netflix/spinnaker/clouddriver/openstack/client/OpenstackImageV2Provider.groovy
@@ -26,14 +26,16 @@ class OpenstackImageV2Provider implements OpenstackImageProvider, OpenstackReque
   }
 
   static OpenstackImage buildImage(Image image, String region) {
+    def properties = new HashMap()
+    image.properties.each { properties[it.key] = it.value.toString() }
     OpenstackImage.builder()
       .id(image.id)
       .status(image.status?.value())
       .size(image.size)
-      .location(image.locations.get(0)?.toString())
+      .location(image.locations?.get(0)?.toString())
       .createdAt(image.createdAt?.time)
       .updatedAt(image.updatedAt?.time)
-      .properties(image.properties)
+      .properties(properties)
       .name(image.name)
       .region(region)
       .build()