From 4cd8b20676cf12bbbf6ab281700220fd61174e7a Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 20 Jul 2016 13:37:41 +0200
Subject: Remove logger as input parameter of functions in openstack_utils

JIRA: FUNCTEST-376

Also some fixes to get rid of flake8 violations in onos-sfc

Change-Id: I52c2fd30a6b81af20ea779db2d73b9386524f7ce
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 testcases/features/promise.py | 15 +++++++--------
 testcases/features/sfc/sfc.py |  8 +++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'testcases/features')

diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index fe1547af9..564f94709 100755
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -14,16 +14,16 @@ import json
 import os
 import subprocess
 import time
-import yaml
-
-import keystoneclient.v2_0.client as ksclient
-import glanceclient.client as glclient
-import novaclient.client as nvclient
-from neutronclient.v2_0 import client as ntclient
 
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils
 import functest.utils.openstack_utils as openstack_utils
+import glanceclient.client as glclient
+import keystoneclient.v2_0.client as ksclient
+from neutronclient.v2_0 import client as ntclient
+import novaclient.client as nvclient
+import yaml
+
 
 parser = argparse.ArgumentParser()
 
@@ -168,8 +168,7 @@ def main():
 
     neutron = ntclient.Client(**nt_creds)
 
-    network_dic = openstack_utils.create_network_full(logger,
-                                                      neutron,
+    network_dic = openstack_utils.create_network_full(neutron,
                                                       NET_NAME,
                                                       SUBNET_NAME,
                                                       ROUTER_NAME,
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index dedf6e448..99aac66b1 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -93,11 +93,9 @@ def main():
                                             IMAGE_PATH,
                                             disk=IMAGE_FORMAT,
                                             container="bare",
-                                            public=True,
-                                            logger=logger)
+                                            public=True)
 
-    network_dic = os_utils.create_network_full(logger,
-                                               neutron_client,
+    network_dic = os_utils.create_network_full(neutron_client,
                                                NET_NAME,
                                                SUBNET_NAME,
                                                ROUTER_NAME,
@@ -109,7 +107,7 @@ def main():
 
     network_id = network_dic["net_id"]
 
-    sg_id = os_utils.create_security_group_full(logger, neutron_client,
+    sg_id = os_utils.create_security_group_full(neutron_client,
                                                 SECGROUP_NAME, SECGROUP_DESCR)
 
     # boot INTANCE
-- 
cgit 1.2.3-korg