Fix vfc-vnfres pep8 E501 issue 33/29633/1
authorying.yunlong <ying.yunlong@zte.com.cn>
Tue, 30 Jan 2018 10:43:44 +0000 (18:43 +0800)
committerying.yunlong <ying.yunlong@zte.com.cn>
Tue, 30 Jan 2018 10:43:44 +0000 (18:43 +0800)
Change-Id: I5186b0115a7ce1aade388fadd37aca808b538924
Issue-ID: VFC-679
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
res/res/resources/serializers.py

index 2c3f7cb..9b9d535 100644 (file)
@@ -21,22 +21,38 @@ class ResourceSerializer(serializers.Serializer):
 
 
 class VirtualStorageResourceInfoSerializer(serializers.Serializer):
-    virtualStorageInstanceId = serializers.CharField(help_text="virtualStorageInstanceId", required=True)
-    virtualStorageDescId = serializers.CharField(help_text="virtualStorageDescId", required=True, allow_null=True)
-    storageResource = ResourceSerializer(help_text="storageResource", required=True)
+    virtualStorageInstanceId = serializers.CharField(
+        help_text="virtualStorageInstanceId", required=True)
+    virtualStorageDescId = serializers.CharField(
+        help_text="virtualStorageDescId", required=True, allow_null=True)
+    storageResource = ResourceSerializer(
+        help_text="storageResource", required=True)
 
 
 class VirtualLinkResourceInfoSerializer(serializers.Serializer):
-    virtualLinkInstanceId = serializers.IntegerField(help_text="virtualLinkInstanceId", required=True, allow_null=True)
-    virtualLinkDescId = serializers.IntegerField(help_text="virtualLinkDescId", required=True, allow_null=True)
-    networkResource = ResourceSerializer(help_text="networkResource", required=True, allow_null=True)
+    virtualLinkInstanceId = serializers.IntegerField(
+        help_text="virtualLinkInstanceId", required=True, allow_null=True)
+    virtualLinkDescId = serializers.IntegerField(
+        help_text="virtualLinkDescId", required=True, allow_null=True)
+    networkResource = ResourceSerializer(
+        help_text="networkResource",
+        required=True,
+        allow_null=True)
 
 
 class VnfcResourceInfoSerializer(serializers.Serializer):
-    vnfcInstanceId = serializers.IntegerField(help_text="vnfcInstanceId", required=True, allow_null=True)
-    vduId = serializers.IntegerField(help_text="vduId", required=True, allow_null=True)
-    storageResourceIds = serializers.IntegerField(help_text="storageResourceIds", required=True, allow_null=True)
-    computeResource = ResourceSerializer(help_text="computeResource", required=True, allow_null=True)
+    vnfcInstanceId = serializers.IntegerField(
+        help_text="vnfcInstanceId", required=True, allow_null=True)
+    vduId = serializers.IntegerField(
+        help_text="vduId",
+        required=True,
+        allow_null=True)
+    storageResourceIds = serializers.IntegerField(
+        help_text="storageResourceIds", required=True, allow_null=True)
+    computeResource = ResourceSerializer(
+        help_text="computeResource",
+        required=True,
+        allow_null=True)
 
 
 class AccessInfoSerializer(serializers.Serializer):
@@ -48,40 +64,93 @@ class AccessInfoSerializer(serializers.Serializer):
 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)
+    protocolType = serializers.ChoiceField(
+        help_text="protocolType", choices=[
+            'http', 'https'], required=True)
 
 
 class VmResponseSerializer(serializers.Serializer):
