From: YuanHu <yuan.hu1@zte.com.cn>
Date: Thu, 13 Oct 2016 07:16:05 +0000 (+0800)
Subject: The url of http server via msb is started with 'files/catalog-http'.
X-Git-Tag: release/mercury~40
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=03ad2508f945230c9cee085c5defdba7ec64a11c;p=vfc%2Fnfvo%2Fcatalog.git

The url of http server via msb is started with 'files/catalog-http'.

Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9
Issue-id: TOSCA-108
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
index f963d7b9..09c3e127 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
@@ -55,7 +55,11 @@ public abstract class AbstractModelParser {
   }
   
   public String getUrlOnHttpServer(String path) {
-    return MsbAddrConfig.getMsbAddress() + "/" + path;
+    if (MsbAddrConfig.getMsbAddress().endsWith("/")) {
+      return MsbAddrConfig.getMsbAddress() + "files/catalog-http" + path;
+    } else {
+      return MsbAddrConfig.getMsbAddress() + "/files/catalog-http" + path;
+    }
   }
   
   protected String toTempFilePath(String fileLocation) {