diff options
| -rw-r--r-- | lcm/ns/serializers/ns_serializers.py | 8 | ||||
| -rw-r--r-- | lcm/ns_vnfs/serializers/grant_vnf_serializer.py | 28 | ||||
| -rw-r--r-- | lcm/ns_vnfs/serializers/serializers.py | 12 |
3 files changed, 24 insertions, 24 deletions
diff --git a/lcm/ns/serializers/ns_serializers.py b/lcm/ns/serializers/ns_serializers.py index 041948bb..136f5a43 100644 --- a/lcm/ns/serializers/ns_serializers.py +++ b/lcm/ns/serializers/ns_serializers.py @@ -72,13 +72,13 @@ class QueryNsRespSerializer(serializers.Serializer): nsState = serializers.CharField(help_text="State of NS instance", required=False, allow_null=True) -class VimSerializer(serializers.Serializer): +class VnfLocationSerializer(serializers.Serializer): vimId = serializers.CharField(help_text="ID of VIM", required=False, allow_null=True) class LocationConstraintSerializer(serializers.Serializer): vnfProfileId = serializers.CharField(help_text="ID of VNF profile", required=False, allow_null=True) - locationConstraints = VimSerializer(help_text="Location constraint", required=False, allow_null=True) + locationConstraints = VnfLocationSerializer(help_text="Location constraint", required=False, allow_null=True) class AddressRange(serializers.Serializer): @@ -94,7 +94,7 @@ class IpAddress(serializers.Serializer): subnetId = serializers.CharField(help_text="Subnet defined by the identifier of the subnet resource in the VIM.", required=False) -class IpOverEthernetAddressData(serializers.Serializer): +class IpOverEthernetSerializer(serializers.Serializer): macAddress = serializers.CharField(help_text="MAC address.", required=False) ipAddresses = IpAddress(help_text="List of IP addresses to assign to the extCP instance.", required=False, many=True) @@ -105,7 +105,7 @@ class CpProtocolInfoSerializer(serializers.Serializer): choices=["IP_OVER_ETHERNET"], required=True, allow_null=False) - ipOverEthernet = IpOverEthernetAddressData( + ipOverEthernet = IpOverEthernetSerializer( help_text="IP addresses over Ethernet to assign to the extCP instance.", required=False, allow_null=True) diff --git a/lcm/ns_vnfs/serializers/grant_vnf_serializer.py b/lcm/ns_vnfs/serializers/grant_vnf_serializer.py index b4d41023..43ff5f0b 100644 --- a/lcm/ns_vnfs/serializers/grant_vnf_serializer.py +++ b/lcm/ns_vnfs/serializers/grant_vnf_serializer.py @@ -436,7 +436,7 @@ class IpAddresseSerializer(serializers.Serializer): ) -class IpOverEthernetAddressDataSerializer(serializers.Serializer): +class IpOverEthernetAddressSerializer(serializers.Serializer): macAddress = serializers.CharField( help_text="MAC address.", required=False, @@ -450,20 +450,20 @@ class IpOverEthernetAddressDataSerializer(serializers.Serializer): ) -class CpProtocolDataSerializer(serializers.Serializer): +class CpProtocolDataConfigSerializer(serializers.Serializer): layerProtocol = serializers.ChoiceField( help_text="Identifier of layer(s) and protocol(s).", choices=["IP_OVER_ETHERNET"], required=True ) - ipOverEthernet = IpOverEthernetAddressDataSerializer( + ipOverEthernet = IpOverEthernetAddressSerializer( help_text="Network address data for IP over Ethernet to assign to the extCP instance.", required=False, allow_null=True, ) -class VnfExtCpConfigSerializer(serializers.Serializer): +class VnfExtCpConfigDataSerializer(serializers.Serializer): cpInstanceId = serializers.CharField( help_text="Identifier of the external CP instance to which this set of configuration parameters is requested to be applied.", required=False, @@ -476,26 +476,26 @@ class VnfExtCpConfigSerializer(serializers.Serializer): allow_null=True, allow_blank=True ) - cpProtocolData = CpProtocolDataSerializer( + cpProtocolData = CpProtocolDataConfigSerializer( help_text="Parameters for configuring the network protocols on the link port that connects the CP to a VL.", many=True, required=False ) -class VnfExtCpDataSerializer(serializers.Serializer): +class VnfExtCpSerializer(serializers.Serializer): cpdId = serializers.CharField( help_text="The identifier of the CPD in the VNFD.", required=True ) - cpConfig = VnfExtCpConfigSerializer( + cpConfig = VnfExtCpConfigDataSerializer( help_text="List of instance data that need to be configured on the CP instances created from the respective CPD.", many=True, required=False ) -class ExtLinkPortDataSerializer(serializers.Serializer): +class ExtLinkPortSerializer(serializers.Serializer): id = serializers.CharField( help_text="Identifier of this link port as provided by the entity that has created the link port.", required=True @@ -506,7 +506,7 @@ class ExtLinkPortDataSerializer(serializers.Serializer): ) -class ExtVirtualLinkDataSerializer(serializers.Serializer): +class ExtVirtualLinkSerializer(serializers.Serializer): id = serializers.CharField( help_text="The identifier of the external VL instance.", required=True @@ -527,19 +527,19 @@ class ExtVirtualLinkDataSerializer(serializers.Serializer): help_text="The identifier of the resource in the scope of the VIM or the resource provider.", required=True ) - extCps = VnfExtCpDataSerializer( + extCps = VnfExtCpSerializer( help_text="External CPs of the VNF to be connected to this external VL.", many=True, required=False ) - extLinkPorts = ExtLinkPortDataSerializer( + extLinkPorts = ExtLinkPortSerializer( help_text="Externally provided link ports to be used to connect external connection points to this external VL.", many=True, required=False ) -class ExtManagedVirtualLinkDataSerializer(serializers.Serializer): +class ExtManagedVirtualLinkSerializer(serializers.Serializer): id = serializers.CharField( help_text="The identifier of the externally-managed internal VL instance.", required=True @@ -654,12 +654,12 @@ class GrantSerializer(serializers.Serializer): required=False, allow_null=True ) - extVirtualLinks = ExtVirtualLinkDataSerializer( + extVirtualLinks = ExtVirtualLinkSerializer( help_text="Information about external VLs to connect the VNF to.", many=True, required=False ) - extManagedVirtualLinks = ExtManagedVirtualLinkDataSerializer( + extManagedVirtualLinks = ExtManagedVirtualLinkSerializer( help_text="Information about internal VLs that are managed by other entities than the VNFM.", many=True, required=False diff --git a/lcm/ns_vnfs/serializers/serializers.py b/lcm/ns_vnfs/serializers/serializers.py index 0d7b8a84..d9d6fa06 100644 --- a/lcm/ns_vnfs/serializers/serializers.py +++ b/lcm/ns_vnfs/serializers/serializers.py @@ -87,7 +87,7 @@ class GrantVnfRespSerializer(serializers.Serializer): vim = VimSerializer(help_text="VIM Info", required=True) -class AffectedVnfcSerializer(serializers.Serializer): +class AffectedVnfcLcmSerializer(serializers.Serializer): vnfcInstanceId = serializers.CharField(help_text="ID of VNFC instance", required=False, allow_null=True, allow_blank=True) vduId = serializers.CharField(help_text="ID of VDU in VNFD", required=False, allow_null=True, allow_blank=True) changeType = serializers.ChoiceField( @@ -110,7 +110,7 @@ class NetworkResourceSerializer(serializers.Serializer): resourceName = serializers.CharField(help_text="Name of network resource", required=False, allow_null=True, allow_blank=True) -class AffectedVirtualLinkSerializer(serializers.Serializer): +class AffectedVirtualLinkLcmSerializer(serializers.Serializer): vlInstanceId = serializers.CharField(help_text="ID of VL instance", required=False, allow_null=True, allow_blank=True) vldId = serializers.CharField(help_text="ID of VLD in VNFD", required=False, allow_null=True, allow_blank=True) changeType = serializers.ChoiceField( @@ -145,7 +145,7 @@ class AffectedCpSerializer(serializers.Serializer): portResource = PortResourceSerializer(help_text="Port Resource", required=False, allow_null=True) -class AffectedVirtualStorage(serializers.Serializer): +class AffectedVirtualStorageLcm(serializers.Serializer): pass @@ -162,10 +162,10 @@ class NotifyLcmReqSerializer(serializers.Serializer): ) jobId = serializers.CharField(help_text="ID of Job", required=False, allow_null=True, allow_blank=True) vnfdmodule = serializers.CharField(help_text="VNFD Module", required=False, allow_null=True, allow_blank=True) - affectedVnfc = AffectedVnfcSerializer(help_text="Affected VNFC", many=True) - affectedVl = AffectedVirtualLinkSerializer(help_text="Affected VL", many=True) + affectedVnfc = AffectedVnfcLcmSerializer(help_text="Affected VNFC", many=True) + affectedVl = AffectedVirtualLinkLcmSerializer(help_text="Affected VL", many=True) affectedCp = AffectedCpSerializer(help_text="Affected CP", many=True) - affectedVirtualStorage = AffectedVirtualStorage(help_text="Affected Virtual Storage(Not supported)", many=True) + affectedVirtualStorage = AffectedVirtualStorageLcm(help_text="Affected Virtual Storage(Not supported)", many=True) class ScaleVnfDataSerializer(serializers.Serializer): |