From: laili <lai.li@zte.com.cn>
Date: Tue, 21 Aug 2018 04:22:12 +0000 (+0800)
Subject: Ns descriptor related stuffs.
X-Git-Tag: 1.2.0~119^2~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F61445%2F1;p=vfc%2Fnfvo%2Fcatalog.git

Ns descriptor related stuffs.

Modify serializers.
Correct errors in serializers.

Change-Id: I95e0f65083d251b9ecdd0f3bf718bb41f4dcb70a
Issue-ID: VFC-1037
Signed-off-by: laili <lai.li@zte.com.cn>
---

diff --git a/catalog/packages/serializers/_link.py b/catalog/packages/serializers/_link.py
deleted file mode 100644
index 067b0368..00000000
--- a/catalog/packages/serializers/_link.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 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
-from link import LinkSerializer
-
-
-class _LinkSerializer(serializers.Serializer):
-    this = LinkSerializer(
-        help_text='URI of this resource.',
-        required=True,
-        allow_null=False
-    )
-    nsd_content = LinkSerializer(
-        help_text='Link to the NSD content resource.',
-        required=True,
-        allow_null=False
-    )
diff --git a/catalog/packages/serializers/nsd_info.py b/catalog/packages/serializers/nsd_info.py
index de422000..aad1fdc1 100644
--- a/catalog/packages/serializers/nsd_info.py
+++ b/catalog/packages/serializers/nsd_info.py
@@ -14,7 +14,20 @@
 
 from rest_framework import serializers
 from problem_details import ProblemDetailsSerializer
-from _link import _LinkSerializer
+from link import LinkSerializer
+
+
+class _LinkSerializer(serializers.Serializer):
+    this = LinkSerializer(
+        help_text='URI of this resource.',
+        required=True,
+        allow_null=False
+    )
+    nsd_content = LinkSerializer(
+        help_text='Link to the NSD content resource.',
+        required=True,
+        allow_null=False
+    )
 
 
 class NsdInfoSerializer(serializers.Serializer):
@@ -104,12 +117,11 @@ class NsdInfoSerializer(serializers.Serializer):
         allow_null=False,
         allow_blank=False
     )
-    nsdUsageState = serializers.CharField(
+    nsdUsageState = serializers.ChoiceField(
         help_text='Usage state of the individual NS descriptor resource.',
         choices=['IN_USE', 'NOT_IN_USE'],
         required=True,
         allow_null=False,
-        allow_blank=False
     )
     userDefinedData = serializers.DictField(
         help_text='User defined data for the individual NS descriptor resource. \
@@ -118,8 +130,8 @@ class NsdInfoSerializer(serializers.Serializer):
         required=False,
         allow_null=True
     )
-    _link = _LinkSerializer(
+    _links = _LinkSerializer(
         help_text='Links to resources related to this resource.',
         required=True,
-        allow_null=False
+        allow_null=True  # TODO: supposed to be False
     )
diff --git a/catalog/packages/serializers/problem_details.py b/catalog/packages/serializers/problem_details.py
index 365f4ffd..68d45000 100644
--- a/catalog/packages/serializers/problem_details.py
+++ b/catalog/packages/serializers/problem_details.py
@@ -55,5 +55,4 @@ class ProblemDetailsSerializer(serializers.Serializer):
         child=serializers.CharField(help_text='Additional attribute', allow_blank=True),
         required=False,
         allow_null=True,
-        allow_blank=True
     )