Fix vfc-lcm/pub/nfvi pep8 issue

Change-Id: Iaa738c02866152acf914f3ebddde8e159d665f72
Issue-ID: VFC-456
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index 8a336eb..0cb28d6 100644 (file)
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -71,9 +71,3 @@ SDC_PASSWD = "SDC"
 DEPLOY_WORKFLOW_WHEN_START = True
 # Support option: activiti/wso2/buildin
 WORKFLOW_OPTION = "buildin"
-
-
-
-
-
-

diff --git a/lcm/pub/nfvi/vim/api/multivim/api.py b/lcm/pub/nfvi/vim/api/multivim/api.py
index 0fa48f8..3b73a0f 100644 (file)
--- a/lcm/pub/nfvi/vim/api/multivim/api.py
+++ b/lcm/pub/nfvi/vim/api/multivim/api.py
@@ -22,11 +22,12 @@ logger = logging.getLogger(__name__)
 
 VIM_DRIVER_BASE_URL = "api/multicloud/v0"
 
+
 def call(vim_id, tenant_id, res, method, data=''):
     if data and not isinstance(data, (str, unicode)):
         data = json.JSONEncoder().encode(data)
     url = "{base_url}/{vim_id}{tenant_id}/{res}".format(
-        base_url=VIM_DRIVER_BASE_URL, 
+        base_url=VIM_DRIVER_BASE_URL,
         vim_id=vim_id,
         tenant_id="/" + tenant_id if tenant_id else "",
         res=res)
@@ -35,112 +36,150 @@ def call(vim_id, tenant_id, res, method, data=''):
         raise VimException(ret[1], ret[2])
     return json.JSONDecoder().decode(ret[1]) if ret[1] else {}
 
-######################################################################
+
+#######################################################################
+
 
 def create_image(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "images", "POST", data)
 
+
 def delete_image(vim_id, tenant_id, image_id):
     return call(vim_id, tenant_id, "images/%s" % image_id, "DELETE")
-    
+
+
 def get_image(vim_id, tenant_id, image_id):
     return call(vim_id, tenant_id, "images/%s" % image_id, "GET")
-    
+
+
 def list_image(vim_id, tenant_id):
     return call(vim_id, tenant_id, "images", "GET")
 
+
 ######################################################################
 
+
 def create_network(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "networks", "POST", data)
 
+
 def delete_network(vim_id, tenant_id, network_id):
     return call(vim_id, tenant_id, "networks/%s" % network_id, "DELETE")
-    
+
+
 def get_network(vim_id, tenant_id, network_id):
     return call(vim_id, tenant_id, "networks/%s" % network_id, "GET")
-    
+
+
 def list_network(vim_id, tenant_id):
     return call(vim_id, tenant_id, "networks", "GET")
 
+
 ######################################################################
 
+
 def create_subnet(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "subnets", "POST", data)
 
+
 def delete_subnet(vim_id, tenant_id, subnet_id):
     return call(vim_id, tenant_id, "subnets/%s" % subnet_id, "DELETE")
-    
+
+
 def get_subnet(vim_id, tenant_id, subnet_id):
     return call(vim_id, tenant_id, "subnets/%s" % subnet_id, "GET")
-    
+
+
 def list_subnet(vim_id, tenant_id):
     return call(vim_id, tenant_id, "subnets", "GET")
 
+
 ######################################################################
 
+
 def create_port(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "ports", "POST", data)
 
+
 def delete_port(vim_id, tenant_id, port_id):
     return call(vim_id, tenant_id, "ports/%s" % port_id, "DELETE")
-    
+
+
 def get_port(vim_id, tenant_id, port_id):
     return call(vim_id, tenant_id, "ports/%s" % port_id, "GET")
-    
+
+
 def list_port(vim_id, tenant_id):
     return call(vim_id, tenant_id, "ports", "GET")
 
+
 ######################################################################
 
+
 def create_flavor(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "flavors", "POST", data)
 
+
 def delete_flavor(vim_id, tenant_id, flavor_id):
     return call(vim_id, tenant_id, "flavors/%s" % flavor_id, "DELETE")
-    
+
+
 def get_flavor(vim_id, tenant_id, flavor_id):
     return call(vim_id, tenant_id, "flavors/%s" % flavor_id, "GET")
-    
+
+
 def list_flavor(vim_id, tenant_id):
     return call(vim_id, tenant_id, "flavors", "GET")
 
+
 ######################################################################
 
+
 def create_vm(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "servers", "POST", data)
 
+
 def delete_vm(vim_id, tenant_id, vm_id):
     return call(vim_id, tenant_id, "servers/%s" % vm_id, "DELETE")
-    
+
+
 def get_vm(vim_id, tenant_id, vm_id):
     return call(vim_id, tenant_id, "servers/%s" % vm_id, "GET")
-    
+
+
 def list_vm(vim_id, tenant_id):
     return call(vim_id, tenant_id, "servers", "GET")
 
