From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Sun, 29 Oct 2017 03:32:44 +0000 (+0800)
Subject: Fix the Query URL when Using MSB
X-Git-Tag: v1.0.0~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=commitdiff_plain;h=2e3aee44bf7a25aa665c3e6bd1130209ace50193

Fix the Query URL when Using MSB

Change-Id: I60489c9d917573ab47222c0148120c5e4a1cc56e
Issue-ID: HOLMES-82
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
---

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
index 7cbb6f3..cee6236 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
@@ -76,7 +76,7 @@ public class AaiQuery {
         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR) + "vserver-id:EQUALS:" + vserverId);
         String response = getResponse(url);
         if ("".equals(response) || "{}".equals(response)) {
-            url = getBaseUrl(AaiConfig.AAI_VM_ADDR + "vserver-name:EQUALS:" + vserverName);
+            url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR) + "vserver-name:EQUALS:" + vserverName);
             response = getResponse(url);
         }
         return response;
@@ -86,7 +86,7 @@ public class AaiQuery {
         String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR)+  "/" + vnfId);
         String response = getResponse(url);
         if ("".equals(response) || "{}".equals(response)) {
-            url = getBaseUrl(AaiConfig.AAI_VNF_ADDR + "vnf-name=" + vnfName);
+            url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR) + "vnf-name=" + vnfName);
             response = getResponse(url);
         }
         return response;