Update reg to MSB param of vfc-catalog

Change-Id: I167db1a4ed9dfb0fd33cdd1ba5b8cb8e342f730e
Issue-ID: VFC-1145
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/catalog/packages/biz/sdc_ns_package.py b/catalog/packages/biz/sdc_ns_package.py
index b079f3e..b9b38f8 100644 (file)
--- a/catalog/packages/biz/sdc_ns_package.py
+++ b/catalog/packages/biz/sdc_ns_package.py
@@ -157,7 +157,7 @@ class NsPackage(object):
             package_info["nsdInvariantId"] = csars[0].invariantId
             package_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
                 MSB_SERVICE_IP,
-                REG_TO_MSB_REG_PARAM["nodes"][0]["port"],
+                REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,
                 csars[0].nsPackageUri)

diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py
index 55de809..f74aed9 100644 (file)
--- a/catalog/packages/biz/sdc_vnf_package.py
+++ b/catalog/packages/biz/sdc_vnf_package.py
@@ -227,7 +227,7 @@ class NfPackage(object):
             pkg_info["vnfdModel"] = nf_pkg[0].vnfdModel
             pkg_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
                 MSB_SERVICE_IP,
-                REG_TO_MSB_REG_PARAM["nodes"][0]["port"],
+                REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
                 CATALOG_URL_PATH,
                 csar_id,
                 nf_pkg[0].vnfPackageUri)

diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index 0086e99..2aaf394 100644 (file)
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -36,7 +36,7 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
 # [register]
 REG_TO_MSB_WHEN_START = True
 REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
-REG_TO_MSB_REG_PARAM = {
+REG_TO_MSB_REG_PARAM = [{
     "serviceName": "catalog",
     "version": "v1",
     "url": "/api/catalog/v1",
@@ -47,7 +47,29 @@ REG_TO_MSB_REG_PARAM = {
         "port": "8806",
         "ttl": 0
     }]
-}
+}, {
+    "serviceName": "nsd",
+    "version": "v1",
+    "url": "/api/nsd/v1",
+    "protocol": "REST",
+    "visualRange": "1",
+    "nodes": [{
+        "ip": "127.0.0.1",
+        "port": "8806",
+        "ttl": 0
+    }]
+}, {
+    "serviceName": "vnfpkgm",
+    "version": "v1",
+    "url": "/api/vnfpkgm/v1",
+    "protocol": "REST",
+    "visualRange": "1",
+    "nodes": [{
+        "ip": "127.0.0.1",
+        "port": "8806",
+        "ttl": 0
+    }]
+}]
 
 # catalog path(values is defined in settings.py)
 CATALOG_ROOT_PATH = None

diff --git a/catalog/urls.py b/catalog/urls.py
index 6b4abf1..666b37d 100644 (file)
--- a/catalog/urls.py
+++ b/catalog/urls.py
@@ -27,7 +27,5 @@ urlpatterns = [
 if REG_TO_MSB_WHEN_START:
     import json
     from catalog.pub.utils.restcall import req_by_msb
-    req_by_msb(
-        REG_TO_MSB_REG_URL,
-        "POST",
-        json.JSONEncoder().encode(REG_TO_MSB_REG_PARAM))
+    for reg_param in REG_TO_MSB_REG_PARAM:
+        req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(reg_param))