Merge changes Ic4a5414a,I22f28b62

* changes:
  Modify vnf instantiation related stuffs.
  Modify vnf instantiation related stuffs.

3 files changed, 25 insertions, 3 deletions

diff --git a/lcm/lcm/nf/serializers/ext_link_port_data.py b/lcm/lcm/nf/serializers/ext_link_port_data.py
index e134502c..c6dafdd4 100644
--- a/lcm/lcm/nf/serializers/ext_link_port_data.py
+++ b/lcm/lcm/nf/serializers/ext_link_port_data.py
@@ -26,5 +26,4 @@ class ExtLinkPortDataSerializer(serializers.Serializer):
     resourceHandle = ResourceHandleSerializer(
         help_text="Reference to the virtualised resource realizing this link port.",
         required=True,
-        allow_null=False,
-        allow_blank=False)
+        allow_null=False)
diff --git a/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py b/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py
new file mode 100644
index 00000000..17b9c0db
--- /dev/null
+++ b/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py
@@ -0,0 +1,24 @@
+# Copyright 2017 ZTE Corporation.
+#
+# 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 InstOrTeriVnfResponseSerializer(serializers.Serializer):
+    jobId = serializers.CharField(
+        help_text="jobId",
+        required=True,
+        max_length=255,
+        allow_null=True)
diff --git a/lcm/lcm/nf/serializers/instantiate_vnf_request.py b/lcm/lcm/nf/serializers/instantiate_vnf_request.py
index c5214fcb..2c3547d2 100644
--- a/lcm/lcm/nf/serializers/instantiate_vnf_request.py
+++ b/lcm/lcm/nf/serializers/instantiate_vnf_request.py
@@ -46,7 +46,6 @@ class InstantiateVnfRequestSerializer(serializers.Serializer):
         or refer to external / externally-managed virtual links.",
         many=True,
         required=False,
-        max_length=255,
         allow_null=True)
     localizationLanguage = serializers.CharField(
         help_text="Localization language of the VNF to be instantiated. \