From 71dc300e10883633f05bbd7368264ed18e9a3474 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Tue, 6 Feb 2018 18:12:26 +0800 Subject: Modify vfc-ztevnfmdriver urls Change-Id: I9f919005eabefda715d4430e715847edcef9d0cc Issue-ID: VFC-736 Signed-off-by: ying.yunlong --- zte/vmanager/driver/interfaces/urls.py | 21 ++++++++------------- zte/vmanager/driver/swagger/views.py | 3 --- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/zte/vmanager/driver/interfaces/urls.py b/zte/vmanager/driver/interfaces/urls.py index 745ff830..5f972b47 100644 --- a/zte/vmanager/driver/interfaces/urls.py +++ b/zte/vmanager/driver/interfaces/urls.py @@ -17,23 +17,18 @@ from django.conf.urls import url from driver.interfaces import views urlpatterns = [ - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs$', views.instantiate_vnf, - name='instantiate_vnf'), - url( - r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P' - r'[0-9a-zA-Z\-\_]+)/terminate$', + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs$', views.instantiate_vnf, name='instantiate_vnf'), + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/terminate$', views.terminate_vnf, name='terminate_vnf'), - url( - r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P' - r'[0-9a-zA-Z\-\_]+)$', + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)$', views.query_vnf, name='query_vnf'), - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/jobs/(?P[0-9a-zA-Z\-\_]+)$', + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/jobs/(?P[0-9a-zA-Z\-\_]+)$', views.operation_status, name='operation_status'), - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/resource/grant$', views.grantvnf, name='grantvnf'), - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/vnfs/lifecyclechangesnotification$', views.notify, name='notify'), - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/scale$', + url(r'^api/ztevnfmdriver/v1/resource/grant$', views.grantvnf, name='grantvnf'), + url(r'^api/ztevnfmdriver/v1/vnfs/lifecyclechangesnotification$', views.notify, name='notify'), + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/scale$', views.scale, name='scale'), - url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/heal$', + url(r'^api/ztevnfmdriver/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/heal$', views.heal, name='heal'), url(r'^samples/$', views.samples, name='samples') ] diff --git a/zte/vmanager/driver/swagger/views.py b/zte/vmanager/driver/swagger/views.py index e9c96043..400d6dd1 100644 --- a/zte/vmanager/driver/swagger/views.py +++ b/zte/vmanager/driver/swagger/views.py @@ -18,9 +18,6 @@ from rest_framework.response import Response class SwaggerView(APIView): - """ - Show rest api swagger. - """ def get(self, request, format=None): json_file = os.path.join(os.path.dirname(__file__), 'swagger.json') f = open(json_file) -- cgit 1.2.3-korg From c495a0e9025cdf6f8df411c5a03507a10449bdb8 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Tue, 6 Feb 2018 18:21:22 +0800 Subject: Add vfc-ztevnfmdriver serializer file Change-Id: I92111dbe6e31a9520e1c583f1790d920dd32f8c1 Issue-ID: VFC-736 Signed-off-by: ying.yunlong --- zte/vmanager/driver/interfaces/serializers.py | 67 +++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 zte/vmanager/driver/interfaces/serializers.py diff --git a/zte/vmanager/driver/interfaces/serializers.py b/zte/vmanager/driver/interfaces/serializers.py new file mode 100644 index 00000000..abf0f4de --- /dev/null +++ b/zte/vmanager/driver/interfaces/serializers.py @@ -0,0 +1,67 @@ +# Copyright 2018 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from rest_framework import serializers + + +class AffectedvmSerializer(serializers.Serializer): + extention = serializers.CharField( + help_text="extention", + max_length=255, + required=True, + allow_null=True) + vmid = serializers.CharField( + help_text="vmid", + max_length=255, + required=True, + allow_null=False) + changtype = serializers.CharField( + help_text="changtype", + max_length=255, + required=False, + allow_null=True) + vduid = serializers.CharField( + help_text="vduid", + max_length=255, + required=True, + allow_null=False) + vmname = serializers.CharField( + help_text="vmname", + max_length=255, + required=False, + allow_null=True) + flavour = serializers.DictField( + help_text="flavour", + child=serializers.CharField(allow_blank=True), + required=False, + allow_null=True) + + +class HealReqSerializer(serializers.Serializer): + action = serializers.CharField( + help_text="action", + max_length=255, + required=True, + allow_null=True) + lifecycleoperation = serializers.CharField( + help_text="lifecycleoperation", + max_length=255, + required=True, + allow_null=False) + isgrace = serializers.CharField( + help_text="isgrace", + max_length=255, + required=False, + allow_null=True) + affectedvm = AffectedvmSerializer(help_text='affectedvm', many=True) -- cgit 1.2.3-korg