Merge "Add flake8 and yamllint tox environments and fix tox errors"

3 files changed, 20 insertions, 15 deletions

diff --git a/sdnvpn/lib/openstack_utils.py b/sdnvpn/lib/openstack_utils.py
index cfacfa8..d377c33 100644
--- a/sdnvpn/lib/openstack_utils.py
+++ b/sdnvpn/lib/openstack_utils.py
@@ -410,7 +410,7 @@ def create_instance(flavor_name,
     conn = get_os_connection()
     try:
         flavor = conn.compute.find_flavor(flavor_name, ignore_missing=False)
-    except:
+    except Exception:
         flavors = [flavor.name for flavor in conn.compute.flavors()]
         logger.error("Error: Flavor '%s' not found. Available flavors are: "
                      "\n%s" % (flavor_name, flavors))
@@ -933,7 +933,7 @@ def create_secgroup_rule(conn, sg_id, direction, protocol,
     try:
         conn.network.create_security_group_rule(**secgroup_rule_attrs)
         return True
-    except:
+    except Exception:
         logger.exception("Impossible to create_security_group_rule,"
                          "security group rule probably already exists")
         return False
@@ -1168,7 +1168,7 @@ def delete_volume(cloud, volume_id, forced=False):
                 for attachment in volume.attachments:
                     server = cloud.get_server(attachment.server_id)
                     cloud.detach_volume(server, volume)
-            except:
+            except Exception:
                 logger.error(sys.exc_info()[0])
             cloud.delete_volume(volume_id, force=True)
         else:
@@ -1295,9 +1295,9 @@ def get_or_create_tenant_for_vnf(keystone_client, tenant_name,
             return True
         else:
             return False
-    except:
+    except Exception:
         raise Exception("Impossible to create a Tenant for the VNF {}".format(
-                            tenant_name))
+            tenant_name))
 
 
 def create_user(keystone_client, user_name, user_password,
@@ -1355,10 +1355,10 @@ def get_or_create_user_for_vnf(keystone_client, vnf_ref):
             role_id = get_role_id(keystone_client, 'admin')
             tenant_id = get_tenant_id(keystone_client, vnf_ref)
             add_role_user(keystone_client, user_id, role_id, tenant_id)
-        except:
+        except Exception:
             logger.warn("Cannot associate user to role admin on tenant")
         return created
-    except:
+    except Exception:
         raise Exception("Impossible to create a user for the VNF {}".format(
             vnf_ref))
 
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml
index cd398ee..f77e8d7 100644
--- a/sdnvpn/test/functest/config.yaml
+++ b/sdnvpn/test/functest/config.yaml
@@ -1,5 +1,6 @@
+---
 defaults:
-  flavor: m1.tiny # adapt to your environment
+  flavor: m1.tiny  # adapt to your environment
 
 testcases:
   sdnvpn.test.functest.testcase_1:
@@ -116,7 +117,8 @@ testcases:
   sdnvpn.test.functest.testcase_4:
     enabled: true
     order: 4
-    description: VPN provides connectivity between subnets using router association
+    description: "VPN provides connectivity between subnets using router \
+                 association"
     instance_1_name: sdnvpn-4-1
     instance_2_name: sdnvpn-4-2
     instance_3_name: sdnvpn-4-3
@@ -180,12 +182,14 @@ testcases:
   sdnvpn.test.functest.testcase_9:
     enabled: true
     order: 9
-    description: Verify that all OpenStack nodes OVS br-int have fail_mode set to secure.
+    description: "Verify that all OpenStack nodes OVS br-int have fail_mode \
+                 set to secure."
 
   sdnvpn.test.functest.testcase_10:
     enabled: true
     order: 10
-    description: Test if interupts occure during ping, when removing and adding instances
+    description: "Test if interupts occure during ping, when removing and \
+                 adding instances"
     instance_1_name: sdnvpn-10-1
     instance_2_name: sdnvpn-10-2
     instance_3_name: sdnvpn-10-3
@@ -201,7 +205,8 @@ testcases:
   sdnvpn.test.functest.testcase_11:
     enabled: true
     order: 11
-    description: Check relevant OVS groups are removed upon deletion of OpenStack topology
+    description: "Check relevant OVS groups are removed upon deletion of \
+                 OpenStack topology"
     instance_1_name: sdnvpn-11-1
     instance_2_name: sdnvpn-11-2
     image_name: sdnvpn-image
@@ -252,5 +257,5 @@ testcases:
     targets1: '88:88'
     targets2: '88:88'
     route_distinguishers:
-        - '12:12'
-        - '13:13'
+      - '12:12'
+      - '13:13'
diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py
index dbfbfd4..3ba93a9 100644
--- a/sdnvpn/test/functest/testcase_10.py
+++ b/sdnvpn/test/functest/testcase_10.py
@@ -55,7 +55,7 @@ def monitor(conn, in_data, out_data, vm):
                             logger.info("Ping from instance {}: {}".
                                         format(vm.name, console_line))
                 lines_offset = len(vm_console_out_lines)
-        except:
+        except Exception:
             # Atomic write to std out
             with std_out_lock:
                 logger.error("Failure in monitor_thread of instance {}".