X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fserializers.py;h=817d56194e6201d439156d8bf03368251aa2c9f3;hb=f30925c952e7a9e2dc5f81c0dfc3dbfdf2c812f5;hp=2ec38b2951128a42fb8794becb6202a389aa6b5e;hpb=7a5314818ef755b81a23d10baf8895f7f60a2fcb;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/serializers.py b/lcm/lcm/nf/vnfs/serializers.py
index 2ec38b29..817d5619 100644
--- a/lcm/lcm/nf/vnfs/serializers.py
+++ b/lcm/lcm/nf/vnfs/serializers.py
@@ -25,8 +25,14 @@ class CreateVnfRespSerializer(serializers.Serializer):
     vnfInstanceId = serializers.CharField(help_text="vnf Instance Id", required=True)
 
 
+class StorageResourceSerializer(serializers.Serializer):
+    resourceId = serializers.CharField(help_text="resourceId", required=True)
+    vimId = serializers.CharField(help_text="vimId", required=True)
+
+
 class virtualStorageResourceInfoSerializer(serializers.Serializer):
-    pass
+    virtualStorageInstanceId = serializers.CharField(help_text="virtualStorageInstanceId", required=True)
+    storageResource = StorageResourceSerializer(help_text="storageResource", required=True)
 
 
 class virtualLinkResourceInfoSerializer(serializers.Serializer):
@@ -50,11 +56,11 @@ class InterfaceInfoSerializer(serializers.Serializer):
 
 
 class vimInfoSerializer(serializers.Serializer):
-    vimInfoId = serializers.CharField(help_text="vimInfoId", required=True)
-    vimId = serializers.CharField(help_text="vimId", required=True)
-    interfaceEndpoint = serializers.CharField(help_text="interfaceEndpoint", required=True)
-    interfaceInfo = InterfaceInfoSerializer(help_text="vimInfoId", required=True)
-    accessInfo = accessInfoSerializer(help_text="accessInfo", required=True)
+    vimInfoId = serializers.CharField(help_text="vimInfoId", required=False, allow_null=True)
+    vimId = serializers.CharField(help_text="vimId", required=False, allow_null=True)
+    interfaceEndpoint = serializers.CharField(help_text="interfaceEndpoint", required=False, allow_null=True)
+    interfaceInfo = InterfaceInfoSerializer(help_text="vimInfoId", required=False, allow_null=True)
+    accessInfo = accessInfoSerializer(help_text="accessInfo", required=False, allow_null=True)
 
 
 class monitoringParametersSerializer(serializers.Serializer):
@@ -90,8 +96,9 @@ class NetworkAddressSerializer(serializers.Serializer):
 
 
 class extCpInfoSerializer(serializers.Serializer):
-    cpInstanceId = serializers.CharField(help_text="cpInstanceId", required=True)
+    cpInstanceId = serializers.CharField(help_text="cpInstanceId", required=False, allow_null=True)
     cpdId = serializers.IntegerField(help_text="cpdId", required=True)
+    numDynamicAddresses = serializers.IntegerField(help_text="numDynamicAddresses", required=False, allow_null=True)
     addresses = NetworkAddressSerializer(help_text="addresses", many=True, allow_null=True)
 
 
@@ -101,12 +108,12 @@ class ScaleInfoSerializer(serializers.Serializer):
 
 
 class instantiatedVnfInfoSerializer(serializers.Serializer):
-    flavourId = serializers.CharField(help_text="flavour Id", required=True)
-    vnfState = serializers.ChoiceField(help_text="vnf State", choices=['STARTED', 'STOPPED'], required=True)
+    flavourId = serializers.CharField(help_text="flavour Id", required=True, allow_null=True)
+    vnfState = serializers.ChoiceField(help_text="vnf State", choices=['STARTED', 'STOPPED'], required=True, allow_null=True)
     scaleStatus = ScaleInfoSerializer(help_text="scaleStatus", many=True)
     extCpInfo = extCpInfoSerializer(help_text="extCpInfo", many=True)
     extVirtualLink = ExtVirtualLinkInfoSerializer(help_text="extVirtualLink", many=True)
