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: I74109c2fcecad3812115b47316882f2053f90900
This commit is contained in:
Nguyen Hung Phuong
parent
124c0923f7
commit
a8b9240bc2
@ -16,13 +16,12 @@ limitations under the License.
|
||||
|
||||
import json
|
||||
|
||||
from cafe.engine.models.base import AutoMarshallingModel, \
|
||||
AutoMarshallingListModel
|
||||
from cafe.engine.models import base
|
||||
|
||||
from cloudcafe.bare_metal.common.models.links import Link, Links
|
||||
|
||||
|
||||
class Chassis(AutoMarshallingModel):
|
||||
class Chassis(base.AutoMarshallingModel):
|
||||
|
||||
def __init__(
|
||||
self, description=None, links=None, extra=None, created_at=None,
|
||||
@ -61,7 +60,7 @@ class Chassis(AutoMarshallingModel):
|
||||
uuid=json_dict.get('uuid'))
|
||||
|
||||
|
||||
class ChassisList(AutoMarshallingListModel):
|
||||
class ChassisList(base.AutoMarshallingListModel):
|
||||
|
||||
@classmethod
|
||||
def _json_to_obj(cls, serialized_str):
|
||||
|
||||
@ -16,7 +16,7 @@ limitations under the License.
|
||||
|
||||
import unittest
|
||||
|
||||
from cloudcafe.bare_metal.chassis.models.requests import CreateChassis
|
||||
from cloudcafe.bare_metal.chassis.models import requests
|
||||
|
||||
|
||||
class CreateChassisModelTest(unittest.TestCase):
|
||||
@ -24,7 +24,7 @@ class CreateChassisModelTest(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
|
||||
chassis_request = CreateChassis(
|
||||
chassis_request = requests.CreateChassis(
|
||||
description='test_chassis', extra={'meta1': 'value1'})
|
||||
cls.chassis_json = chassis_request.serialize('json')
|
||||
|
||||
|
||||
@ -17,14 +17,14 @@ limitations under the License.
|
||||
import json
|
||||
import unittest
|
||||
|
||||
from cloudcafe.bare_metal.common.models.patch import Patches
|
||||
from cloudcafe.bare_metal.common.models import patch
|
||||
|
||||
|
||||
class CreatePatchModelTest(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
patch_request = Patches(
|
||||
patch_request = patch.Patches(
|
||||
[{"path": "/properties/foo", "value": "bar", "op": "add"}])
|
||||
cls.request_json = patch_request.serialize('json')
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ limitations under the License.
|
||||
|
||||
import unittest
|
||||
|
||||
from cloudcafe.bare_metal.drivers.models.responses import Driver, Drivers
|
||||
from cloudcafe.bare_metal.drivers.models import responses
|
||||
|
||||
|
||||
class DriversModelTest(unittest.TestCase):
|
||||
@ -158,7 +158,8 @@ class DriversModelTest(unittest.TestCase):
|
||||
]
|
||||
}
|
||||
"""
|
||||
cls.drivers = Drivers.deserialize(cls.drivers_json_response, 'json')
|
||||
cls.drivers = responses.Drivers.deserialize(cls.drivers_json_response,
|
||||
'json')
|
||||
|
||||
def test_list_drivers(self):
|
||||
self.assertEqual(len(self.drivers), 8)
|
||||
@ -213,7 +214,8 @@ class DriverModelTest(unittest.TestCase):
|
||||
]
|
||||
}
|
||||
"""
|
||||
cls.driver = Driver.deserialize(cls.driver_json_response, 'json')
|
||||
cls.driver = responses.Driver.deserialize(cls.driver_json_response,
|
||||
'json')
|
||||
|
||||
def test_driver_name(self):
|
||||
self.assertEqual(self.driver.name, "fake")
|
||||
|
||||
@ -16,7 +16,7 @@ limitations under the License.
|
||||
|
||||
import unittest
|
||||
|
||||
from cloudcafe.bare_metal.ports.models.requests import CreatePort
|
||||
from cloudcafe.bare_metal.ports.models import requests
|
||||
|
||||
|
||||
class CreatePortModelTest(unittest.TestCase):
|
||||
@ -24,7 +24,7 @@ class CreatePortModelTest(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
|
||||
port_request = CreatePort(
|
||||
port_request = requests.CreatePort(
|
||||
node_uuid="1", address="52:54:00:e5:57:d4",
|
||||
extra={'meta1': 'value1'})
|
||||
cls.port_json = port_request.serialize('json')
|
||||
|
||||
@ -16,7 +16,7 @@ limitations under the License.
|
||||
|
||||
import unittest
|
||||
|
||||
from cloudcafe.bare_metal.ports.models.responses import Port, Ports
|
||||
from cloudcafe.bare_metal.ports.models import responses
|
||||
|
||||
|
||||
class PortsModelTest(unittest.TestCase):
|
||||
@ -72,7 +72,7 @@ class PortsModelTest(unittest.TestCase):
|
||||
]
|
||||
}
|
||||
"""
|
||||
cls.ports = Ports.deserialize(cls.ports_json, 'json')
|
||||
cls.ports = responses.Ports.deserialize(cls.ports_json, 'json')
|
||||
|
||||
def test_ports(self):
|
||||
self.assertEqual(len(self.ports), 3)
|
||||
@ -113,7 +113,7 @@ class PortModelTest(unittest.TestCase):
|
||||
"address":"52:54:00:b1:dc:51"
|
||||
}
|
||||
"""
|
||||
cls.port = Port.deserialize(cls.port_json, 'json')
|
||||
cls.port = responses.Port.deserialize(cls.port_json, 'json')
|
||||
|
||||
def test_port_node_uuid(self):
|
||||
self.assertEqual(
|
||||
|
||||
@ -16,8 +16,7 @@ limitations under the License.
|
||||
|
||||
import unittest
|
||||
|
||||
from lbaascafe.lbaas.lbaas_api.clients.base_load_balancers_client \
|
||||
import BaseLoadBalancersClient
|
||||
from lbaascafe.lbaas.lbaas_api.clients import base_load_balancers_client
|
||||
|
||||
|
||||
class BaseLoadBalancersClientFixture(unittest.TestCase):
|
||||
@ -35,4 +34,5 @@ class BaseLoadBalancersClientFixture(unittest.TestCase):
|
||||
cls.load_balancer_id = "12345"
|
||||
cls.url = "http://fake.url.endpoint"
|
||||
cls.load_balancers_url = '{url}/{suffix}'.format(
|
||||
url=cls.url, suffix=BaseLoadBalancersClient._SUFFIX)
|
||||
url=cls.url,
|
||||
suffix=base_load_balancers_client.BaseLoadBalancersClient._SUFFIX)
|
||||
|
||||
@ -18,12 +18,9 @@ import unittest
|
||||
|
||||
import mock
|
||||
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer.client \
|
||||
import LoadBalancersClient
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer.request \
|
||||
import CreateLoadBalancer, UpdateLoadBalancer
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer.response \
|
||||
import LoadBalancer, LoadBalancers
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer import client
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer import request
|
||||
from cloudcafe.networking.lbaas.lbaas_api.load_balancer import response
|
||||
|
||||
|
||||
class LoadBalancersClientFixture(unittest.TestCase):
|
||||
@ -46,14 +43,14 @@ class LoadBalancersClientFixture(unittest.TestCase):
|
||||
cls.admin_state_up = False
|
||||
|
||||
cls.full_url_load_balancers = (
|
||||
LoadBalancersClient._LOAD_BALANCERS_URL.format(
|
||||
client.LoadBalancersClient._LOAD_BALANCERS_URL.format(
|
||||
base_url=cls.url))
|
||||
cls.full_url_load_balancer = (
|
||||
LoadBalancersClient._LOAD_BALANCER_URL.format(
|
||||
client.LoadBalancersClient._LOAD_BALANCER_URL.format(
|
||||
base_url=cls.url,
|
||||
load_balancer_id=cls.load_balancer_id))
|
||||
|
||||
cls.load_balancers_client = LoadBalancersClient(
|
||||
cls.load_balancers_client = client.LoadBalancersClient(
|
||||
url=cls.url,
|
||||
auth_token=cls.auth_token,
|
||||
serialize_format=cls.SERIALIZE,
|
||||
@ -62,7 +59,7 @@ class LoadBalancersClientFixture(unittest.TestCase):
|
||||
|
||||
class LoadBalancersClientTests(object):
|
||||
|
||||
@mock.patch.object(LoadBalancersClient, 'request', autospec=True)
|
||||
@mock.patch.object(client.LoadBalancersClient, 'request', autospec=True)
|
||||
def test_create_load_balancer(self, mock_request):
|
||||
|
||||
create_load_balancer_kwargs = (
|
||||
@ -74,17 +71,17 @@ class LoadBalancersClientTests(object):
|
||||
'admin_state_up': self.admin_state_up})
|
||||
self.load_balancers_client.create_load_balancer(
|
||||
**create_load_balancer_kwargs)
|
||||
create_load_balancer_request = CreateLoadBalancer(
|
||||
create_load_balancer_request = request.CreateLoadBalancer(
|
||||
**create_load_balancer_kwargs)
|
||||
mock_request.assert_called_once_with(
|
||||
self.load_balancers_client,
|
||||
'POST',
|
||||
self.full_url_load_balancers,
|
||||
request_entity=create_load_balancer_request,
|
||||
response_entity_type=LoadBalancer,
|
||||
response_entity_type=response.LoadBalancer,
|
||||
requestslib_kwargs=None)
|
||||
|
||||
@mock.patch.object(LoadBalancersClient, 'request', autospec=True)
|
||||
@mock.patch.object(client.LoadBalancersClient, 'request', autospec=True)
|
||||
def test_list_load_balancer(self, mock_request):
|
||||
|
||||
self.load_balancers_client.list_load_balancers()
|
||||
@ -92,10 +89,10 @@ class LoadBalancersClientTests(object):
|
||||
self.load_balancers_client,
|
||||
'GET',
|
||||
self.full_url_load_balancers,
|
||||
response_entity_type=LoadBalancers,
|
||||
response_entity_type=response.LoadBalancers,
|
||||
requestslib_kwargs=None)
|
||||
|
||||
@mock.patch.object(LoadBalancersClient, 'request', autospec=True)
|
||||
@mock.patch.object(client.LoadBalancersClient, 'request', autospec=True)
|
||||
def test_get_load_balancer(self, mock_request):
|
||||
|
||||
self.load_balancers_client.get_load_balancer(
|
||||
@ -104,10 +101,10 @@ class LoadBalancersClientTests(object):
|
||||
self.load_balancers_client,
|
||||
'GET',
|
||||
self.full_url_load_balancer,
|
||||
response_entity_type=LoadBalancer,
|
||||
response_entity_type=response.LoadBalancer,
|
||||
requestslib_kwargs=None)
|
||||
|
||||
@mock.patch.object(LoadBalancersClient, 'request', autospec=True)
|
||||
@mock.patch.object(client.LoadBalancersClient, 'request', autospec=True)
|
||||
def test_update_load_balancer(self, mock_request):
|
||||
|
||||
update_load_balancer_kwargs = (
|
||||
@ -117,17 +114,17 @@ class LoadBalancersClientTests(object):
|
||||
self.load_balancers_client.update_load_balancer(
|
||||
load_balancer_id=self.load_balancer_id,
|
||||
**update_load_balancer_kwargs)
|
||||
update_load_balancer_request = UpdateLoadBalancer(
|
||||
update_load_balancer_request = request.UpdateLoadBalancer(
|
||||
**update_load_balancer_kwargs)
|
||||
mock_request.assert_called_once_with(
|
||||
self.load_balancers_client,
|
||||
'PUT',
|
||||
self.full_url_load_balancer,
|
||||
request_entity=update_load_balancer_request,
|
||||
response_entity_type=LoadBalancer,
|
||||
response_entity_type=response.LoadBalancer,
|
||||
requestslib_kwargs=None)
|
||||
|
||||
@mock.patch.object(LoadBalancersClient, 'request', autospec=True)
|
||||
@mock.patch.object(client.LoadBalancersClient, 'request', autospec=True)
|
||||
def test_delete_load_balancer(self, mock_request):
|
||||
|
||||
self.load_balancers_client.delete_load_balancer(
|
||||
|
||||
@ -16,42 +16,39 @@ limitations under the License.
|
||||
import unittest
|
||||
from mock import MagicMock
|
||||
from mock import Mock
|
||||
from requests import Response
|
||||
import requests
|
||||
|
||||
from cloudcafe.objectstorage.objectstorage_api.behaviors \
|
||||
import ObjectStorageAPI_Behaviors
|
||||
from cloudcafe.objectstorage.objectstorage_api.client \
|
||||
import ObjectStorageAPIClient
|
||||
from cloudcafe.objectstorage.objectstorage_api.config \
|
||||
import ObjectStorageAPIConfig
|
||||
from cloudcafe.objectstorage.objectstorage_api import behaviors
|
||||
from cloudcafe.objectstorage.objectstorage_api import client as obj_client
|
||||
from cloudcafe.objectstorage.objectstorage_api import config as obj_config
|
||||
from metatests.objectstorage.objectstorage_api import test_client
|
||||
|
||||
|
||||
class ApiBehaviorsTest(unittest.TestCase):
|
||||
|
||||
def test_create_container(self):
|
||||
response = Mock(spec=Response)
|
||||
response = Mock(spec=requests.Response)
|
||||
response.ok = True
|
||||
|
||||
client = Mock(spec=ObjectStorageAPIClient)
|
||||
client = Mock(spec=obj_client.ObjectStorageAPIClient)
|
||||
client.create_container = MagicMock(return_value=response)
|
||||
|
||||
config = Mock(spec=ObjectStorageAPIConfig)
|
||||
config = Mock(spec=obj_config.ObjectStorageAPIConfig)
|
||||
|
||||
behavior = ObjectStorageAPI_Behaviors(client, config)
|
||||
behavior = behaviors.ObjectStorageAPI_Behaviors(client, config)
|
||||
behavior.create_container(test_client.VALID_CONTAINER_NAME)
|
||||
client.create_container.assert_called_with(
|
||||
test_client.VALID_CONTAINER_NAME, headers={})
|
||||
|
||||
def test_throws_exception_if_create_container_fails(self):
|
||||
response = Mock(spec=Response)
|
||||
response = Mock(spec=requests.Response)
|
||||
response.ok = False
|
||||
|
||||
client = Mock(spec=ObjectStorageAPIClient)
|
||||
client = Mock(spec=obj_client.ObjectStorageAPIClient)
|
||||
client.create_container = MagicMock(return_value=response)
|
||||
|
||||
config = Mock(spec=ObjectStorageAPIConfig)
|
||||
config = Mock(spec=obj_config.ObjectStorageAPIConfig)
|
||||
|
||||
behavior = ObjectStorageAPI_Behaviors(client, config)
|
||||
behavior = behaviors.ObjectStorageAPI_Behaviors(client, config)
|
||||
with self.assertRaises(Exception):
|
||||
behavior.create_container(test_client.VALID_CONTAINER_NAME)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
import unittest
|
||||
from cloudcafe.openstackcli.novacli.client import NovaCLI
|
||||
from cloudcafe.openstackcli.novacli import client
|
||||
|
||||
|
||||
class NovaCLI_InitializeClientWithAllArguments(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.novacli = NovaCLI(
|
||||
cls.novacli = client.NovaCLI(
|
||||
os_cache=True, timings=True, timeout=30,
|
||||
os_username='fake_username', os_password='fake_password',
|
||||
os_tenant_name='FakeTenantName', os_tenant_id='1234567',
|
||||
@ -68,7 +68,7 @@ class NovaCLI_InitializeClientWithAllArguments(unittest.TestCase):
|
||||
self.assertIn('--bypass-url bypass_url', self.base_cmd)
|
||||
|
||||
def test_no_arguments_positive(self):
|
||||
novacli = NovaCLI()
|
||||
novacli = client.NovaCLI()
|
||||
self.assertEquals(novacli.base_cmd().strip(), 'nova')
|
||||
|
||||
|
||||
@ -82,7 +82,7 @@ class NovaCLI_CommandSerializationTests_CreateServer(unittest.TestCase):
|
||||
self.command = cmd
|
||||
self.standard_out = "fake standard out"
|
||||
|
||||
cls.novacli = NovaCLI()
|
||||
cls.novacli = client.NovaCLI()
|
||||
cls.novacli.run_command = lambda x: FakeResponse(x)
|
||||
cls.command = cls.novacli.create_server(
|
||||
name='fake name',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user