Code Review
/
vfc
/
nfvo
/
lcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
update link to upper-constraints.txt
[vfc/nfvo/lcm.git]
/
lcm
/
urls.py
diff --git
a/lcm/urls.py
b/lcm/urls.py
index
44b79f5
..
b016d1c
100644
(file)
--- a/
lcm/urls.py
+++ b/
lcm/urls.py
@@
-13,14
+13,17
@@
# limitations under the License.
from django.conf.urls import include, url
# 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 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 = [
urlpatterns = [
+ url(r'^api/nslcm/v1/admin', admin.site.urls),
url(r'^', include('lcm.samples.urls')),
url(r'^', include('lcm.ns_vnfs.urls')),
url(r'^', include('lcm.samples.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.ns_vls.urls')),
url(r'^', include('lcm.ns_sfcs.urls')),
url(r'^', include('lcm.ns.urls')),
@@
-30,11
+33,18
@@
urlpatterns = [
]
# regist to MSB when startup
]
# 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
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(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
# deploy workflow when startup
if DEPLOY_WORKFLOW_WHEN_START:
from lcm.workflows import auto_deploy