Merge "Modify vnf query related stuffs in vnflcm."

6 files changed, 29 insertions, 10 deletions

diff --git a/lcm/lcm/nf/serializers/cp_protocol_info.py b/lcm/lcm/nf/serializers/cp_protocol_info.py
index 770f7e41..cb2815d4 100644
--- a/lcm/lcm/nf/serializers/cp_protocol_info.py
+++ b/lcm/lcm/nf/serializers/cp_protocol_info.py
@@ -24,6 +24,6 @@ class CpProtocolInfoSerializer(serializers.Serializer):
         allow_blank=False)
     ipOverEthernet = serializers.DictField(
         help_text="IP addresses over Ethernet to assign to the extCP instance.",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True,)
diff --git a/lcm/lcm/nf/serializers/instantiated_vnf_info.py b/lcm/lcm/nf/serializers/instantiated_vnf_info.py
index a61aa202..1324b9b0 100644
--- a/lcm/lcm/nf/serializers/instantiated_vnf_info.py
+++ b/lcm/lcm/nf/serializers/instantiated_vnf_info.py
@@ -32,7 +32,7 @@ class InstantiatedVnfInfoSerializer(serializers.Serializer):
         allow_blank=False)
     vnfState = serializers.ChoiceField(
         help_text="State of the VNF instance.",
-        choices=["STARTED", "STOPPED", "NOT_INSTANTIATED", "INSTANTIATED", "FAILED"],
+        choices=["STARTED", "STOPPED"],
         required=True,
         allow_null=False,
         allow_blank=False)
@@ -59,7 +59,7 @@ class InstantiatedVnfInfoSerializer(serializers.Serializer):
         allow_null=True)
     monitoringParameters = serializers.DictField(
         help_text="Active monitoring parameters.",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
     localizationLanguage = serializers.CharField(
diff --git a/lcm/lcm/nf/serializers/link.py b/lcm/lcm/nf/serializers/link.py
new file mode 100644
index 00000000..489cbf37
--- /dev/null
+++ b/lcm/lcm/nf/serializers/link.py
@@ -0,0 +1,20 @@
+# 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 LinkSerializer(serializers.Serializer):
+    href = serializers.CharField(
+        help_text="URI of the referenced resource.",
+        required=True,
+        allow_null=False,
+        allow_blank=False)
diff --git a/lcm/lcm/nf/serializers/scale_info.py b/lcm/lcm/nf/serializers/scale_info.py
index 041e4ea9..a97d42c2 100644
--- a/lcm/lcm/nf/serializers/scale_info.py
+++ b/lcm/lcm/nf/serializers/scale_info.py
@@ -25,7 +25,6 @@ class ScaleInfoSerializer(serializers.Serializer):
     scaleLevel = serializers.IntegerField(
         help_text="Indicates the scale level. \
         The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.",
-        max_length=255,
         required=True,
         allow_null=False,
         allow_blank=False)
diff --git a/lcm/lcm/nf/serializers/vim_connection_info.py b/lcm/lcm/nf/serializers/vim_connection_info.py
index fa397307..b34b70d5 100644
--- a/lcm/lcm/nf/serializers/vim_connection_info.py
+++ b/lcm/lcm/nf/serializers/vim_connection_info.py
@@ -36,17 +36,17 @@ class VimConnectionInfoSerializer(serializers.Serializer):
         allow_blank=False)
     interfaceInfo = serializers.DictField(
         help_text="Information about the interface or interfaces to the VIM",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
     accessInfo = serializers.DictField(
         help_text="Authentication credentials for accessing the VIM, and other access-related information",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
     extra = serializers.DictField(
         help_text="VIM type specific additional information. \
         The applicable structure, and whether or not this attribute is available, is dependent on the content of vimType.",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
diff --git a/lcm/lcm/nf/serializers/vnf_instance.py b/lcm/lcm/nf/serializers/vnf_instance.py
index df7e1179..bfcbd298 100644
--- a/lcm/lcm/nf/serializers/vnf_instance.py
+++ b/lcm/lcm/nf/serializers/vnf_instance.py
@@ -84,7 +84,7 @@ class VnfInstanceSerializer(serializers.Serializer):
     vnfConfigurableProperties = serializers.DictField(
         help_text="Current values of the configurable properties of the VNF instance. \
         Configurable properties referred in this attribute are declared in the VNFD",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True,)
     vimConnectionInfo = VimConnectionInfoSerializer(
@@ -106,13 +106,13 @@ class VnfInstanceSerializer(serializers.Serializer):
     metadata = serializers.DictField(
         help_text="Additional VNF-specific metadata describing the VNF instance.\
         This attribute can be modified with the PATCH method.",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
     extensions = serializers.DictField(
         help_text="VNF-specific attributes that affect the lifecycle management of this VNF instance by the VNFM, or the lifecycle management scripts. \
         This attribute can be modified with the PATCH method.",
-        child=serializers.CharField(allow_blank=True),
+        child=serializers.CharField(help_text="KeyValue Pairs", allow_blank=True),
         required=False,
         allow_null=True)
     _links = _LinksSerializer(