1 files changed, 15 insertions, 10 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/GlanceClientImpl.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/GlanceClientImpl.java
index 687afeda40..b614a92177 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/GlanceClientImpl.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/GlanceClientImpl.java
@@ -20,8 +20,6 @@
 
 package org.onap.so.openstack.utils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import org.onap.so.cloud.authentication.KeystoneAuthHolder;
 import org.onap.so.openstack.exceptions.MsoCloudSiteNotFound;
 import org.onap.so.openstack.exceptions.MsoException;
@@ -30,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import com.woorea.openstack.base.client.OpenStackRequest;
 import com.woorea.openstack.glance.Glance;
+import com.woorea.openstack.glance.model.Image;
 import com.woorea.openstack.glance.model.Images;
 
 @Component
@@ -73,14 +72,7 @@ public class GlanceClientImpl extends MsoCommonUtils {
         try {
             String encodedName = null;
             if (name != null) {
-                try {
-                    encodedName =
-                            "in:\"" + URLEncoder.encode(name, "UTF-8").replace("+", "%20").replace("%3A", ":") + "\"";
-                } catch (UnsupportedEncodingException e) {
-                    logger.error("Error Encoding Image Name", e);
-                    throw new GlanceClientException("Error Endcoding Name", e);
-                }
-
+                encodedName = "in:\"" + name + "\"";
             }
             Glance glanceClient = getGlanceClient(cloudSiteId, tenantId);
             // list is set to false, otherwise an invalid URL is appended
@@ -93,4 +85,17 @@ public class GlanceClientImpl extends MsoCommonUtils {
         }
     }
 
+    public Image queryImage(String cloudSiteId, String tenantId, String imageId)
+            throws MsoCloudSiteNotFound, GlanceClientException {
+        try {
+            Glance glanceClient = getGlanceClient(cloudSiteId, tenantId);
+            // list is set to false, otherwise an invalid URL is appended
+            OpenStackRequest<Image> request = glanceClient.images().show(imageId);
+            return executeAndRecordOpenstackRequest(request, false);
+        } catch (MsoException e) {
+            logger.error("Error building Glance Client", e);
+            throw new GlanceClientException("Error building Glance Client", e);
+        }
+    }
+
 }