update for change to etsicatalog

[modeling/etsicatalog.git] / catalog / urls.py

diff --git a/genericparser/urls.py b/catalog/urls.py
similarity index 59%
rename from genericparser/urls.py
rename to catalog/urls.py
index 4cf58c8..76c972b 100644 (file)
--- a/genericparser/urls.py
+++ b/catalog/urls.py
@@ -15,20 +15,23 @@
 from django.conf.urls import include, url
 from django.contrib import admin
 
-
-from genericparser.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
+from catalog.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM, \
+    MSB_SVC_CALALOG_URL, MSB_SVC_NSD_URL, MSB_SVC_VNFPKGM_URL
 
 urlpatterns = [
-    url(r'^api/parser/v1/admin', admin.site.urls),
-    url(r'^', include('genericparser.samples.urls')),
-    url(r'^', include('genericparser.packages.urls')),
-    url(r'^', include('genericparser.jobs.urls')),
-    url(r'^', include('genericparser.swagger.urls')),
+    url(r'^api/catalog/v1/admin', admin.site.urls),
+    url(r'^', include('catalog.samples.urls')),
+    url(r'^', include('catalog.packages.urls')),
+    url(r'^', include('catalog.jobs.urls')),
+    url(r'^', include('catalog.swagger.urls')),
 ]
 
 # regist to MSB when startup
 if REG_TO_MSB_WHEN_START:
     import json
-    from genericparser.pub.utils.restcall import req_by_msb
+    from catalog.pub.utils.restcall import req_by_msb
+    req_by_msb(MSB_SVC_CALALOG_URL, "DELETE")
+    req_by_msb(MSB_SVC_NSD_URL, "DELETE")
+    req_by_msb(MSB_SVC_VNFPKGM_URL, "DELETE")
     for reg_param in REG_TO_MSB_REG_PARAM:
         req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(reg_param))