From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Sat, 30 Sep 2017 02:36:04 +0000 (+0800)
Subject: Fix vfc-nfvo-catalog service name and url
X-Git-Tag: v1.0.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F16717%2F1;p=vfc%2Fnfvo%2Fcatalog.git

Fix vfc-nfvo-catalog service name and url

Change-Id: I722523f08dc77621891d4a0ed104f4e006663fc1
Issue-ID: VFC-489
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index b89620d6..1f4f32f1 100644
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -32,9 +32,9 @@ DB_PASSWD = "nfvocatalog"
 REG_TO_MSB_WHEN_START = True
 REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
 REG_TO_MSB_REG_PARAM = {
-    "serviceName": "nfvocatalog",
+    "serviceName": "catalog",
     "version": "v1",
-    "url": "/api/nfvocatalog/v1",
+    "url": "/api/catalog/v1",
     "protocol": "REST",
     "visualRange": "1",
     "nodes": [{
diff --git a/catalog/samples/urls.py b/catalog/samples/urls.py
index 7d65b36c..9ab008a0 100644
--- a/catalog/samples/urls.py
+++ b/catalog/samples/urls.py
@@ -16,5 +16,5 @@ from django.conf.urls import url
 from catalog.samples import views
 
 urlpatterns = [
-    url(r'^api/nfvocatalog/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()),
+    url(r'^api/catalog/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()),
     url(r'^samples/$', views.SampleList.as_view()), ]