Modify the incorrect field names

[vfc/nfvo/catalog.git] / catalog / serializers.py

diff --git a/catalog/serializers.py b/catalog/serializers.py
index 25cf798..c4321e2 100644 (file)
--- a/catalog/serializers.py
+++ b/catalog/serializers.py
@@ -18,7 +18,7 @@ from catalog.pub.utils.toscaparser.nsdmodel import EtsiNsdInfoModel
 from catalog.pub.utils.toscaparser.vnfdmodel import EtsiVnfdInfoModel
 
 
-class JobResponseSerializer(serializers.Serializer):
+class PostJobRequestSerializer(serializers.Serializer):
     progress = serializers.CharField(help_text="Job Progress", required=False)
     desc = serializers.CharField(help_text="Description", required=False)
     errcode = serializers.CharField(help_text="Error Code", required=False)
@@ -44,7 +44,7 @@ class JobResponseDescriptorSerializer(serializers.Serializer):
         many=True, help_text="Response History List", required=False)
 
 
-class JobRequestSerializer(serializers.Serializer):
+class JobResponseSerializer(serializers.Serializer):
     jobId = serializers.CharField(
         help_text="Job Id",
         required=False)
@@ -62,60 +62,71 @@ class NsPackageDistributeRequestSerializer(serializers.Serializer):
 
 
 class NsPackageInfoSerializer(serializers.Serializer):
-    nsdId = serializers.CharField(help_text="csarId", required=True)
-    nsPackageId = serializers.CharField(help_text="csarId", required=True)
-    nsdProvider = serializers.CharField(help_text="csarId", required=True)
-    nsdVersion = serializers.CharField(help_text="csarId", required=True)
-    csarName = serializers.CharField(help_text="csarId", required=True)
-    nsdModel = serializers.CharField(help_text="csarId", required=True)
-    downloadUrl = serializers.CharField(help_text="csarId", required=True)
+    nsdId = serializers.CharField(help_text="NSD ID", required=True)
+    nsPackageId = serializers.CharField(
+        help_text="NS Package ID", allow_blank=True, required=True)
+    nsdProvider = serializers.CharField(
+        help_text="NSD Provider", allow_blank=True, required=True)
+    nsdVersion = serializers.CharField(help_text="NSD Version", allow_blank=True, required=True)
+    csarName = serializers.CharField(help_text="CSAR name", allow_blank=True, required=True)
+    nsdModel = serializers.CharField(help_text="NSD Model", allow_blank=True, required=True)
+    downloadUrl = serializers.CharField(
+        help_text="URL to download NSD Model", required=True)
 
 
 class NsPackageSerializer(serializers.Serializer):
-    csarId = serializers.CharField(help_text="csarId", required=True)
-    package_info = NsPackageInfoSerializer(
-        help_text="package_info", required=True)
+    csarId = serializers.CharField(help_text="CSAR ID", required=True)
+    packageInfo = NsPackageInfoSerializer(
+        help_text="NS Package Info", required=True)
 
 
 class NsPackagesSerializer(serializers.ListSerializer):
-    child = NsPackageSerializer(many=True)
+    child = NsPackageSerializer()
 
 
 class NfPackageDistributeRequestSerializer(serializers.Serializer):
-    csar_id = serializers.CharField(help_text="csarId", required=True)
-    vim_ids = serializers.ListField(
+    csar_id = serializers.CharField(help_text="CSAR ID", required=True)
+    vimIds = serializers.ListField(
         help_text="vim_ids",
         child=serializers.CharField(),
         required=False)
-    lab_vim_id = serializers.CharField(help_text="lab_vim_id", required=False)
+    labVimId = serializers.CharField(
+        help_text="A list of VIM IDs.", required=False)
 
 
 class NfPackageInfoSerializer(serializers.Serializer):
-    vnfdId = serializers.CharField(required=True)
-    vnfPackageId = serializers.CharField(required=True)
-    vnfdProvider = serializers.CharField(required=True)
-    vnfdVersion = serializers.CharField(required=True)
-    vnfVersion = serializers.CharField(required=True)
-    csarName = serializers.CharField(required=True)
-    vnfdModel = serializers.CharField(required=True)
-    downloadUrl = serializers.CharField(required=True)
+    vnfdId = serializers.CharField(help_text="VNFD ID", required=True)
+    vnfPackageId = serializers.CharField(
+        help_text="VNF Package ID", required=True)
+    vnfdProvider = serializers.CharField(
+        help_text="VNFD Provider", required=True)
+    vnfdVersion = serializers.CharField(
+        help_text="VNFD Version", required=True)
+    vnfVersion = serializers.CharField(help_text="VNF Version", required=True)
+    csarName = serializers.CharField(help_text="CSAR Name", required=True)
+    vnfdModel = serializers.CharField(help_text="VNFD Model", required=True)
+    downloadUrl = serializers.CharField(
+        help_text="URL to download VNFD Model", required=True)
 
 
 class NfImageInfoSerializer(serializers.Serializer):
-    index = serializers.CharField(required=True)
-    fileName = serializers.CharField(required=True)
-    imageId = serializers.CharField(required=True)
-    vimId = serializers.CharField(required=True)
-    vimUser = serializers.CharField(required=True)
-    tenant = serializers.CharField(required=True)
-    status = serializers.CharField(required=True)
+    index = serializers.CharField(
+        help_text="Index of VNF Image",
+        required=True)
+    fileName = serializers.CharField(
+        help_text="Image file name", required=True)
+    imageId = serializers.CharField(help_text="Image ID", required=True)
+    vimId = serializers.CharField(help_text="VIM ID", required=True)
+    vimUser = serializers.CharField(help_text="User of VIM", required=True)
+    tenant = serializers.CharField(help_text="Tenant", required=True)
+    status = serializers.CharField(help_text="Status", required=True)
 
 
 class NfPackageSerializer(serializers.Serializer):
-    csarId = serializers.CharField(help_text="csarId", required=True)
+    csarId = serializers.CharField(help_text="CSAR ID", required=True)
     packageInfo = NfPackageInfoSerializer(
-        help_text="packageInfo", required=True)
-    imageInfo = NfImageInfoSerializer(help_text="imageInfo", required=False)
+        help_text="VNF Package Info", required=True)
+    imageInfo = NfImageInfoSerializer(help_text="Image Info", required=False)
 
 
 class NfPackagesSerializer(serializers.ListSerializer):
@@ -127,8 +138,8 @@ class PostJobResponseSerializer(serializers.Serializer):
 
 
 class ParseModelRequestSerializer(serializers.Serializer):
-    csarId = serializers.CharField(help_text="csarId", required=True)
-    inputs = serializers.JSONField(help_text="inputs", required=False)
+    csarId = serializers.CharField(help_text="CSAR ID", required=True)
+    inputs = serializers.JSONField(help_text="Inputs", required=False)
 
 
 class EtsiNsdInfoModelSerializer(serializers.ModelSerializer):
@@ -144,8 +155,8 @@ class EtsiVnfdInfoModelSerializer(serializers.ModelSerializer):
 
 
 class ParseNSPackageResponseSerializer(serializers.Serializer):
-    model = EtsiNsdInfoModelSerializer(help_text="model", required=True)
+    model = EtsiNsdInfoModelSerializer(help_text="NSD Model", required=True)
 
 
 class ParseNfPackageResponseSerializer(serializers.Serializer):
-    model = EtsiVnfdInfoModelSerializer(help_text="model", required=True)
+    model = EtsiVnfdInfoModelSerializer(help_text="VNFD Model", required=True)