fix the serializer bug of nslcm

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

diff --git a/lcm/ns/serializers/inst_ns_serializers.py b/lcm/ns/serializers/inst_ns_serializers.py
index 54eb3b9..e5dbd30 100644 (file)
--- a/lcm/ns/serializers/inst_ns_serializers.py
+++ b/lcm/ns/serializers/inst_ns_serializers.py
@@ -14,18 +14,10 @@
 
 from rest_framework import serializers
 
-from lcm.ns.serializers.pub_serializers import IpOverEthernetAddressDataSerializer
+from lcm.ns.serializers.pub_serializers import CpProtocolDataSerializer
 from lcm.ns.serializers.update_serializers import AddPnfDataSerializer, VnfInstanceDataSerializer
 
 
-class CpProtocolDataSerializer(serializers.Serializer):
-    layerProtocol = serializers.ChoiceField(help_text="Identifier of layer(s) and protocol(s)",
-                                            choices=["IP_OVER_ETHERNET"], required=True)
-    ipOverEthernet = IpOverEthernetAddressDataSerializer(help_text="Network address data for IP over Ethernet"
-                                                                   "to assign to the extCP instance.",
-                                                         required=False, allow_null=True)
-
-
 class SapDataSerializer(serializers.Serializer):
     sapdId = serializers.CharField(help_text="Reference to the SAPD for this SAP.", required=True)
     sapName = serializers.CharField(help_text="Human readable name for the SAP.", required=True)

diff --git a/lcm/ns/serializers/pub_serializers.py b/lcm/ns/serializers/pub_serializers.py
index 437c52a..7150cdd 100644 (file)
--- a/lcm/ns/serializers/pub_serializers.py
+++ b/lcm/ns/serializers/pub_serializers.py
@@ -111,3 +111,11 @@ class QueryNsRespSerializer(serializers.Serializer):
     vlInfo = VlInstSerializer(help_text="VL instances", many=True, required=False, allow_null=True)
     vnffgInfo = VnffgInstSerializer(help_text="VNFFG instances", many=True, required=False, allow_null=True)
     nsState = serializers.CharField(help_text="State of NS instance", required=False, allow_null=True, allow_blank=True)
+
+
+class CpProtocolDataSerializer(serializers.Serializer):
+    layerProtocol = serializers.ChoiceField(help_text="Identifier of layer(s) and protocol(s)",
+                                            choices=["IP_OVER_ETHERNET"], required=True)
+    ipOverEthernet = IpOverEthernetAddressDataSerializer(help_text="Network address data for IP over Ethernet"
+                                                                   "to assign to the extCP instance.",
+                                                         required=False, allow_null=True)

diff --git a/lcm/ns/serializers/update_serializers.py b/lcm/ns/serializers/update_serializers.py
index 2da3535..9e0a1bf 100644 (file)
--- a/lcm/ns/serializers/update_serializers.py
+++ b/lcm/ns/serializers/update_serializers.py
@@ -15,6 +15,7 @@
 from rest_framework import serializers
 
 from lcm.ns.serializers.pub_serializers import IpAddressSerialzier
+from lcm.ns.serializers.pub_serializers import CpProtocolDataSerializer
 
 
 class VnfInstanceDataSerializer(serializers.Serializer):
@@ -42,14 +43,6 @@ class IpOverEthernetAddressDataSerializer(serializers.Serializer):
                                       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)
-    ipOverEthernet = IpOverEthernetAddressDataSerializer(
-        help_text="Network address data for IP over Ethernet to assign to the extCP instance.",
-        required=False, allow_null=True)
-
-
 class VnfExtCpConfigSerializer(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.",