From: yunlong ying <ying.yunlong@zte.com.cn>
Date: Wed, 3 Apr 2019 01:02:05 +0000 (+0000)
Subject: Merge changes Id32773c0,Id876742f
X-Git-Tag: 1.3.0~66
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=beedfac1cf7e7c0ad5d127dcdd32b779a214c950;p=vfc%2Fnfvo%2Flcm.git

Merge changes Id32773c0,Id876742f

* changes:
  fix NS Subscription url error
  fix NS Subscription serializer error
---

beedfac1cf7e7c0ad5d127dcdd32b779a214c950
diff --cc lcm/ns/urls.py
index d24ad6c2,fd826fab..1e859d3d
--- a/lcm/ns/urls.py
+++ b/lcm/ns/urls.py
@@@ -53,14 -53,10 +54,13 @@@ urlpatterns = 
      url(r'^api/nslcm/v1/ns_instances/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/update$', UpdateNSView.as_view()),
      url(r'^api/nslcm/v1/ns_instances/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', ScaleNSView.as_view()),
      url(r'^api/nslcm/v1/ns_instances/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/heal$', HealNSView.as_view()),
-     url(r'^api/nslcm/v1/ns_instances/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', IndividualNsInstanceView.as_view()),
+     url(r'^api/nslcm/v1/ns_instances/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', TerminateNsView.as_view()),
+     url(r'^api/nslcm/v1/ns_lcm_op_occs/(?P<lcmopoccid>[0-9a-zA-Z_-]+)$', QuerySingleNsLcmOpOcc.as_view()),
      url(r'^api/nslcm/v1/subscriptions$', SubscriptionsView.as_view()),
 -    url(r'^api/nslcm/v1/ns_lcm_op_occs$', QueryMultiNsLcmOpOccs.as_view())
 +    url(r'^api/nslcm/v1/ns_lcm_op_occs$', QueryMultiNsLcmOpOccs.as_view()),
 +
 +    # health check
 +    url(r'^api/nslcm/v1/health_check$', HealthCheckView.as_view())
  
  ]