+
 ######################################################################
 
+
 def create_volume(vim_id, tenant_id, data):
     return call(vim_id, tenant_id, "volumes", "POST", data)
 
+
 def delete_volume(vim_id, tenant_id, volume_id):
     return call(vim_id, tenant_id, "volumes/%s" % volume_id, "DELETE")
-    
+
+
 def get_volume(vim_id, tenant_id, volume_id):
     return call(vim_id, tenant_id, "volumes/%s" % volume_id, "GET")
-    
+
+
 def list_volume(vim_id, tenant_id):
     return call(vim_id, tenant_id, "volumes", "GET")
 
+
 ######################################################################
 
+
 def list_tenant(vim_id, tenant_name=""):
     res = "tenants"
     if tenant_name:
         res = "%s?name=%s" % (res, tenant_name)
     return call(vim_id, "", res, "GET")
 
+
 ######################################################################
 
 
@@ -188,7 +227,7 @@ class MultiVimApi:
             "subnets": net.get("subnets", []),
             "shared": net.get("shared", True),
             "router_external": net.get("routerExternal", "")
-        } for net in nets["networks"]]}]      
+        } for net in nets["networks"]]}]
 
     def query_subnet(self, auth_info, subnet_id):
         subnet_info = get_subnet(self.vim_id, self.tenant_id, subnet_id)
@@ -233,30 +272,32 @@ class MultiVimApi:
             "imageType": data["image_type"],
             "containerFormat": "bare",
             "visibility": "public",
-            "properties": [] 
+            "properties": []
         }
         image = create_image(self.vim_id, self.tenant_id, image_data)
         return [0, {
-            "id": image["id"], 
-            "name": image["name"], 
-            const.RES_TYPE_KEY: image["returnCode"]}]
+            "id": image["id"],
+            "name": image["name"],
+            const.RES_TYPE_KEY: image["returnCode"]}
+        ]
 
     def get_image(self, auth_info, image_id):
         image = get_image(self.vim_id, self.tenant_id, image_id)
         return [0, {
-            "id": image["id"], 
-            "name": image["name"], 
-            "size": image["size"], 
-            "status": image["status"]}]      
+            "id": image["id"],
+            "name": image["name"],
+            "size": image["size"],
+            "status": image["status"]}
+        ]
 
     def get_images(self, auth_info):
         images = list_image(self.vim_id, self.tenant_id)
         return [0, {"image_list": [{
-            "id": img["id"], 
-            "name": img["name"], 
-            "size": img["size"], 
+            "id": img["id"],
+            "name": img["name"],
+            "size": img["size"],
             "status": img["status"]
-            } for img in images["images"]]}]
+        } for img in images["images"]]}]
 
     def delete_image(self, auth_info, image_id):
         return [0, ""]
@@ -269,7 +310,7 @@ class MultiVimApi:
         }
         if "physical_network" in data and data['physical_network']:
             net_data["physicalNetwork"] = data['physical_network']
-        if "vlan_transparent" in data and data["vlan_transparent"]: 
+        if "vlan_transparent" in data and data["vlan_transparent"]:
             net_data["vlanTransparent"] = data["vlan_transparent"]
         if "segmentation_id" in data and data['segmentation_id']:
             net_data["segmentationId"] = data["segmentation_id"]
@@ -287,13 +328,13 @@ class MultiVimApi:
             "subnet_list": []
         }
         if "subnet_list" in data and data["subnet_list"]:
-            subnet = data["subnet_list"][0]           
+            subnet = data["subnet_list"][0]
             subnet_data = {
                 "networkId": network_id,
                 "name": subnet["subnet_name"],
                 "cidr": subnet["cidr"],
                 "ipVersion": const.IPV4,
-                "enableDhcp": False           
+                "enableDhcp": False
             }
             if "ip_version" in subnet and subnet["ip_version"]:
                 subnet_data["ipVersion"] = int(subnet["ip_version"])

diff --git a/lcm/pub/nfvi/vim/api/openstack/network.py b/lcm/pub/nfvi/vim/api/openstack/network.py
index ebfdf66..452be98 100644 (file)
--- a/lcm/pub/nfvi/vim/api/openstack/network.py
+++ b/lcm/pub/nfvi/vim/api/openstack/network.py
@@ -51,8 +51,8 @@ def query_net(auth_info, net_id):
         "tenant_name": tenant.name,
         "subnets": net["subnets"],
         "shared": net["shared"],
-        "router_external": net["router:external"]
-        }]
+        "router_external": net["router:external"]}
+    ]
 
 
 def query_nets(auth_info):
@@ -77,7 +77,7 @@ def query_nets(auth_info):
         "subnets": net["subnets"],
         "shared": net["shared"],
         "router_external": net["router:external"]
-        } for net in nets["networks"]]}]
+    } for net in nets["networks"]]}]
 
 
 def query_subnet(auth_info, subnet_id):
