From 9daa41753adef2e5d9bcc2d7ca4234d41e0c762e Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 14 Mar 2019 18:42:49 +0800 Subject: [PATCH] fix the serializer bug of nslcm Change-Id: If1a0ccdca2b0b002633bc0f6be9a1c442e40e57d Issue-ID: VFC-1270 Signed-off-by: yangyan --- lcm/ns/serializers/create_ns_serializers.py | 6 ------ lcm/ns/serializers/inst_ns_serializers.py | 15 +-------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lcm/ns/serializers/create_ns_serializers.py b/lcm/ns/serializers/create_ns_serializers.py index 9162f971..823a3d9d 100644 --- a/lcm/ns/serializers/create_ns_serializers.py +++ b/lcm/ns/serializers/create_ns_serializers.py @@ -38,12 +38,6 @@ class VnfInstanceSerializer(serializers.Serializer): allow_null=True) -# class IpOverEthernetAddressDataSerializer(serializers.Serializer): -# macAddress = serializers.CharField(help_text="Mac address", required=False, allow_null=True) -# ipAddresses = IpAddressSerialzier(help_text="List of IP addresses to assign to the extCP instance.", -# required=False, allow_null=True, many=True) - - class cpProtocolDataSerializer(serializers.Serializer): layerProtocol = serializers.ChoiceField(help_text="Identifier of layer(s) and protocol(s).", choices=["IP_OVER_ETHERNET"], required=True, allow_null=False) diff --git a/lcm/ns/serializers/inst_ns_serializers.py b/lcm/ns/serializers/inst_ns_serializers.py index e5dbd304..cf875b7e 100644 --- a/lcm/ns/serializers/inst_ns_serializers.py +++ b/lcm/ns/serializers/inst_ns_serializers.py @@ -16,6 +16,7 @@ from rest_framework import serializers from lcm.ns.serializers.pub_serializers import CpProtocolDataSerializer from lcm.ns.serializers.update_serializers import AddPnfDataSerializer, VnfInstanceDataSerializer +from lcm.ns.serializers.create_ns_serializers import AffinityOrAntiAffinityRuleSerializer class SapDataSerializer(serializers.Serializer): @@ -59,20 +60,6 @@ class ParamsForVnfSerializer(serializers.Serializer): required=False, allow_null=True) -class AffinityOrAntiAffinityRuleSerializer(serializers.Serializer): - vnfdId = serializers.ListField(help_text="Reference to a VNFD.", required=False, allow_null=True) - vnfProfileId = serializers.ListField(help_text="Reference to a vnfProfile defined in the NSD.", - required=True) - vnfInstanceId = serializers.ListField(help_text="Reference to the existing VNF instance as the subject of" - "the affinity or anti-affinity rule.", - required=False, allow_null=True) - affinityOrAntiAffiinty = serializers.ChoiceField(help_text="The type of the constraint.", - choices=["AFFINITY", "ANTI_AFFINITY"], required=True) - scope = serializers.ChoiceField(help_text="Specifies the scope of the rule where the placement constraint" - "applies.", choices=["NFVI_POP", "ZONE", "ZONE_GROUP", - "NFVI_NODE"], required=True) - - class InstantNsReqSerializer(serializers.Serializer): nsFlavourId = serializers.CharField(help_text="Identifier of the NS deployment flavour to be" "instantiated.", required=True) -- 2.16.6