From 1d87cfefa8c7f93bd72ac8a0236d128ced1e8c0e Mon Sep 17 00:00:00 2001 From: Nguyen Hung Phuong Date: Wed, 7 Sep 2016 11:46:45 +0700 Subject: [PATCH] Clean imports in code In some part in the code we import objects. In the Openstack style guidelines they recommend to import only modules. http://docs.openstack.org/developer/hacking/#imports Change-Id: I5f5add3ad87c8e9b3a6d781c81c3bedf5b4e1c9c --- octane/commands/enable_release.py | 6 +- octane/handlers/backup_restore/release.py | 4 +- octane/helpers/transformations.py | 5 +- octane/tests/test_network.py | 172 ++++++++++++---------- 4 files changed, 99 insertions(+), 88 deletions(-) diff --git a/octane/commands/enable_release.py b/octane/commands/enable_release.py index 117044c8..c14222f5 100644 --- a/octane/commands/enable_release.py +++ b/octane/commands/enable_release.py @@ -13,7 +13,7 @@ import logging from cliff import command -from fuelclient.client import APIClient +from fuelclient import client from octane.handlers import backup_restore from octane import magic_consts from octane.util import fuel_client @@ -24,11 +24,11 @@ LOG = logging.getLogger(__name__) def enable_release(release_id, context): release_url = "/releases/{0}".format(release_id) with fuel_client.set_auth_context(context): - data = APIClient.get_request(release_url) + data = client.APIClient.get_request(release_url) state = data.get('state') if state == magic_consts.RELEASE_STATUS_MANAGED: data['state'] = magic_consts.RELEASE_STATUS_ENABLED - APIClient.put_request(release_url, data) + client.APIClient.put_request(release_url, data) else: exc_msg = ("Cannot enable release {0}: has status {1}, not {2}" .format(release_id, diff --git a/octane/handlers/backup_restore/release.py b/octane/handlers/backup_restore/release.py index b1c735b5..4e636dd4 100644 --- a/octane/handlers/backup_restore/release.py +++ b/octane/handlers/backup_restore/release.py @@ -15,7 +15,7 @@ import requests import urlparse import yaml -from keystoneclient.v2_0 import Client as keystoneclient +from keystoneclient import v2_0 from octane.handlers.backup_restore import base from octane import magic_consts @@ -82,7 +82,7 @@ class ReleaseArchivator(base.Base): return resp.json() def __request(self, method, url, user, password, data=None): - ksclient = keystoneclient( + ksclient = v2_0.Client( auth_url=magic_consts.KEYSTONE_API_URL, username=user, password=password, diff --git a/octane/helpers/transformations.py b/octane/helpers/transformations.py index 2ada0dd0..bb0d777c 100644 --- a/octane/helpers/transformations.py +++ b/octane/helpers/transformations.py @@ -15,7 +15,7 @@ import os import re import yaml -from distutils.version import StrictVersion +from distutils import version as distutils_version from octane import magic_consts @@ -149,7 +149,8 @@ def get_patch_port_action(host_config, bridge): actions = get_actions(host_config) version = host_config.get('openstack_version') _, _, fuel_version = version.rpartition('-') - if StrictVersion(fuel_version) < StrictVersion('6.1'): + if distutils_version.StrictVersion(fuel_version) < \ + distutils_version.StrictVersion('6.1'): provider = 'ovs' else: provider = get_bridge_provider(actions, bridge) diff --git a/octane/tests/test_network.py b/octane/tests/test_network.py index 24686b09..5ee14a60 100644 --- a/octane/tests/test_network.py +++ b/octane/tests/test_network.py @@ -13,8 +13,7 @@ import pytest import subprocess -from mock import call -from mock import Mock +import mock from octane.tests import util as test_util from octane.util import network @@ -60,31 +59,32 @@ def test_create_overlay_network(mocker): None, None, None, None] expected_args = [ - call(['sh', '-c', - 'ovs-vsctl list-ports br-ex | grep -q br-ex--gre-10.10.10.2'], - node=node1), - call(['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--gre-10.10.10.2', - '--', 'set', 'Interface', 'br-ex--gre-10.10.10.2', - 'type=gre', - 'options:remote_ip=10.10.10.2', - 'options:key=2'], - node=node1), - call(['sh', '-c', - 'ip link show dev gre3-3'], - node=node1), - call(['ip', 'link', 'add', 'gre3-3', - 'type', 'gretap', - 'remote', '10.10.10.2', - 'local', '10.10.10.1', - 'key', '3'], - node=node1), - call(['ip', 'link', 'set', 'up', 'dev', 'gre3-3'], - node=node1), - call(['ip', 'link', 'set', 'mtu', '1450', 'dev', 'gre3-3', ], - node=node1), - call(['ip', 'link', 'set', 'up', 'dev', 'br-mgmt'], node=node1), - call(['brctl', 'addif', 'br-mgmt', 'gre3-3'], - node=node1), + mock.call( + ['sh', '-c', + 'ovs-vsctl list-ports br-ex | grep -q br-ex--gre-10.10.10.2'], + node=node1), + mock.call(['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--gre-10.10.10.2', + '--', 'set', 'Interface', 'br-ex--gre-10.10.10.2', + 'type=gre', + 'options:remote_ip=10.10.10.2', + 'options:key=2'], + node=node1), + mock.call(['sh', '-c', + 'ip link show dev gre3-3'], + node=node1), + mock.call(['ip', 'link', 'add', 'gre3-3', + 'type', 'gretap', + 'remote', '10.10.10.2', + 'local', '10.10.10.1', + 'key', '3'], + node=node1), + mock.call(['ip', 'link', 'set', 'up', 'dev', 'gre3-3'], + node=node1), + mock.call(['ip', 'link', 'set', 'mtu', '1450', 'dev', 'gre3-3', ], + node=node1), + mock.call(['ip', 'link', 'set', 'up', 'dev', 'br-mgmt'], node=node1), + mock.call(['brctl', 'addif', 'br-mgmt', 'gre3-3'], + node=node1), ] network.create_overlay_networks(node1, node2, env, deployment_info, @@ -94,7 +94,7 @@ def test_create_overlay_network(mocker): def test_delete_overlay_network(mocker): - node = Mock() + node = mock.Mock() deployment_info = { 'network_scheme': { 'transformations': [{ @@ -117,10 +117,10 @@ def test_delete_overlay_network(mocker): mock_lnx_tun.return_value = ['gre3-3'] expected_args = [ - call(['ovs-vsctl', 'del-port', 'br-ex', 'br-ex--gre-10.10.10.2'], - node=node), - call(['brctl', 'delif', 'br-mgmt', 'gre3-3'], node=node), - call(['ip', 'link', 'delete', 'gre3-3'], node=node), + mock.call(['ovs-vsctl', 'del-port', 'br-ex', 'br-ex--gre-10.10.10.2'], + node=node), + mock.call(['brctl', 'delif', 'br-mgmt', 'gre3-3'], node=node), + mock.call(['ip', 'link', 'delete', 'gre3-3'], node=node), ] network.delete_overlay_networks(node, deployment_info) @@ -129,20 +129,22 @@ def test_delete_overlay_network(mocker): def test_delete_patch_ports(mocker): - node = Mock() + node = mock.Mock() mock_ssh = mocker.patch('octane.util.ssh.call') expected_args = [ - call(['ovs-vsctl', 'del-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex'], - node=node), - call(['ovs-vsctl', 'del-port', 'br-ex', 'br-ex--br-ovs-bond1'], - node=node), - call(['ovs-vsctl', 'del-port', 'br-ovs-bond2', - 'br-ovs-bond2--br-mgmt'], - node=node), - call(['ovs-vsctl', 'del-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2'], - node=node), + mock.call( + ['ovs-vsctl', 'del-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex'], + node=node), + mock.call(['ovs-vsctl', 'del-port', 'br-ex', 'br-ex--br-ovs-bond1'], + node=node), + mock.call(['ovs-vsctl', 'del-port', 'br-ovs-bond2', + 'br-ovs-bond2--br-mgmt'], + node=node), + mock.call( + ['ovs-vsctl', 'del-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2'], + node=node), ] network.delete_patch_ports(node, DEPLOYMENT_INFO_5_1) @@ -151,15 +153,15 @@ def test_delete_patch_ports(mocker): def test_delete_lnx_ports(mocker): - node = Mock() + node = mock.Mock() mock_ssh = mocker.patch('octane.util.ssh.call') expected_args = [ - call(['brctl', 'delif', 'br-ex', 'eth0.130'], - node=node), - call(['brctl', 'delif', 'br-mgmt', 'eth1.220'], - node=node), + mock.call(['brctl', 'delif', 'br-ex', 'eth0.130'], + node=node), + mock.call(['brctl', 'delif', 'br-mgmt', 'eth1.220'], + node=node), ] network.delete_patch_ports(node, DEPLOYMENT_INFO_7_0) @@ -168,27 +170,31 @@ def test_delete_lnx_ports(mocker): def test_create_patch_ports_5_1(mocker): - node = Mock() + node = mock.Mock() mock_ssh = mocker.patch('octane.util.ssh.call') expected_args = [ - call(['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--br-ovs-bond1', - 'trunks=[0]', '--', 'set', 'interface', 'br-ex--br-ovs-bond1', - 'type=patch', 'options:peer=br-ovs-bond1--br-ex'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex', - 'trunks=[0]', '--', 'set', 'interface', 'br-ovs-bond1--br-ex', - 'type=patch', 'options:peer=br-ex--br-ovs-bond1'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2', - '--', 'set', 'interface', 'br-mgmt--br-ovs-bond2', 'type=patch', - 'options:peer=br-ovs-bond2--br-mgmt'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-ovs-bond2', 'br-ovs-bond2--br-mgmt', - 'tag=102', '--', 'set', 'interface', 'br-ovs-bond2--br-mgmt', - 'type=patch', 'options:peer=br-mgmt--br-ovs-bond2'], - node=node) + mock.call( + ['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--br-ovs-bond1', + 'trunks=[0]', '--', 'set', 'interface', 'br-ex--br-ovs-bond1', + 'type=patch', 'options:peer=br-ovs-bond1--br-ex'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex', + 'trunks=[0]', '--', 'set', 'interface', 'br-ovs-bond1--br-ex', + 'type=patch', 'options:peer=br-ex--br-ovs-bond1'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2', + '--', 'set', 'interface', 'br-mgmt--br-ovs-bond2', 'type=patch', + 'options:peer=br-ovs-bond2--br-mgmt'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-ovs-bond2', 'br-ovs-bond2--br-mgmt', + 'tag=102', '--', 'set', 'interface', 'br-ovs-bond2--br-mgmt', + 'type=patch', 'options:peer=br-mgmt--br-ovs-bond2'], + node=node) ] network.create_patch_ports(node, DEPLOYMENT_INFO_5_1) @@ -197,27 +203,31 @@ def test_create_patch_ports_5_1(mocker): def test_create_patch_ports_7_0(mocker): - node = Mock() + node = mock.Mock() mock_ssh = mocker.patch('octane.util.ssh.call') expected_args = [ - call(['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--br-ovs-bond1', '--', - 'set', 'interface', 'br-ex--br-ovs-bond1', 'type=patch', - 'options:peer=br-ovs-bond1--br-ex'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex', - '--', 'set', 'interface', 'br-ovs-bond1--br-ex', 'type=patch', - 'options:peer=br-ex--br-ovs-bond1'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2', - '--', 'set', 'interface', 'br-mgmt--br-ovs-bond2', 'type=patch', - 'options:peer=br-ovs-bond2--br-mgmt'], - node=node), - call(['ovs-vsctl', 'add-port', 'br-ovs-bond2', 'br-ovs-bond2--br-mgmt', - 'tag=102', '--', 'set', 'interface', 'br-ovs-bond2--br-mgmt', - 'type=patch', 'options:peer=br-mgmt--br-ovs-bond2'], - node=node) + mock.call( + ['ovs-vsctl', 'add-port', 'br-ex', 'br-ex--br-ovs-bond1', '--', + 'set', 'interface', 'br-ex--br-ovs-bond1', 'type=patch', + 'options:peer=br-ovs-bond1--br-ex'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-ovs-bond1', 'br-ovs-bond1--br-ex', + '--', 'set', 'interface', 'br-ovs-bond1--br-ex', 'type=patch', + 'options:peer=br-ex--br-ovs-bond1'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-mgmt', 'br-mgmt--br-ovs-bond2', + '--', 'set', 'interface', 'br-mgmt--br-ovs-bond2', 'type=patch', + 'options:peer=br-ovs-bond2--br-mgmt'], + node=node), + mock.call( + ['ovs-vsctl', 'add-port', 'br-ovs-bond2', 'br-ovs-bond2--br-mgmt', + 'tag=102', '--', 'set', 'interface', 'br-ovs-bond2--br-mgmt', + 'type=patch', 'options:peer=br-mgmt--br-ovs-bond2'], + node=node) ] network.create_patch_ports(node, DEPLOYMENT_INFO_OVS_7_0)