X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Furls.py;h=b016d1c4b81d829372629a384f71046f1a61b787;hb=HEAD;hp=af5e7f697bb413b09cc41ecf24f384d9d3f57886;hpb=00a265fba0125840da123086588fa098ec06428d;p=vfc%2Fnfvo%2Flcm.git

diff --git a/lcm/urls.py b/lcm/urls.py
index af5e7f69..b016d1c4 100644
--- a/lcm/urls.py
+++ b/lcm/urls.py
@@ -13,30 +13,38 @@
 # limitations under the License.
 
 from django.conf.urls import include, url
+from django.contrib import admin
 
 from lcm.pub.config.config import DEPLOY_WORKFLOW_WHEN_START
-from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
+from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM, MSB_SVC_URL
 
 
 urlpatterns = [
+    url(r'^api/nslcm/v1/admin', admin.site.urls),
     url(r'^', include('lcm.samples.urls')),
-    url(r'^', include('lcm.packages.urls')),
-    url(r'^', include('lcm.ns.vnfs.urls')),
-    url(r'^', include('lcm.ns.vls.urls')),
-    url(r'^', include('lcm.ns.sfcs.urls')),
+    url(r'^', include('lcm.ns_vnfs.urls')),
+    url(r'^', include('lcm.ns_pnfs.urls')),
+    url(r'^', include('lcm.ns_vls.urls')),
+    url(r'^', include('lcm.ns_sfcs.urls')),
     url(r'^', include('lcm.ns.urls')),
     url(r'^', include('lcm.jobs.urls')),
     url(r'^', include('lcm.workflows.urls')),
     url(r'^', include('lcm.swagger.urls')),
-    url(r'^', include('lcm.v2.urls')),
 ]
 
 # regist to MSB when startup
-if REG_TO_MSB_WHEN_START:
+if REG_TO_MSB_WHEN_START == "true":
     import json
     from lcm.pub.utils.restcall import req_by_msb
+    req_by_msb(MSB_SVC_URL % "v1", "DELETE")
     req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(REG_TO_MSB_REG_PARAM))
 
+    req_by_msb(MSB_SVC_URL % "v2", "DELETE")
+    v2_param = REG_TO_MSB_REG_PARAM.copy()
+    v2_param["version"] = "v2"
+    v2_param["url"] = v2_param["url"].replace("v1", "v2")
+    req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(v2_param))
+
 # deploy workflow when startup
 if DEPLOY_WORKFLOW_WHEN_START:
     from lcm.workflows import auto_deploy