@@ -132,8 +132,8 @@ def get_subnet_id(neutron, data, network_id):
     subnet_id = None
     if "subnet_name" in data and data["subnet_name"]:
         all_subnets = neutron.list_subnets()
-        filter_subnets = [subnet for subnet in all_subnets["subnets"] if subnet["name"] == data["subnet_name"]
-                          and subnet["network_id"] == network_id]
+        filter_subnets = [subnet for subnet in all_subnets["subnets"] if subnet["name"] == data["subnet_name"] and
+                          subnet["network_id"] == network_id]
         count_filter_subnets = len(filter_subnets)
         if 1 > count_filter_subnets:
             logger.error("Subnet name(%s) does not exist" % data["subnet_name"])
@@ -181,8 +181,8 @@ def create_port(auth_info, data):
     # check port
     port_data = None
     ports = neutron.list_ports()
-    sel_ports = [port for port in ports['ports'] if port['tenant_id'] == tenant_id
-                 and port['network_id'] == network_id]
+    sel_ports = [port for port in ports['ports'] if port['tenant_id'] == tenant_id and
+                 port['network_id'] == network_id]
     filter_ports = []
     for port in sel_ports:
         if port['name'] == data["port_name"] and port['fixed_ips']:
@@ -206,12 +206,15 @@ def create_port(auth_info, data):
         return [0, port_data]
 
     # create port
-    create_param = {'port': {
+    create_param = {
+        'port': {
             'name': data["port_name"],
             'admin_state_up': True,
             'network_id': network_id,
             'security_groups': [],
-            'tenant_id': tenant_id}}
+            'tenant_id': tenant_id
+        }
+    }
     if "mac_address" in data and data["mac_address"]:
         create_param['port']['mac_address'] = data["mac_address"]
     if "vnic_type" in data and data["vnic_type"]:
@@ -272,17 +275,21 @@ def create_network(auth_info, data):
             neutron = neutronbase.get_neutron_by_tenant_id(fun_name(), auth_info, sel_nets[0]['tenant_id'])
         all_subnets = neutron_admin.list_subnets()
         filter_subnets = [subnet for subnet in all_subnets["subnets"] if subnet["network_id"] == sel_nets[0]["id"]]
-        network_data = {"status": sel_nets[0]["status"],
-                        "id": sel_nets[0]["id"],
-                        "name": data["network_name"],
-                        "provider:segmentation_id": sel_nets[0]["provider:segmentation_id"],
-                        "provider:network_type": sel_nets[0]["provider:network_type"],
-                        const.RES_TYPE_KEY: const.RES_TYPE_EXIST,
-                        "subnet_list": [{
-                                            "id": subnet["id"],
-                                            "name": subnet["name"],
-                                            const.RES_TYPE_KEY: const.RES_TYPE_EXIST
-                                        } for subnet in filter_subnets]}
+        network_data = {
+            "status": sel_nets[0]["status"],
+            "id": sel_nets[0]["id"],
+            "name": data["network_name"],
+            "provider:segmentation_id": sel_nets[0]["provider:segmentation_id"],
+            "provider:network_type": sel_nets[0]["provider:network_type"],
+            const.RES_TYPE_KEY: const.RES_TYPE_EXIST,
+            "subnet_list": [
+                {
+                    "id": subnet["id"],
+                    "name": subnet["name"],
+                    const.RES_TYPE_KEY: const.RES_TYPE_EXIST
+                }for subnet in filter_subnets
+            ]
+        }
     else:
         create_params = {
             'network': {
@@ -338,9 +345,10 @@ def create_subnet(neutron, network_id, data):
                       if subnet["network_id"] == network_id and subnet["name"] == data["subnet_name"]]
     if filter_subnets:
         return [0, {
-                    "id": filter_subnets[0]["id"],
-                    "name": data["subnet_name"],
-                    const.RES_TYPE_KEY: const.RES_TYPE_EXIST}]
+            "id": filter_subnets[0]["id"],
+            "name": data["subnet_name"],
+            const.RES_TYPE_KEY: const.RES_TYPE_EXIST
+        }]
     try:
         create_params = {
             'subnet': {
@@ -348,8 +356,8 @@ def create_subnet(neutron, network_id, data):
                 'name': data["subnet_name"],
                 'cidr': data["cidr"],
                 'ip_version': int(data["ip_version"]) if "ip_version" in data else const.IPV4, }}
-        create_params["subnet"]["enable_dhcp"] = ("enable_dhcp" in data
-                                                  and int(data["enable_dhcp"]) == const.ENABLE_DHCP)
+        create_params["subnet"]["enable_dhcp"] = ("enable_dhcp" in data and
+                                                  int(data["enable_dhcp"]) == const.ENABLE_DHCP)
         if "gateway_ip" in data and data["gateway_ip"]:
             create_params["subnet"]["gateway_ip"] = data["gateway_ip"]
         else: