aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortianxing <15210838572@139.com>2019-03-14 21:10:13 +0800
committertianxing <15210838572@139.com>2019-03-14 21:10:19 +0800
commite52d623364df976ca322ce696ad9798e9e7e5aed (patch)
treea319743a7a9ac8aaa3db741c34c9507825fe9ba4
parentc82b19ac5a689a640bb1f525dc1aa7705f501c3e (diff)
fix the serializer bug of nslcm
Change-Id: I3079f032f4673a433d604f2860ca2191a87a2a93 Issue-ID: VFC-1270 Signed-off-by: tianxing <15210838572@139.com>
-rw-r--r--lcm/ns/serializers/scale_ns_serializers.py60
1 files changed, 31 insertions, 29 deletions
diff --git a/lcm/ns/serializers/scale_ns_serializers.py b/lcm/ns/serializers/scale_ns_serializers.py
index 97c9c8e6..2a8c597f 100644
--- a/lcm/ns/serializers/scale_ns_serializers.py
+++ b/lcm/ns/serializers/scale_ns_serializers.py
@@ -14,6 +14,8 @@
from rest_framework import serializers
from lcm.ns.serializers.update_serializers import VnfInstanceDataSerializer
+from lcm.ns.serializers.create_ns_serializers import NsScaleInfoSerializer
+from lcm.ns.serializers.inst_ns_serializers import VnfLocationConstraintSerializer, ParamsForVnfSerializer
# class VnfInstanceDataSerializer(serializers.Serializer):
@@ -33,9 +35,9 @@ class ScaleNsByStepsDataSerializer(serializers.Serializer):
"to 1. ", required=False, allow_null=True)
-class NsScaleInfoSerializer(serializers.Serializer):
- nsScalingAspectId = serializers.CharField(help_text="Identifier of the NS scaling aspect.", required=True)
- nsScaleLevelId = serializers.CharField(help_text="Identifier of the NS scale level.", required=True)
+# class NsScaleInfoSerializer(serializers.Serializer):
+# nsScalingAspectId = serializers.CharField(help_text="Identifier of the NS scaling aspect.", required=True)
+# nsScaleLevelId = serializers.CharField(help_text="Identifier of the NS scale level.", required=True)
class ScaleNsToLevelDataSerializer(serializers.Serializer):
@@ -51,32 +53,32 @@ class ScaleNsToLevelDataSerializer(serializers.Serializer):
required=False, allow_null=True)
-class ParamsForVnfSerializer(serializers.Serializer):
- vnfProfileId = serializers.CharField(help_text="Identifier of (reference to) a vnfProfile to which the "
- "additional parameters apply.", required=True)
- additionalParams = serializers.DictField(help_text="Additional parameters that are applied for the VNF "
- "instance to be created.",
- child=serializers.CharField(help_text="KeyValue Pairs",
- allow_blank=True),
- required=False, allow_null=True)
-
-
-class LocationConstraintsSerializer(serializers.Serializer):
- countryCode = serializers.CharField(help_text="The two-letter ISO 3166 [29] country code in capital "
- "letters", required=True)
- civicAddressElement = serializers.ListField(help_text="Zero or more elements comprising the civic "
- "address.", required=False, allow_null=True)
-
-
-class VnfLocationConstraintSerializer(serializers.Serializer):
- vnfProfileId = serializers.CharField(help_text="Identifier (reference to) of a VnfProfile in the NSD used "
- "to manage the lifecycle of the VNF instance.",
- required=True)
-
- locationConstraints = LocationConstraintsSerializer(help_text="This type represents location constraints "
- "for a VNF to be instantiated. The location"
- " constraints shall be presented as a "
- "country code", required=True)
+# class ParamsForVnfSerializer(serializers.Serializer):
+# vnfProfileId = serializers.CharField(help_text="Identifier of (reference to) a vnfProfile to which the "
+# "additional parameters apply.", required=True)
+# additionalParams = serializers.DictField(help_text="Additional parameters that are applied for the VNF "
+# "instance to be created.",
+# child=serializers.CharField(help_text="KeyValue Pairs",
+# allow_blank=True),
+# required=False, allow_null=True)
+
+
+# class LocationConstraintsSerializer(serializers.Serializer):
+# countryCode = serializers.CharField(help_text="The two-letter ISO 3166 [29] country code in capital "
+# "letters", required=True)
+# civicAddressElement = serializers.ListField(help_text="Zero or more elements comprising the civic "
+# "address.", required=False, allow_null=True)
+
+
+# class VnfLocationConstraintSerializer(serializers.Serializer):
+# vnfProfileId = serializers.CharField(help_text="Identifier (reference to) of a VnfProfile in the NSD used "
+# "to manage the lifecycle of the VNF instance.",
+# required=True)
+#
+# locationConstraints = LocationConstraintsSerializer(help_text="This type represents location constraints "
+# "for a VNF to be instantiated. The location"
+# " constraints shall be presented as a "
+# "country code", required=True)
class ScaleNsDataSerializer(serializers.Serializer):