summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2018-01-29 13:24:39 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2018-01-29 13:24:39 +0800
commit6514f80c64f28be1acfef606ae85f357b42fc684 (patch)
tree1af1dc6f42d34329abab7cdc6150cb79382168e4 /res
parentd6f8f0f2835b5634f5509a1f011690cb1fcfd636 (diff)
Add vfc-vnfres getVms auto-swagger
Change-Id: Ifc2dcfe13e11182e4d092aa1b490fd7b94f4f6ca Issue-ID: VFC-682 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'res')
-rw-r--r--res/res/resources/urls.py2
-rw-r--r--res/res/resources/views.py44
2 files changed, 28 insertions, 18 deletions
diff --git a/res/res/resources/urls.py b/res/res/resources/urls.py
index 0973e09..408be98 100644
--- a/res/res/resources/urls.py
+++ b/res/res/resources/urls.py
@@ -20,7 +20,7 @@ from res.resources import views
urlpatterns = [
url(r'^api/vnfres/v1/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)$', views.get_vnf, name='get_vnf'),
url(r'^api/vnfres/v1/vnfs$', views.get_vnfs, name='get_vnfs'),
- url(r'^api/vnfres/v1/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/vms$', views.get_vms, name='get_vms'),
+ url(r'^api/vnfres/v1/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/vms$', views.getVms.as_view(), name='get_vms'),
url(r'^api/vnfres/v1/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/flavors$', views.getFlavors.as_view(), name='get_flavors'),
url(r'^api/vnfres/v1/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/networks$', views.getNetworks.as_view(), name='get_networks'),
url(r'^api/vnfres/v1/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/subnets$', views.getSubnets.as_view(), name='get_subnets'),
diff --git a/res/res/resources/views.py b/res/res/resources/views.py
index dbd2054..d7275dd 100644
--- a/res/res/resources/views.py
+++ b/res/res/resources/views.py
@@ -27,7 +27,7 @@ from res.pub.exceptions import VNFRESException
from res.pub.utils.syscomm import fun_name
from res.pub.utils.values import ignore_case_get
from res.resources.serializers import VolumeInfoSerializer, CpsInfoSerializer, SubnetInfoSerializer, \
- NetworkInfoSerializer, FlavorInfoSerializer
+ NetworkInfoSerializer, FlavorInfoSerializer, VmInfoSerializer
logger = logging.getLogger(__name__)
@@ -173,22 +173,32 @@ def get_vnfs(request):
return Response(data={'error': 'Failed to get Vnfs'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-@api_view(http_method_names=['GET'])
-def get_vms(request, *args, **kwargs):
- logger.debug("Query all the vms by vnfInstanceId[%s]", fun_name())
- try:
- vnf_inst_id = ignore_case_get(kwargs, "vnfInstanceId")
- vms = VmInstModel.objects.filter(instid=vnf_inst_id)
- if not vms:
- return Response(data={'error': 'Vms does not exist'}, status=status.HTTP_404_NOT_FOUND)
- arr = []
- for vm in vms:
- arr.append(fill_vms_data(vm))
- return Response(data={'resp_data': arr}, status=status.HTTP_200_OK)
- except Exception as e:
- logger.error(e.message)
- logger.error(traceback.format_exc())
- return Response(data={'error': 'Failed to get Vms'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+class getVms(APIView):
+ @swagger_auto_schema(
+ responses={
+ status.HTTP_200_OK: VmInfoSerializer(),
+ status.HTTP_404_NOT_FOUND: 'Vms does not exist',
+ status.HTTP_500_INTERNAL_SERVER_ERROR: 'internal error'})
+ def get(self, request, vnfInstanceId):
+ logger.debug("Query all the vms by vnfInstanceId[%s]", fun_name())
+ try:
+ vms = VmInstModel.objects.filter(instid=vnfInstanceId)
+ if not vms:
+ return Response(data={'error': 'Vms does not exist'}, status=status.HTTP_404_NOT_FOUND)
+ arr = []
+ for vm in vms:
+ arr.append(fill_vms_data(vm))
+
+ vmInfoSerializer = VmInfoSerializer(data={'resp_data': arr})
+ isValid = vmInfoSerializer.is_valid()
+ if not isValid:
+ raise Exception(vmInfoSerializer.errors)
+
+ return Response(data=vmInfoSerializer.data, status=status.HTTP_200_OK)
+ except Exception as e:
+ logger.error(e.message)
+ logger.error(traceback.format_exc())
+ return Response(data={'error': 'Failed to get Vms'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
def fill_vms_data(vm):