diff options
| author |   hewei-cmss <hewei@cmss.chinamobile.com> | 2019-10-14 09:54:51 +0800 |
|---|---|---|
| committer | hewei-cmss <hewei@cmss.chinamobile.com> | 2019-10-14 09:54:51 +0800 |
| commit | f531520df364b40c6811f82c187f6698253b5eff (patch) | |
| tree | 20ec66894756014d969deb8e4543be79fd575bee | |
| parent | 5d308c8d4b9f943338cca914097eb3f01bdf955b (diff) | |
add catalog api
Add catalog api for lcm to modify package status
Issue-ID: VFC-1549
Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: Ib72ab2e1b616e1a46a1a7e0f33e9e61ae6844bff
| -rw-r--r-- | catalog/packages/biz/ns_descriptor.py | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | catalog/packages/urls.py | 3 | ||||
| -rw-r--r-- | catalog/packages/views/ns_descriptor_views.py | 18 |
3 files changed, 25 insertions, 0 deletions
diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py index f0e05723..bb6da1ea 100644 --- a/catalog/packages/biz/ns_descriptor.py +++ b/catalog/packages/biz/ns_descriptor.py @@ -57,6 +57,10 @@ class NsDescriptor(object): logger.info('A NSD(%s) has been created.' % data['id']) return data + def update(self, data, nsd_info_id): + usageState = PKG_STATUS.IN_USE if data["usageState"] else PKG_STATUS.NOT_IN_USE + NSPackageModel.objects.filter(nsPackageId=nsd_info_id).update(usageState=usageState) + def query_multiple(self, nsdId=None): if nsdId: ns_pkgs = NSPackageModel.objects.filter(nsdId=nsdId) diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py index 776e940e..14783496 100755..100644 --- a/catalog/packages/urls.py +++ b/catalog/packages/urls.py @@ -68,6 +68,9 @@ urlpatterns = [ # url(r'^api/vnfpkgm/v1/subscriptions/(?P<subscriptionId>[0-9a-zA-Z\-\_]+)$', vnfpkg_subscription.as_view(), name='subscription_rd'), + # catalog and lcm interaction APIS + url(r'^api/catalog/v1/ns_descriptors/(?P<nsdInfoId>[0-9a-zA-Z\-\_]+)$', ns_descriptor_views.ns_descriptors_u, name='ns_descriptors_u'), + # health check url(r'^api/vnfpkgm/v1/health_check$', HealthCheckView.as_view()), url(r'^api/nsd/v1/health_check$', HealthCheckView.as_view()), diff --git a/catalog/packages/views/ns_descriptor_views.py b/catalog/packages/views/ns_descriptor_views.py index 3b8c1f92..d0de5aec 100644 --- a/catalog/packages/views/ns_descriptor_views.py +++ b/catalog/packages/views/ns_descriptor_views.py @@ -137,3 +137,21 @@ def nsd_content_ru(request, **kwargs): file_range = request.META.get('HTTP_RANGE') file_iterator = NsDescriptor().download(nsd_info_id, file_range) return StreamingHttpResponse(file_iterator, status=status.HTTP_200_OK) + + +@swagger_auto_schema( + method='PUT', + operation_description="Update a NSD", + request_body=no_body, + responses={ + status.HTTP_202_ACCEPTED: "Successfully", + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } +) +@api_view(http_method_names=['PUT']) +@view_safe_call_with_log(logger=logger) +def ns_descriptors_u(request, **kwargs): + if request.method == 'PUT': + nsd_info_id = kwargs.get("nsdInfoId") + NsDescriptor().update(request.data, nsd_info_id) + return Response(data=None, status=status.HTTP_202_ACCEPTED) |