-    vmid = serializers.CharField(help_text="vmid", required=True, allow_null=True)
-    vimid = serializers.CharField(help_text="the vim id", required=True, allow_null=True)
-    resouceid = serializers.CharField(help_text="the resouce id", required=True, allow_null=True)
-    tenant = serializers.CharField(help_text="tenant", required=True, allow_null=True)
-    instid = serializers.CharField(help_text="the inst id", required=True, allow_null=True)
-    vmname = serializers.CharField(help_text="vmname", required=True, allow_null=True)
-    insttype = serializers.IntegerField(help_text="insttype", required=True, allow_null=True)
-    operationalstate = serializers.CharField(help_text="operationalstate", required=True, allow_null=True)
-    is_predefined = serializers.IntegerField(help_text="is_predefined", required=True, allow_null=True)
-    security_groups = serializers.CharField(help_text="security_groups", required=True, allow_null=True)
-    flavor_id = serializers.CharField(help_text="flavor_id", required=True, allow_null=True)
-    availability_zone = serializers.CharField(help_text="availability_zone", required=True, allow_null=True)
-    server_group = serializers.CharField(help_text="server_group", required=True, allow_null=True)
-    volume_array = serializers.CharField(help_text="volume_array", required=True, allow_null=True)
-    metadata = serializers.CharField(help_text="metadata", required=True, allow_null=True)
-    nic_array = serializers.CharField(help_text="nic_array", required=True, allow_null=True)
-    create_time = serializers.CharField(help_text="create_time", required=False, allow_null=True)
-    nodeId = serializers.CharField(help_text="nodeId", required=False, allow_null=True)
+    vmid = serializers.CharField(
+        help_text="vmid",
+        required=True,
+        allow_null=True)
+    vimid = serializers.CharField(
+        help_text="the vim id",
+        required=True,
+        allow_null=True)
+    resouceid = serializers.CharField(
+        help_text="the resouce id",
+        required=True,
+        allow_null=True)
+    tenant = serializers.CharField(
+        help_text="tenant",
+        required=True,
+        allow_null=True)
+    instid = serializers.CharField(
+        help_text="the inst id",
+        required=True,
+        allow_null=True)
+    vmname = serializers.CharField(
+        help_text="vmname",
+        required=True,
+        allow_null=True)
+    insttype = serializers.IntegerField(
+        help_text="insttype", required=True, allow_null=True)
+    operationalstate = serializers.CharField(
+        help_text="operationalstate", required=True, allow_null=True)
+    is_predefined = serializers.IntegerField(
+        help_text="is_predefined", required=True, allow_null=True)
+    security_groups = serializers.CharField(
+        help_text="security_groups", required=True, allow_null=True)
+    flavor_id = serializers.CharField(
+        help_text="flavor_id",
+        required=True,
+        allow_null=True)
+    availability_zone = serializers.CharField(
+        help_text="availability_zone", required=True, allow_null=True)
+    server_group = serializers.CharField(
+        help_text="server_group",
+        required=True,
+        allow_null=True)
+    volume_array = serializers.CharField(
+        help_text="volume_array",
+        required=True,
+        allow_null=True)
+    metadata = serializers.CharField(
+        help_text="metadata",
+        required=True,
+        allow_null=True)
+    nic_array = serializers.CharField(
+        help_text="nic_array",
+        required=True,
+        allow_null=True)
+    create_time = serializers.CharField(
+        help_text="create_time",
+        required=False,
+        allow_null=True)
+    nodeId = serializers.CharField(
+        help_text="nodeId",
+        required=False,
+        allow_null=True)
 
 
 class VimInfoSerializer(serializers.Serializer):
-    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):
-    pass
+    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 LinkPortsSerializer(serializers.Serializer):
@@ -92,68 +161,134 @@ class LinkPortsSerializer(serializers.Serializer):
 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)
+    resourceProviderId = serializers.CharField(
+        help_text="resourceProviderId", required=False)
 
 
 class ExtVirtualLinkInfoSerializer(serializers.Serializer):
-    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)
+    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)
+    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)
+    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):
-    cpInstanceId = serializers.CharField(help_text="cpInstanceId", required=False, allow_null=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)
+    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):
-    aspectId = serializers.CharField(help_text="aspectId", required=True, allow_null=True)
-    scaleLevel = serializers.IntegerField(help_text="scaleLevel", required=True, allow_null=True)
+    aspectId = serializers.CharField(
+        help_text="aspectId",
+        required=True,
+        allow_null=True)
+    scaleLevel = serializers.IntegerField(
+        help_text="scaleLevel", required=True, allow_null=True)
 
 
 class InstantiatedVnfInfoSerializer(serializers.Serializer):
