fix the serializer bug of nslcm

Change-Id: If552cebe2b58b1955e096111b789f905d6419e4c
Issue-ID: VFC-1270
Signed-off-by: tianxing <15210838572@139.com>

3 files changed, 34 insertions, 58 deletions

diff --git a/lcm/ns/serializers/affected_vnfs.py b/lcm/ns/serializers/affected_vnfs.py
index 4d5594f3..972c3dee 100644
--- a/lcm/ns/serializers/affected_vnfs.py
+++ b/lcm/ns/serializers/affected_vnfs.py
@@ -14,7 +14,7 @@
 
 
 from rest_framework import serializers
-from modify_vnf_info_data import ModifyVnfInfoDataSerializer
+from lcm.ns.serializers.update_serializers import ModifyVnfInfoDataSerializer
 from ext_virtual_link_info import ExtVirtualLinkInfoSerializer
 
 from lcm.ns.const import CHANGE_TYPES, CHANGE_RESULT
diff --git a/lcm/ns/serializers/modify_vnf_info_data.py b/lcm/ns/serializers/modify_vnf_info_data.py
deleted file mode 100644
index 546fc6bf..00000000
--- a/lcm/ns/serializers/modify_vnf_info_data.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2019, CMCC Technologies Co., Ltd.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from rest_framework import serializers
-
-
-class ModifyVnfInfoDataSerializer(serializers.Serializer):
-    vnfInstanceId = serializers.UUIDField(
-        help_text="Identifier of the VNF instance."
-    )
-    vnfInstanceName = serializers.CharField(
-        help_text="New value of the 'vnfInstanceName' attribute in 'VnfInstance', or 'null' to remove the attribute.",
-        max_length=255,
-        required=False,
-        allow_null=True,
-        allow_blank=True)
-    vnfInstanceDescription = serializers.CharField(
-        help_text="If present, this attribute signals modifications of the 'vnfInstanceDescription' attribute in "
-                  "'VnfInstance'",
-        required=False,
-        allow_null=True,
-        allow_blank=True)
-    vnfPkgId = serializers.UUIDField(
-        help_text="New value of the 'vnfPkgId' attribute in 'VnfInstance' The value 'null' is not permitted.."
-    )
-    vnfConfigurableProperties = serializers.DictField(
-        help_text="Modifications to entries in the 'vnfConfigurableProperties' list, as defined below this Table.",
-        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
-        required=False,
-        allow_null=True)
-    metaData = serializers.DictField(
-        help_text="If present, this attribute signals modifications of certain 'metadata' attribute in 'vnfInstance'.",
-        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
-        required=False,
-        allow_null=True)
-    extensions = serializers.DictField(
-        help_text="If present,this attribute signals modifications of certain 'extensions' attribute in 'vnfInstance'.",
-        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
-        required=False,
-        allow_null=True)
diff --git a/lcm/ns/serializers/update_serializers.py b/lcm/ns/serializers/update_serializers.py
index cdf2bce3..58a056e6 100644
--- a/lcm/ns/serializers/update_serializers.py
+++ b/lcm/ns/serializers/update_serializers.py
@@ -149,11 +149,39 @@ class OperateVnfDataSerializer(serializers.Serializer):
 
 
 class ModifyVnfInfoDataSerializer(serializers.Serializer):
-    vnfInstanceId = serializers.CharField(help_text="Identifier of the VNF instance", required=True)
-    vnfInstanceName = serializers.CharField(help_text="New value of the vnfInstanceName attribute in VnfInstance",
-                                            required=False, allow_null=True)
-    vnfInstanceDescription = serializers.CharField(help_text="New value of the vnfInstanceDescription attribute in"
-                                                             "VnfInstance", required=False, allow_null=True)
+    vnfInstanceId = serializers.UUIDField(
+        help_text="Identifier of the VNF instance."
+    )
+    vnfInstanceName = serializers.CharField(
+        help_text="New value of the 'vnfInstanceName' attribute in 'VnfInstance', or 'null' to remove the attribute.",
+        max_length=255,
+        required=False,
+        allow_null=True,
+        allow_blank=True)
+    vnfInstanceDescription = serializers.CharField(
+        help_text="If present, this attribute signals modifications of the 'vnfInstanceDescription' attribute in "
+                  "'VnfInstance'",
+        required=False,
+        allow_null=True,
+        allow_blank=True)
+    vnfPkgId = serializers.UUIDField(
+        help_text="New value of the 'vnfPkgId' attribute in 'VnfInstance' The value 'null' is not permitted.."
+    )
+    vnfConfigurableProperties = serializers.DictField(
+        help_text="Modifications to entries in the 'vnfConfigurableProperties' list, as defined below this Table.",
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
+        required=False,
+        allow_null=True)
+    metaData = serializers.DictField(
+        help_text="If present, this attribute signals modifications of certain 'metadata' attribute in 'vnfInstance'.",
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
+        required=False,
+        allow_null=True)
+    extensions = serializers.DictField(
+        help_text="If present,this attribute signals modifications of certain 'extensions' attribute in 'vnfInstance'.",
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
+        required=False,
+        allow_null=True)
 
 
 class ChangeExtVnfConnectivityDataSerializer(serializers.Serializer):