summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryunlong ying <ying.yunlong@zte.com.cn>2018-02-06 10:43:54 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-06 10:43:54 +0000
commitfefc5d626f39a11df049cbea557fad735ae54660 (patch)
tree5c5266800ceff5d852cff2a70139a792b94ed279
parent5d37d20ad42623d8194128014f27b2e455a0504f (diff)
parentc495a0e9025cdf6f8df411c5a03507a10449bdb8 (diff)
Merge changes I92111dbe,I9f919005
* changes: Add vfc-ztevnfmdriver serializer file Modify vfc-ztevnfmdriver urls
-rw-r--r--zte/vmanager/driver/interfaces/serializers.py67
-rw-r--r--zte/vmanager/driver/interfaces/urls.py21
-rw-r--r--zte/vmanager/driver/swagger/views.py3
3 files changed, 75 insertions, 16 deletions
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)
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<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs$', views.instantiate_vnf,
- name='instantiate_vnf'),
- url(
- r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>'
- r'[0-9a-zA-Z\-\_]+)/terminate$',
+ url(r'^api/ztevnfmdriver/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs$', views.instantiate_vnf, name='instantiate_vnf'),
+ url(r'^api/ztevnfmdriver/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/terminate$',
views.terminate_vnf, name='terminate_vnf'),
- url(
- r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>'
- r'[0-9a-zA-Z\-\_]+)$',
+ url(r'^api/ztevnfmdriver/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)$',
views.query_vnf, name='query_vnf'),
- url(r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/jobs/(?P<jobid>[0-9a-zA-Z\-\_]+)$',
+ url(r'^api/ztevnfmdriver/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/jobs/(?P<jobid>[0-9a-zA-Z\-\_]+)$',
views.operation_status, name='operation_status'),
- url(r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/resource/grant$', views.grantvnf, name='grantvnf'),
- url(r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/vnfs/lifecyclechangesnotification$', views.notify, name='notify'),
- url(r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[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<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/scale$',
views.scale, name='scale'),
- url(r'^api/(?P<vnfmtype>[0-9a-zA-Z\-\_]+)/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z\-\_]+)/heal$',
+ url(r'^api/ztevnfmdriver/v1/(?P<vnfmid>[0-9a-zA-Z\-\_]+)/vnfs/(?P<vnfInstanceId>[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)