From 262a2b0a4167f9e0d11430d1c7f41a7f1d373626 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Thu, 1 Feb 2018 09:46:03 +0800 Subject: Remove vfc-vnfmgr redundant interfaces Change-Id: I03f7300dc4d0394795d011afdf663cb4e9675bfd Issue-ID: VFC-670 Signed-off-by: ying.yunlong --- mgr/mgr/swagger/urls.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'mgr') diff --git a/mgr/mgr/swagger/urls.py b/mgr/mgr/swagger/urls.py index 2dba098..ee8b148 100644 --- a/mgr/mgr/swagger/urls.py +++ b/mgr/mgr/swagger/urls.py @@ -18,13 +18,14 @@ from drf_yasg.views import get_schema_view from rest_framework import permissions swagger_info = openapi.Info( - title="vnfmgr API", + title="vfc-vnfmgr API", default_version='v1', description=""" -The `swagger-ui` view can be found [here](/api/vnfmgr/v1/cached/swagger). -The `ReDoc` view can be found [here](/api/vnfmgr/v1/cached/redoc). -The swagger YAML document can be found [here](/api/vnfmgr/v1/cached/swagger.yaml).""" +The `swagger-ui` view can be found [here](/api/vnfmgr/v1/swagger). +The `ReDoc` view can be found [here](/api/vnfmgr/v1/redoc). +The swagger YAML document can be found [here](/api/vnfmgr/v1/swagger.yaml). +The swagger JSON document can be found [here](/api/vnfmgr/v1/swagger.json).""" ) SchemaView = get_schema_view( @@ -36,9 +37,6 @@ SchemaView = get_schema_view( urlpatterns = [ # url(r'^api/vnfmgr/v1/swagger.json$', views.SwaggerView.as_view()), url(r'^api/vnfmgr/v1/swagger(?P.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'), - url(r'^api/vnfmgr/v1/swagger/$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), - url(r'^api/vnfmgr/v1/redoc/$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'), - url(r'^api/vnfmgr/v1/cached/swagger(?P.json|.yaml)$', SchemaView.without_ui(cache_timeout=None), name='cschema-json'), - url(r'^api/vnfmgr/v1/cached/swagger/$', SchemaView.with_ui('swagger', cache_timeout=None), name='cschema-swagger-ui'), - url(r'^api/vnfmgr/v1/cached/redoc/$', SchemaView.with_ui('redoc', cache_timeout=None), name='cschema-redoc'), + url(r'^api/vnfmgr/v1/swagger$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), + url(r'^api/vnfmgr/v1/redoc$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc') ] -- cgit 1.2.3-korg From 9f680fa6e7e31e750d46ed0e645026427ec7bfad Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Thu, 1 Feb 2018 09:56:17 +0800 Subject: Modify vfc-vnfmgr serializer file Change-Id: Ic5856d81a4975c4a666259cbcf2b18e033ec428c Issue-ID: VFC-670 Signed-off-by: ying.yunlong --- mgr/mgr/vnfreg/serializers.py | 63 +++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 14 deletions(-) (limited to 'mgr') diff --git a/mgr/mgr/vnfreg/serializers.py b/mgr/mgr/vnfreg/serializers.py index e49f7b4..84b1250 100644 --- a/mgr/mgr/vnfreg/serializers.py +++ b/mgr/mgr/vnfreg/serializers.py @@ -17,42 +17,77 @@ from rest_framework import serializers class VnfInfoSerializer(serializers.Serializer): vnfInstId = serializers.CharField( - help_text="the instance id of vnf", required=True) - ip = serializers.CharField(help_text="the ip of vnf", required=True) - port = serializers.CharField(help_text="the port of vnf", required=True) + help_text="the instance id of vnf", + required=True, + max_length=200, + allow_null=True) + ip = serializers.CharField( + help_text="the ip of vnf", + required=True, + max_length=200, + allow_null=True) + port = serializers.CharField( + help_text="the port of vnf", + required=True, + max_length=200, + allow_null=True) username = serializers.CharField( - help_text="the username of vnf", required=True) + help_text="the username of vnf", + required=True, + max_length=255, + allow_null=True) password = serializers.CharField( - help_text="the password of vnf", required=True) + help_text="the password of vnf", + required=True, + max_length=255, + allow_null=True) class ResponseSerializer(serializers.Serializer): vnfInstId = serializers.CharField( - help_text="the instance id of vnf", required=True) + help_text="the instance id of vnf", + required=True, + max_length=200, + allow_null=False) class CpSerializer(serializers.Serializer): - cpId = serializers.CharField(help_text="the cps id of vnf", required=True) + cpId = serializers.CharField( + help_text="the cps id of vnf", + required=True, + max_length=200, + allow_null=True) cpdId = serializers.CharField( help_text="the cpds id of vnf", - required=True) + required=True, max_length=200, allow_null=True) class SpecificDataSerializer(serializers.Serializer): autoScalable = serializers.CharField( - help_text="the autoScalable of vnf", required=True) + help_text="the autoScalable of vnf", + required=True, + max_length=200, + allow_null=True) autoHealable = serializers.CharField( - help_text="the autoHealable of vnf", required=True) + help_text="the autoHealable of vnf", + required=True, + max_length=200, + allow_null=True) class ConfigDataSerializer(serializers.Serializer): - cp = CpSerializer(help_text="the cps of vnf", many=True) + cp = CpSerializer(help_text="the cps of vnf", many=True, allow_null=True) vnfSpecificData = SpecificDataSerializer( - help_text="the vnfSpecificData of vnf", required=True) + help_text="the vnfSpecificData of vnf", required=True, allow_null=True) class VnfConfigSerializer(serializers.Serializer): vnfInstanceId = serializers.CharField( - help_text="the instance id of vnf", required=True) + help_text="the instance id of vnf", + required=True, + max_length=200, + allow_null=True) vnfConfigurationData = ConfigDataSerializer( - help_text="the ConfigDataSerializer of vnf", required=True) + help_text="the ConfigDataSerializer of vnf", + required=True, + allow_null=True) -- cgit 1.2.3-korg