vfclcm upgrade from python2 to python3

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / serializers / instantiated_vnf_info.py

diff --git a/lcm/lcm/nf/serializers/instantiated_vnf_info.py b/lcm/lcm/nf/serializers/instantiated_vnf_info.py
index 1324b9b..86af905 100644 (file)
--- a/lcm/lcm/nf/serializers/instantiated_vnf_info.py
+++ b/lcm/lcm/nf/serializers/instantiated_vnf_info.py
@@ -14,13 +14,13 @@
 
 from rest_framework import serializers
 
-from scale_info import ScaleInfoSerializer
-from ext_cp_info import ExtCpInfoSerializer
-from ext_virtual_link_info import ExtVirtualLinkInfoSerializer
-from ext_managed_virtual_link_info import ExtManagedVirtualLinkInfoSerializer
-from vnfc_resource_info import VnfcResourceInfoSerializer
-from vnf_virtual_link_resource_info import VnfVirtualLinkResourceInfoSerializer
-from virtual_storage_resource_info import VirtualStorageResourceInfoSerializer
+from .scale_info import ScaleInfoSerializer
+from .ext_cp_info import ExtCpInfoSerializer
+from .ext_virtual_link_info import ExtVirtualLinkInfoSerializer
+from .ext_managed_virtual_link_info import ExtManagedVirtualLinkInfoSerializer
+from .vnfc_resource_info import VnfcResourceInfoSerializer
+from .vnf_virtual_link_resource_info import VnfVirtualLinkResourceInfoSerializer
+from .virtual_storage_resource_info import VirtualStorageResourceInfoSerializer
 
 
 class InstantiatedVnfInfoSerializer(serializers.Serializer):
@@ -28,13 +28,13 @@ class InstantiatedVnfInfoSerializer(serializers.Serializer):
         help_text="Identifier of the VNF deployment flavour applied to this VNF instance.",
         max_length=255,
         required=True,
-        allow_null=False,
+        allow_null=True,
         allow_blank=False)
     vnfState = serializers.ChoiceField(
         help_text="State of the VNF instance.",
         choices=["STARTED", "STOPPED"],
         required=True,
-        allow_null=False,
+        allow_null=True,
         allow_blank=False)
     scaleStatus = ScaleInfoSerializer(
         help_text="Scale status of the VNF, one entry per aspect. \
@@ -57,9 +57,9 @@ class InstantiatedVnfInfoSerializer(serializers.Serializer):
         many=True,
         required=False,
         allow_null=True)
-    monitoringParameters = serializers.DictField(
+    monitoringParameters = serializers.ListSerializer(
         help_text="Active monitoring parameters.",
-        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
+        child=serializers.CharField(help_text="monitoring parameter", allow_blank=True),
         required=False,
         allow_null=True)
     localizationLanguage = serializers.CharField(
@@ -72,17 +72,14 @@ class InstantiatedVnfInfoSerializer(serializers.Serializer):
         help_text="Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.",
         many=True,
         required=False,
-        allow_null=True,
-        allow_blank=True)
+        allow_null=True)
     vnfVirtualLinkResourceInfo = VnfVirtualLinkResourceInfoSerializer(
         help_text="Information about the virtualised network resources used by the VLs of the VNF instance.",
         many=True,
         required=False,
-        allow_null=True,
-        allow_blank=True)
+        allow_null=True)
     virtualStorageResourceInfo = VirtualStorageResourceInfoSerializer(
         help_text="Information about the virtualised storage resources used as storage for the VNF instance.",
         many=True,
         required=False,
-        allow_null=True,
-        allow_blank=True)
+        allow_null=True)