From: yangyan <yangyanyj@chinamobile.com>
Date: Thu, 14 Mar 2019 10:42:49 +0000 (+0800)
Subject: fix the serializer bug of nslcm
X-Git-Tag: 1.3.0~132
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F82240%2F1;p=vfc%2Fnfvo%2Flcm.git

fix the serializer bug of nslcm

Change-Id: If1a0ccdca2b0b002633bc0f6be9a1c442e40e57d
Issue-ID: VFC-1270
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

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)