X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fserializers.py;h=c5984964130e70145c191862e4a730a3c4e7e0c8;hb=a96becb1e243bfeb10e6a07a222b6910da77146b;hp=a5619ba45e58891d5011a6c1ab0246b1eb9e073e;hpb=6b791874d5ff3aad3b6ff9611ae1d269c41d9535;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/serializers.py b/lcm/lcm/nf/vnfs/serializers.py index a5619ba4..c5984964 100644 --- a/lcm/lcm/nf/vnfs/serializers.py +++ b/lcm/lcm/nf/vnfs/serializers.py @@ -17,17 +17,17 @@ from rest_framework import serializers class CreateVnfReqSerializer(serializers.Serializer): vnfdId = serializers.CharField( - help_text="vnfd Id", + help_text="vnfdId", max_length=255, required=True, allow_null=True) vnfInstanceName = serializers.CharField( - help_text="vnf Instance Name", + help_text="vnfInstanceName", max_length=255, required=True, allow_null=False) vnfInstanceDescription = serializers.CharField( - help_text="vnf Instance Description", + help_text="vnfInstanceDescription", max_length=255, required=False, allow_null=True) @@ -35,7 +35,7 @@ class CreateVnfReqSerializer(serializers.Serializer): class CreateVnfRespSerializer(serializers.Serializer): vnfInstanceId = serializers.CharField( - help_text="vnf Instance Id", + help_text="vnfInstanceId", required=True, max_length=255, allow_null=True) @@ -138,24 +138,31 @@ class InterfaceInfoSerializer(serializers.Serializer): max_length=255, allow_null=True) protocolType = serializers.ChoiceField( - help_text="protocolType", choices=[ - 'http', 'https'], required=True) + help_text="protocolType", + choices=['http', 'https'], + required=True) class VimInfoSerializer(serializers.Serializer): vimInfoId = serializers.CharField( help_text="vimInfoId", - required=False, max_length=255, allow_null=True) + required=False, + max_length=255, + allow_null=True) vimId = serializers.CharField( help_text="vimId", - required=False, max_length=255, allow_null=True) + required=False, + max_length=255, + allow_null=True) interfaceEndpoint = serializers.CharField( help_text="interfaceEndpoint", required=False, max_length=255, allow_null=True) interfaceInfo = InterfaceInfoSerializer( - help_text="vimInfoId", required=False, allow_null=True) + help_text="vimInfoId", + required=False, + allow_null=True) accessInfo = AccessInfoSerializer( help_text="accessInfo", required=False, @@ -200,15 +207,19 @@ class ExtVirtualLinkInfoSerializer(serializers.Serializer): max_length=255, allow_null=True) resourceHandle = ResourceHandleSerializer( - help_text="iPAddress", required=True) + help_text="iPAddress", + required=True) linkPorts = LinkPortsSerializer( - help_text="iPAddress", many=True, allow_null=True) + help_text="iPAddress", + many=True, + allow_null=True) class L3AddressDataSerializer(serializers.Serializer): iPAddressType = serializers.ChoiceField( - help_text="iPAddressType", choices=[ - 'IPv4', 'IPv6'], required=True) + help_text="iPAddressType", + choices=['IPv4', 'IPv6'], + required=True) iPAddress = serializers.CharField( help_text="iPAddress", required=True, @@ -218,21 +229,25 @@ class L3AddressDataSerializer(serializers.Serializer): class NetworkAddressSerializer(serializers.Serializer): addressType = serializers.ChoiceField( - help_text="addressType", choices=[ - 'MAC', 'IP'], required=True) + help_text="addressType", + choices=['MAC', 'IP'], + required=True) l2AddressData = serializers.CharField( help_text="l2AddressData", required=False, max_length=255, allow_null=True) l3AddressData = L3AddressDataSerializer( - help_text="addresses", required=False) + help_text="addresses", + required=False) class ExtCpInfoSerializer(serializers.Serializer): cpInstanceId = serializers.CharField( help_text="cpInstanceId", - required=False, max_length=255, allow_null=True) + required=False, + max_length=255, + allow_null=True) cpdId = serializers.CharField( help_text="cpdId", required=True, @@ -244,7 +259,9 @@ class ExtCpInfoSerializer(serializers.Serializer): max_length=255, allow_null=True) addresses = NetworkAddressSerializer( - help_text="addresses", many=True, allow_null=True) + help_text="addresses", + many=True, + allow_null=True) class ScaleInfoSerializer(serializers.Serializer): @@ -254,60 +271,78 @@ class ScaleInfoSerializer(serializers.Serializer): max_length=255, allow_null=True) scaleLevel = serializers.IntegerField( - help_text="scaleLevel", required=True) + help_text="scaleLevel", + required=True) class instantiatedVnfInfoSerializer(serializers.Serializer): flavourId = serializers.CharField( - help_text="flavour Id", - required=True, max_length=255, allow_null=True) + help_text="flavourId", + required=True, + max_length=255, + allow_null=True) vnfState = serializers.ChoiceField( - help_text="vnf State", - choices=[ - 'STARTED', - 'STOPPED'], + help_text="vnfState", + choices=['STARTED', 'STOPPED'], required=True, allow_null=True) - scaleStatus = ScaleInfoSerializer(help_text="scaleStatus", many=True) - extCpInfo = ExtCpInfoSerializer(help_text="extCpInfo", many=True) + scaleStatus = ScaleInfoSerializer( + help_text="scaleStatus", + many=True) + extCpInfo = ExtCpInfoSerializer( + help_text="extCpInfo", + many=True) extVirtualLink = ExtVirtualLinkInfoSerializer( - help_text="extVirtualLink", many=True) + help_text="extVirtualLink", + many=True) monitoringParameters = serializers.DictField( - help_text="monitoringParameters", child=serializers.CharField( - allow_blank=True), required=False, allow_null=True) - vimInfo = VimInfoSerializer(help_text="vimInfo", many=True) + help_text="monitoringParameters", + child=serializers.CharField(allow_blank=True), + required=False, + allow_null=True) + vimInfo = VimInfoSerializer( + help_text="vimInfo", + many=True) vnfcResourceInfo = VnfcResourceInfoSerializer( - help_text="vnfcResourceInfo", many=True) + help_text="vnfcResourceInfo", + many=True) virtualLinkResourceInfo = VirtualLinkResourceInfoSerializer( - help_text="virtualLinkResourceInfo", many=True) + help_text="virtualLinkResourceInfo", + many=True) virtualStorageResourceInfo = VirtualStorageResourceInfoSerializer( - help_text="virtualStorageResourceInfo", many=True) + help_text="virtualStorageResourceInfo", + many=True) class VnfInfoSerializer(serializers.Serializer): vnfInstanceId = serializers.CharField( - help_text="vnf Instance Id", + help_text="vnfInstanceId", required=True, max_length=255, allow_null=True) vnfInstanceName = serializers.CharField( - help_text="vnf Instance Name", + help_text="vnfInstanceName", required=True, max_length=255, allow_null=True) onboardedVnfPkgInfoId = serializers.CharField( - help_text="onboarded Vnf Pkg Info Id", + help_text="onboardedVnfPkgInfoId", required=False, max_length=255, allow_null=True) vnfdVersion = serializers.CharField( - help_text="vnfd Version", - required=False, max_length=255, allow_null=True) + help_text="vnfdVersion", + required=False, + max_length=255, + allow_null=True) vnfProvider = serializers.CharField( - help_text="vnf Provider", - required=False, max_length=255, allow_null=True) + help_text="vnfProvider", + required=False, + max_length=255, + allow_null=True) instantiatedVnfInfo = instantiatedVnfInfoSerializer( - help_text="instantiatedVnfInfo", required=True) + help_text="instantiatedVnfInfo", + required=True) class VnfsInfoSerializer(serializers.ListSerializer): @@ -317,7 +352,9 @@ class VnfsInfoSerializer(serializers.ListSerializer): class ExtVirtualLinkSerizlizer(serializers.Serializer): vlInstanceId = serializers.CharField( help_text="vlInstanceId", - required=False, max_length=255, allow_null=True) + required=False, + max_length=255, + allow_null=True) resourceSubnetId = serializers.CharField( help_text="resourceSubnetId", required=False, @@ -325,11 +362,18 @@ class ExtVirtualLinkSerizlizer(serializers.Serializer): allow_null=True) cpdId = serializers.CharField( help_text="cpdId", - required=False, max_length=255, allow_null=True) + required=False, + max_length=255, + allow_null=True) resourceId = serializers.CharField( help_text="resourceId", - required=False, max_length=255, allow_null=True) - vim = VimInfoSerializer(help_text="vim", required=False, allow_null=True) + required=False, + max_length=255, + allow_null=True) + vim = VimInfoSerializer( + help_text="vim", + required=False, + allow_null=True) extCps = ExtCpInfoSerializer( help_text="extCps", many=True, @@ -337,23 +381,17 @@ class ExtVirtualLinkSerizlizer(serializers.Serializer): allow_null=True) -class ExtVirtualLinksSerializer(serializers.ListSerializer): - child = ExtVirtualLinkSerizlizer( - help_text="extVirtualLink", - required=False, - allow_null=True) - - class AdditionalParamsSerializer(serializers.Serializer): inputs = serializers.DictField( help_text="inputs", - child=serializers.CharField( - help_text="custom key-value", - allow_blank=True), + child=serializers.CharField(help_text="custom key-value", allow_blank=True), + required=False, + allow_null=True) + extVirtualLinks = serializers.ListSerializer( + help_text="extVirtualLinks", + child=ExtVirtualLinkSerizlizer(help_text="extVirtualLinks", required=False, allow_null=True), required=False, allow_null=True) - extVirtualLinks = ExtVirtualLinksSerializer( - help_text="extVirtualLinks", required=False, allow_null=True) class InstantiateVnfRequestSerializer(serializers.Serializer): @@ -372,10 +410,15 @@ class InstantiateVnfRequestSerializer(serializers.Serializer): required=True, max_length=255, allow_null=True) - extVirtualLinks = ExtVirtualLinksSerializer( - help_text="extVirtualLinks", required=False, allow_null=True) + extVirtualLinks = serializers.ListSerializer( + help_text="extVirtualLinks", + child=ExtVirtualLinkSerizlizer(help_text="extVirtualLinks", required=False, allow_null=True), + required=False, + allow_null=True) additionalParams = AdditionalParamsSerializer( - help_text="additionalParams", required=False, allow_null=True) + help_text="additionalParams", + required=False, + allow_null=True) class InstOrTeriVnfResponseSerializer(serializers.Serializer): @@ -393,4 +436,6 @@ class TerminateVnfRequestSerializer(serializers.Serializer): max_length=255, allow_null=True) gracefulTerminationTimeout = serializers.IntegerField( - help_text="gracefulTerminationTimeout", default=120, required=False) + help_text="gracefulTerminationTimeout", + default=120, + required=False)