diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-07-20 13:37:41 +0200 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-07-20 13:58:18 +0200 |
| commit | 4cd8b20676cf12bbbf6ab281700220fd61174e7a (patch) | |
| tree | 6f64f7d72e5eecfc1daa8581c379db275ad8eca6 /testcases/OpenStack | |
| parent | 76a691ab6bba6bf0eca9e04ebb5632647ccf8ba6 (diff) | |
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>
Diffstat (limited to 'testcases/OpenStack')
| -rwxr-xr-x | testcases/OpenStack/examples/create_instance_and_ip.py | 8 | ||||
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 3 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 3 | ||||
| -rwxr-xr-x | testcases/OpenStack/vPing/vPing_ssh.py | 3 | ||||
| -rwxr-xr-x | testcases/OpenStack/vPing/vPing_userdata.py | 3 |
5 files changed, 7 insertions, 13 deletions
diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py index 41f8a9c8a..92a3df6b5 100755 --- a/testcases/OpenStack/examples/create_instance_and_ip.py +++ b/testcases/OpenStack/examples/create_instance_and_ip.py @@ -73,11 +73,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, @@ -89,7 +87,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 diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index c4804739b..589939bea 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -425,8 +425,7 @@ def main(): image_exists = True logger.debug("Creating network '%s'..." % PRIVATE_NET_NAME) - network_dict = os_utils.create_network_full(logger, - neutron_client, + network_dict = os_utils.create_network_full(neutron_client, PRIVATE_NET_NAME, PRIVATE_SUBNET_NAME, ROUTER_NAME, diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 452e1fdd8..9535de160 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -138,8 +138,7 @@ def create_tempest_resources(): logger.error("Error : Failed to create %s user" % USER_NAME) logger.debug("Creating private network for Tempest suite") - network_dic = os_utils.create_network_full(logger, - neutron_client, + network_dic = os_utils.create_network_full(neutron_client, PRIVATE_NET_NAME, PRIVATE_SUBNET_NAME, ROUTER_NAME, diff --git a/testcases/OpenStack/vPing/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py index 60e7baaf8..4aab6195a 100755 --- a/testcases/OpenStack/vPing/vPing_ssh.py +++ b/testcases/OpenStack/vPing/vPing_ssh.py @@ -199,8 +199,7 @@ def main(): logger.debug("Image '%s' with ID=%s created successfully." % (GLANCE_IMAGE_NAME, image_id)) - network_dic = os_utils.create_network_full(logger, - neutron_client, + network_dic = os_utils.create_network_full(neutron_client, PRIVATE_NET_NAME, PRIVATE_SUBNET_NAME, ROUTER_NAME, diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py index 164aea66f..b6e3fe11a 100755 --- a/testcases/OpenStack/vPing/vPing_userdata.py +++ b/testcases/OpenStack/vPing/vPing_userdata.py @@ -199,8 +199,7 @@ def main(): logger.debug("Image '%s' with ID=%s created successfully." % (GLANCE_IMAGE_NAME, image_id)) - network_dic = os_utils.create_network_full(logger, - neutron_client, + network_dic = os_utils.create_network_full(neutron_client, PRIVATE_NET_NAME, PRIVATE_SUBNET_NAME, ROUTER_NAME, |