X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fserializers.py;h=df9bd7e50260cf7d52c7272e5cc0dc774aa3c4ce;hb=25b4a690e673d9155d4ef478f65a03c74e3cf3d1;hp=975cb05e3ede26c99a1199e20f62ebdeb59739a1;hpb=1cce02e84e07f070730785c63dbfccaa498654e7;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/serializers.py b/lcm/lcm/nf/vnfs/serializers.py
index 975cb05e..df9bd7e5 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):
@@ -37,33 +43,77 @@ class vnfcResourceInfoSerializer(serializers.Serializer):
     pass
 
 
+class accessInfoSerializer(serializers.Serializer):
+    tenant = serializers.CharField(help_text="tenant", required=True)
+    username = serializers.CharField(help_text="username", required=True)
+    password = serializers.CharField(help_text="password", required=True)
+
+
+class InterfaceInfoSerializer(serializers.Serializer):
+    vimType = serializers.CharField(help_text="vimType", required=True)
+    apiVersion = serializers.CharField(help_text="apiVersion", required=True)
+    protocolType = serializers.ChoiceField(help_text="protocolType", choices=['http', 'https'], required=True)
+
+
 class vimInfoSerializer(serializers.Serializer):
-    pass
+    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)
 
 
 class monitoringParametersSerializer(serializers.Serializer):
     pass
 
 
+class linkPortsSerializer(serializers.Serializer):
+    resourceId = serializers.CharField(help_text="resourceId", required=True)
+    vimId = serializers.CharField(help_text="vimId", required=False)
+
+
+class resourceHandleSerializer(serializers.Serializer):
+    resourceId = serializers.CharField(help_text="resourceId", required=True)
+    vimId = serializers.CharField(help_text="vimId", required=False)
+    resourceProviderId = serializers.CharField(help_text="resourceProviderId", required=False)
+
+
 class ExtVirtualLinkInfoSerializer(serializers.Serializer):
-    pass
+    extVirtualLinkId = serializers.CharField(help_text="extVirtualLinkId", required=True)
+    resourceHandle = resourceHandleSerializer(help_text="iPAddress", required=True)
+    linkPorts = linkPortsSerializer(help_text="iPAddress", many=True, allow_null=True)
+
+
+class l3AddressDataSerializer(serializers.Serializer):
+    iPAddressType = serializers.ChoiceField(help_text="iPAddressType", choices=['IPv4', 'IPv6'], required=True)
+    iPAddress = serializers.CharField(help_text="iPAddress", required=True)
+
+
+class NetworkAddressSerializer(serializers.Serializer):
+    addressType = serializers.ChoiceField(help_text="addressType", choices=['MAC', 'IP'], required=True)
+    l2AddressData = serializers.CharField(help_text="l2AddressData", required=False)
+    l3AddressData = l3AddressDataSerializer(help_text="addresses", required=False)
 
 
 class extCpInfoSerializer(serializers.Serializer):
-    pass
+    cpInstanceId = serializers.CharField(help_text="cpInstanceId", required=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)
 
 
 class ScaleInfoSerializer(serializers.Serializer):
-    pass
+    aspectId = serializers.CharField(help_text="aspectId", required=True)
+    scaleLevel = serializers.IntegerField(help_text="scaleLevel", required=True)
 
 
 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)
@@ -71,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,
@@ -79,3 +129,31 @@ 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 emptySerializer(serializers.Serializer):
+    pass
+
+
+class extVirtualLinksSerializer(serializers.Serializer):
+    vlInstanceId = serializers.CharField(help_text="vlInstanceId", required=True)
+    resourceId = serializers.CharField(help_text="resourceId", required=True)
+    vim = vimInfoSerializer(help_text="vim", required=True)
+    extCps = extCpInfoSerializer(help_text="extCps", many=True)
+
+
+class additionalParamsSerializer(serializers.Serializer):
+    inputs = emptySerializer(help_text="inputs", required=True)
+    extVirtualLinks = extVirtualLinksSerializer(help_text="extVirtualLinks", many=True, 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", many=True, allow_null=True)
+    additionalParams = additionalParamsSerializer(help_text="additionalParams", required=True, allow_null=True)