-    monitoringParameters = monitoringParametersSerializer(help_text="monitoringParameters", many=True, allow_null=True)
+    monitoringParameters = monitoringParametersSerializer(help_text="monitoringParameters", allow_null=True)
     vimInfo = vimInfoSerializer(help_text="vimInfo", many=True)
     vnfcResourceInfo = vnfcResourceInfoSerializer(help_text="vnfcResourceInfo", many=True)
     virtualLinkResourceInfo = virtualLinkResourceInfoSerializer(help_text="virtualLinkResourceInfo", many=True)
@@ -114,7 +121,7 @@ class instantiatedVnfInfoSerializer(serializers.Serializer):
     pass
 
 
-class VnfsInfoSerializer(serializers.ListSerializer):
+class VnfInfoSerializer(serializers.Serializer):
     vnfInstanceId = serializers.CharField(help_text="vnf Instance Id", required=True)
     vnfInstanceName = serializers.CharField(help_text="vnf Instance Name", required=True)
     onboardedVnfPkgInfoId = serializers.CharField(help_text="onboarded Vnf Pkg Info Id", required=False,
@@ -122,3 +129,42 @@ class VnfsInfoSerializer(serializers.ListSerializer):
     vnfdVersion = serializers.CharField(help_text="vnfd Version", required=False, allow_null=True)
     vnfProvider = serializers.CharField(help_text="vnf Provider", required=False, allow_null=True)
     instantiatedVnfInfo = instantiatedVnfInfoSerializer(help_text="instantiatedVnfInfo", required=True)
+
+
+class VnfsInfoSerializer(serializers.ListSerializer):
+    child = VnfInfoSerializer()
+
+
+class extVirtualLinkSerizlizer(serializers.Serializer):
+    vlInstanceId = serializers.CharField(help_text="vlInstanceId", required=False, allow_null=True)
+    resourceSubnetId = serializers.CharField(help_text="resourceSubnetId", required=False, allow_null=True)
+    cpdId = serializers.CharField(help_text="cpdId", required=False, allow_null=True)
+    resourceId = serializers.CharField(help_text="resourceId", required=False, allow_null=True)
+    vim = vimInfoSerializer(help_text="vim", required=False, allow_null=True)
+    extCps = extCpInfoSerializer(help_text="extCps", many=True, required=False, allow_null=True)
+
+
+class extVirtualLinksSerializer(serializers.ListSerializer):
+    child = extVirtualLinkSerizlizer(help_text="extVirtualLink", required=False, allow_null=True)
+
+
+class additionalParamsSerializer(serializers.Serializer):
+    inputs = serializers.DictField(
+        help_text="inputs",
+        child=serializers.CharField(help_text="but i needed to test these 2 fields somehow", allow_blank=True),
+        required=False,
+        allow_null=True
+    )
+    extVirtualLinks = extVirtualLinksSerializer(help_text="extVirtualLinks", required=False, allow_null=True)
+
+
+class InstantiateVnfRequestSerializer(serializers.Serializer):
+    flavourId = serializers.CharField(help_text="flavourId", required=True)
+    instantiationLevelId = serializers.CharField(help_text="instantiationLevelId", required=True, allow_null=True)
+    localizationLanguage = serializers.CharField(help_text="localizationLanguage", required=True, allow_null=True)
+    extVirtualLinks = extVirtualLinksSerializer(help_text="extVirtualLinks", required=False, allow_null=True)
+    additionalParams = additionalParamsSerializer(help_text="additionalParams", required=False, allow_null=True)
+
+
+class InstantiateVnfResponseSerializer(serializers.Serializer):
+    jobId = serializers.CharField(help_text="jobId", required=True)