-    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)
-    localizationLanguage = serializers.CharField(help_text="localizationLanguage", required=True, allow_null=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)
+    localizationLanguage = serializers.CharField(
+        help_text="localizationLanguage", 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 = serializers.DictField(help_text="monitoringParameters", child=serializers.CharField(allow_blank=True), required=False, allow_null=True)
-    vmInfo = VmResponseSerializer(help_text="vmInfo", many=True, allow_null=True)
-    vimInfo = VimInfoSerializer(help_text="vimInfo", many=True, required=False, allow_null=True)
-    vnfcResourceInfo = VnfcResourceInfoSerializer(help_text="vnfcResourceInfo", many=True)
-    virtualLinkResourceInfo = VirtualLinkResourceInfoSerializer(help_text="virtualLinkResourceInfo", many=True)
-    virtualStorageResourceInfo = VirtualStorageResourceInfoSerializer(help_text="virtualStorageResourceInfo", many=True)
+    extVirtualLink = ExtVirtualLinkInfoSerializer(
+        help_text="extVirtualLink", many=True)
+    monitoringParameters = serializers.DictField(
+        help_text="monitoringParameters", child=serializers.CharField(
+            allow_blank=True), required=False, allow_null=True)
+    vmInfo = VmResponseSerializer(
+        help_text="vmInfo",
+        many=True,
+        allow_null=True)
+    vimInfo = VimInfoSerializer(
+        help_text="vimInfo",
+        many=True,
+        required=False,
+        allow_null=True)
+    vnfcResourceInfo = VnfcResourceInfoSerializer(
+        help_text="vnfcResourceInfo", many=True)
+    virtualLinkResourceInfo = VirtualLinkResourceInfoSerializer(
+        help_text="virtualLinkResourceInfo", many=True)
+    virtualStorageResourceInfo = VirtualStorageResourceInfoSerializer(
+        help_text="virtualStorageResourceInfo", many=True)
 
 
 class VnfInfoSerializer(serializers.Serializer):
-    vnfInstanceId = serializers.CharField(help_text="vnf Instance Id", required=True)
-    vnfInstanceName = serializers.CharField(help_text="vnf Instance Name", required=True)
-    vnfInstanceDescription = serializers.CharField(help_text="vnfInstanceDescription", required=True, allow_null=True)
-    onboardedVnfPkgInfoId = serializers.CharField(help_text="onboarded Vnf Pkg Info Id", required=False, allow_null=True)
-    vnfdId = serializers.CharField(help_text="vnfdId", required=True, allow_null=True)
-    vnfdVersion = serializers.CharField(help_text="vnfd Version", required=False, allow_null=True)
-    vnfSoftwareVersion = serializers.CharField(help_text="vnfSoftwareVersion", required=True, allow_null=True)
-    vnfProvider = serializers.CharField(help_text="vnf Provider", required=False, allow_null=True)
-    vnfProductName = serializers.CharField(help_text="vnfProductName", required=False, allow_null=True)
-    vnfConfigurableProperties = serializers.CharField(help_text="vnfConfigurableProperties", required=False, allow_null=True)
-    instantiationState = serializers.CharField(help_text="instantiationState", required=False, allow_null=True)
-    extensions = serializers.CharField(help_text="extensions", required=False, allow_null=True)
-    metadata = serializers.CharField(help_text="metadata", required=False, allow_null=True)
-    instantiatedVnfInfo = InstantiatedVnfInfoSerializer(help_text="instantiatedVnfInfo", required=True)
+    vnfInstanceId = serializers.CharField(
+        help_text="vnf Instance Id", required=True)
+    vnfInstanceName = serializers.CharField(
+        help_text="vnf Instance Name", required=True)
+    vnfInstanceDescription = serializers.CharField(
+        help_text="vnfInstanceDescription", required=True, allow_null=True)
+    onboardedVnfPkgInfoId = serializers.CharField(
+        help_text="onboarded Vnf Pkg Info Id", required=False, allow_null=True)
+    vnfdId = serializers.CharField(
+        help_text="vnfdId",
+        required=True,
+        allow_null=True)
+    vnfdVersion = serializers.CharField(
+        help_text="vnfd Version",
+        required=False,
+        allow_null=True)
+    vnfSoftwareVersion = serializers.CharField(
+        help_text="vnfSoftwareVersion", required=True, allow_null=True)
+    vnfProvider = serializers.CharField(
+        help_text="vnf Provider",
+        required=False,
+        allow_null=True)
+    vnfProductName = serializers.CharField(
+        help_text="vnfProductName", required=False, allow_null=True)
+    vnfConfigurableProperties = serializers.CharField(
+        help_text="vnfConfigurableProperties", required=False, allow_null=True)
+    instantiationState = serializers.CharField(
+        help_text="instantiationState", required=False, allow_null=True)
+    extensions = serializers.CharField(
+        help_text="extensions",
+        required=False,
+        allow_null=True)
+    metadata = serializers.CharField(
+        help_text="metadata",
+        required=False,
+        allow_null=True)
+    instantiatedVnfInfo = InstantiatedVnfInfoSerializer(
+        help_text="instantiatedVnfInfo", required=True)
 
 
 class VnfsInfoSerializer(serializers.Serializer):
@@ -167,56 +302,78 @@ class VmInfoSerializer(serializers.Serializer):
 class FlavorResponseSerializer(serializers.Serializer):
     flavourid = serializers.CharField(help_text="flavourid", required=True)
     vimid = serializers.CharField(help_text="the vim id", required=True)
-    resouceid = serializers.CharField(help_text="the resouce id", required=True)
-    tenant = serializers.CharField(help_text="tenant", required=True, allow_null=True)
+    resouceid = serializers.CharField(
+        help_text="the resouce id", required=True)
+    tenant = serializers.CharField(
+        help_text="tenant",
+        required=True,
+        allow_null=True)
     instid = serializers.CharField(help_text="the inst id", required=True)
     name = serializers.CharField(help_text="name", required=True)
     extraspecs = serializers.CharField(help_text="extraspecs", required=True)
-    create_time = serializers.CharField(help_text="create_time", required=True, allow_null=True)
+    create_time = serializers.CharField(
+        help_text="create_time",
+        required=True,
+        allow_null=True)
     memory = serializers.IntegerField(help_text="memory", required=True)
     vcpu = serializers.IntegerField(help_text="vcpu", required=True)
 
 
 class FlavorInfoSerializer(serializers.Serializer):
-    resp_data = FlavorResponseSerializer(help_text="the response data", many=True)
+    resp_data = FlavorResponseSerializer(
+        help_text="the response data", many=True)
 
 
 class NetworkResponseSerializer(serializers.Serializer):
     networkid = serializers.CharField(help_text="networkid", required=True)
     vimid = serializers.CharField(help_text="the vim id", required=True)
-    resouceid = serializers.CharField(help_text="the resouce id", required=True)
-    insttype = serializers.IntegerField(help_text="the inst type", required=True)
+    resouceid = serializers.CharField(
+        help_text="the resouce id", required=True)
+    insttype = serializers.IntegerField(
+        help_text="the inst type", required=True)
     instid = serializers.CharField(help_text="the inst id", required=True)
     name = serializers.CharField(help_text="name", required=True)
 
 
 class NetworkInfoSerializer(serializers.Serializer):
-    resp_data = NetworkResponseSerializer(help_text="the response data", many=True)
+    resp_data = NetworkResponseSerializer(
+        help_text="the response data", many=True)
 
 
 class SubnetResponseSerializer(serializers.Serializer):
-    subnetworkid = serializers.CharField(help_text="the subnetwork id", required=True)
+    subnetworkid = serializers.CharField(
+        help_text="the subnetwork id", required=True)
     vimid = serializers.CharField(help_text="the vim id", required=True)
-    resouceid = serializers.CharField(help_text="the resouce id", required=True)
-    networkid = serializers.CharField(help_text="the network id", required=True)
-    insttype = serializers.IntegerField(help_text="the inst type", required=True)
+    resouceid = serializers.CharField(
+        help_text="the resouce id", required=True)
+    networkid = serializers.CharField(
+        help_text="the network id", required=True)
+    insttype = serializers.IntegerField(
+        help_text="the inst type", required=True)
     instid = serializers.CharField(help_text="the inst id", required=True)
     name = serializers.CharField(help_text="name", required=True)
     cidr = serializers.CharField(help_text="cidr", required=True)
 
 
 class SubnetInfoSerializer(serializers.Serializer):
-    resp_data = SubnetResponseSerializer(help_text="the response data", many=True)
+    resp_data = SubnetResponseSerializer(
+        help_text="the response data", many=True)
 
 
 class CpResponseSerializer(serializers.Serializer):
-    cpinstanceid = serializers.CharField(help_text="the cp instance id", required=True)
+    cpinstanceid = serializers.CharField(
+        help_text="the cp instance id", required=True)
     cpdid = serializers.CharField(help_text="the cpd id", required=True)
-    cpinstancename = serializers.CharField(help_text="the cp instance name of vnf", required=True)
-    vlinstanceid = serializers.CharField(help_text="the vl instance id of vnf", required=True)
-    ownertype = serializers.IntegerField(help_text="the owner type of vnf", required=True)
-    ownerid = serializers.CharField(help_text="the owner id of vnf", required=True)
-    relatedtype = serializers.IntegerField(help_text="the related type", required=True)
+    cpinstancename = serializers.CharField(
+        help_text="the cp instance name of vnf", required=True)
+    vlinstanceid = serializers.CharField(
+        help_text="the vl instance id of vnf", required=True)
+    ownertype = serializers.IntegerField(
+        help_text="the owner type of vnf", required=True)
+    ownerid = serializers.CharField(
+        help_text="the owner id of vnf", required=True)
+    relatedtype = serializers.IntegerField(
+        help_text="the related type", required=True)
 
 
 class CpsInfoSerializer(serializers.Serializer):
@@ -224,14 +381,22 @@ class CpsInfoSerializer(serializers.Serializer):
 
 
 class VolumeResponseSerializer(serializers.Serializer):
-    storageid = serializers.CharField(help_text="the storage id", required=True)
+    storageid = serializers.CharField(
+        help_text="the storage id", required=True)
     vimid = serializers.CharField(help_text="the vim id", required=True)
-    resouceid = serializers.CharField(help_text="the resouce id of vnf", required=True)
-    insttype = serializers.IntegerField(help_text="the inst type of vnf", required=True)
-    instid = serializers.CharField(help_text="the inst id of vnf", required=True)
-    storagetype = serializers.CharField(help_text="the storage type of vnf", required=True)
-    size = serializers.CharField(help_text="the size of storage", required=True)
+    resouceid = serializers.CharField(
+        help_text="the resouce id of vnf", required=True)
+    insttype = serializers.IntegerField(
+        help_text="the inst type of vnf", required=True)
+    instid = serializers.CharField(
+        help_text="the inst id of vnf", required=True)
+    storagetype = serializers.CharField(
+        help_text="the storage type of vnf", required=True)
+    size = serializers.CharField(
+        help_text="the size of storage",
+        required=True)
 
 
 class VolumeInfoSerializer(serializers.Serializer):
-    resp_data = VolumeResponseSerializer(help_text="the response data", many=True)
+    resp_data = VolumeResponseSerializer(
+        help_text="the response data", many=True)