Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed duplicate oom registration for local programs
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
urls.py
diff --git
a/lcm/lcm/urls.py
b/lcm/lcm/urls.py
index
a4ebda9
..
d7a7a1d
100644
(file)
--- a/
lcm/lcm/urls.py
+++ b/
lcm/lcm/urls.py
@@
-13,17
+13,25
@@
# limitations under the License.
from django.conf.urls import include, url
# limitations under the License.
from django.conf.urls import include, url
-from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
+from django.contrib import admin
+
+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/vnflcm/v1/admin', admin.site.urls),
url(r'^', include('lcm.samples.urls')),
url(r'^', include('lcm.samples.urls')),
- url(r'^', include('lcm.nf.vnfs.urls')),
+ url(r'^', include('lcm.nf.urls')),
+ # url(r'^', include('lcm.v2.urls')),
url(r'^', include('lcm.jobs.urls')),
url(r'^', include('lcm.swagger.urls')),
]
# regist to MSB when startup
url(r'^', include('lcm.jobs.urls')),
url(r'^', include('lcm.swagger.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
import json
from lcm.pub.utils.restcall import req_by_msb
+
+ req_by_msb(MSB_SVC_URL, "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))