Merge "fix nslcm middleware"

[vfc/nfvo/lcm.git] / lcm / urls.py

diff --git a/lcm/urls.py b/lcm/urls.py
index c9a808b..4f2c5e7 100644 (file)
--- a/lcm/urls.py
+++ b/lcm/urls.py
@@ -13,16 +13,21 @@
 # limitations under the License.
 
 from django.conf.urls import include, url
+
+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
 
+
 urlpatterns = [
     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')),
 ]
 
 # regist to MSB when startup
@@ -30,3 +35,12 @@ if REG_TO_MSB_WHEN_START:
     import json
     from lcm.pub.utils.restcall import req_by_msb
     req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(REG_TO_MSB_REG_PARAM))
+    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
+    auto_deploy.deploy_workflow_on_startup()