tests: remove oslo.config fixture usage
Now that prepare_service() is used to get a transient conf object, there's no need for a fixture since the object is never reused. Change-Id: I7b43c6d10cfa11525dc6d10e150f931d045259dc
This commit is contained in:
parent
910140d535
commit
a226b2470e
|
@ -21,7 +21,6 @@ import warnings
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
@ -165,8 +164,7 @@ class TestBase(test_base.BaseTestCase):
|
||||||
raise testcase.TestSkipped(
|
raise testcase.TestSkipped(
|
||||||
'Test is not applicable for %s' % engine)
|
'Test is not applicable for %s' % engine)
|
||||||
|
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
manager = self.DRIVER_MANAGERS.get(engine)
|
manager = self.DRIVER_MANAGERS.get(engine)
|
||||||
if not manager:
|
if not manager:
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
"""Base classes for API tests.
|
"""Base classes for API tests.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import pecan
|
import pecan
|
||||||
import pecan.testing
|
import pecan.testing
|
||||||
|
|
||||||
|
@ -34,8 +33,7 @@ class FunctionalTest(db_test_base.TestBase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(FunctionalTest, self).setUp()
|
super(FunctionalTest, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.setup_messaging(self.CONF)
|
self.setup_messaging(self.CONF)
|
||||||
|
|
||||||
self.CONF.set_override("policy_file",
|
self.CONF.set_override("policy_file",
|
||||||
|
|
|
@ -23,7 +23,6 @@ import uuid
|
||||||
|
|
||||||
from gabbi import fixture
|
from gabbi import fixture
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
@ -71,9 +70,7 @@ class ConfigFixture(fixture.GabbiFixture):
|
||||||
if engine not in ENGINES:
|
if engine not in ENGINES:
|
||||||
raise case.SkipTest('Database engine not supported')
|
raise case.SkipTest('Database engine not supported')
|
||||||
|
|
||||||
conf = service.prepare_service([], [])
|
self.conf = service.prepare_service([], [])
|
||||||
conf = fixture_config.Config(conf).conf
|
|
||||||
self.conf = conf
|
|
||||||
|
|
||||||
content = ('{"default": ""}')
|
content = ('{"default": ""}')
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
|
@ -82,28 +79,29 @@ class ConfigFixture(fixture.GabbiFixture):
|
||||||
prefix='policy',
|
prefix='policy',
|
||||||
suffix='.json')
|
suffix='.json')
|
||||||
|
|
||||||
conf.set_override("policy_file", self.tempfile,
|
self.conf.set_override("policy_file", self.tempfile,
|
||||||
group='oslo_policy')
|
group='oslo_policy')
|
||||||
conf.set_override(
|
self.conf.set_override(
|
||||||
'api_paste_config',
|
'api_paste_config',
|
||||||
os.path.abspath(
|
os.path.abspath(
|
||||||
'ceilometer/tests/functional/gabbi/gabbi_paste.ini')
|
'ceilometer/tests/functional/gabbi/gabbi_paste.ini')
|
||||||
)
|
)
|
||||||
|
|
||||||
# A special pipeline is required to use the direct publisher.
|
# A special pipeline is required to use the direct publisher.
|
||||||
conf.set_override('pipeline_cfg_file',
|
self.conf.set_override(
|
||||||
|
'pipeline_cfg_file',
|
||||||
'ceilometer/tests/functional/gabbi_pipeline.yaml')
|
'ceilometer/tests/functional/gabbi_pipeline.yaml')
|
||||||
|
|
||||||
database_name = '%s-%s' % (db_url, str(uuid.uuid4()))
|
database_name = '%s-%s' % (db_url, str(uuid.uuid4()))
|
||||||
conf.set_override('connection', database_name, group='database')
|
self.conf.set_override('connection', database_name, group='database')
|
||||||
conf.set_override('metering_connection', '', group='database')
|
self.conf.set_override('metering_connection', '', group='database')
|
||||||
|
|
||||||
conf.set_override('gnocchi_is_enabled', False, group='api')
|
self.conf.set_override('gnocchi_is_enabled', False, group='api')
|
||||||
conf.set_override('aodh_is_enabled', False, group='api')
|
self.conf.set_override('aodh_is_enabled', False, group='api')
|
||||||
conf.set_override('panko_is_enabled', False, group='api')
|
self.conf.set_override('panko_is_enabled', False, group='api')
|
||||||
|
|
||||||
LOAD_APP_KWARGS = {
|
LOAD_APP_KWARGS = {
|
||||||
'conf': conf,
|
'conf': self.conf,
|
||||||
}
|
}
|
||||||
|
|
||||||
def stop_fixture(self):
|
def stop_fixture(self):
|
||||||
|
|
|
@ -16,7 +16,6 @@ import socket
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import msgpack
|
import msgpack
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging
|
import oslo_messaging
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
@ -42,8 +41,7 @@ class FakeConnection(object):
|
||||||
class TestCollector(tests_base.BaseTestCase):
|
class TestCollector(tests_base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestCollector, self).setUp()
|
super(TestCollector, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.import_opt("connection", "oslo_db.options", group="database")
|
self.CONF.import_opt("connection", "oslo_db.options", group="database")
|
||||||
self.CONF.set_override("connection", "log://", group='database')
|
self.CONF.set_override("connection", "log://", group='database')
|
||||||
self.CONF.set_override('telemetry_secret', 'not-so-secret',
|
self.CONF.set_override('telemetry_secret', 'not-so-secret',
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging
|
import oslo_messaging
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
import six
|
import six
|
||||||
|
@ -99,8 +98,7 @@ class TestNotification(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNotification, self).setUp()
|
super(TestNotification, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.set_override("connection", "log://", group='database')
|
self.CONF.set_override("connection", "log://", group='database')
|
||||||
self.CONF.set_override("backend_url", "zake://", group="coordination")
|
self.CONF.set_override("backend_url", "zake://", group="coordination")
|
||||||
self.CONF.set_override("workload_partitioning", True,
|
self.CONF.set_override("workload_partitioning", True,
|
||||||
|
@ -221,8 +219,7 @@ class BaseRealNotification(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(BaseRealNotification, self).setUp()
|
super(BaseRealNotification, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.setup_messaging(self.CONF, 'nova')
|
self.setup_messaging(self.CONF, 'nova')
|
||||||
|
|
||||||
pipeline_cfg_file = self.setup_pipeline(['vcpus', 'memory'])
|
pipeline_cfg_file = self.setup_pipeline(['vcpus', 'memory'])
|
||||||
|
@ -447,8 +444,7 @@ class TestRealNotificationMultipleAgents(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestRealNotificationMultipleAgents, self).setUp()
|
super(TestRealNotificationMultipleAgents, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.setup_messaging(self.CONF, 'nova')
|
self.setup_messaging(self.CONF, 'nova')
|
||||||
|
|
||||||
pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])
|
pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])
|
||||||
|
|
|
@ -23,7 +23,6 @@ import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import six
|
import six
|
||||||
from stevedore import extension
|
from stevedore import extension
|
||||||
import yaml
|
import yaml
|
||||||
|
@ -248,8 +247,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
|
||||||
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
|
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(BaseAgentManagerTestCase, self).setUp()
|
super(BaseAgentManagerTestCase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.set_override(
|
self.CONF.set_override(
|
||||||
'cfg_file',
|
'cfg_file',
|
||||||
self.path_get('etc/ceilometer/polling.yaml'), group='polling'
|
self.path_get('etc/ceilometer/polling.yaml'), group='polling'
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer.agent.discovery import endpoint
|
from ceilometer.agent.discovery import endpoint
|
||||||
|
@ -29,13 +28,12 @@ class TestEndpointDiscovery(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestEndpointDiscovery, self).setUp()
|
super(TestEndpointDiscovery, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
CONF.set_override('interface', 'publicURL',
|
||||||
self.CONF.set_override('interface', 'publicURL',
|
|
||||||
group='service_credentials')
|
group='service_credentials')
|
||||||
self.CONF.set_override('region_name', 'test-region-name',
|
CONF.set_override('region_name', 'test-region-name',
|
||||||
group='service_credentials')
|
group='service_credentials')
|
||||||
self.discovery = endpoint.EndpointDiscovery(self.CONF)
|
self.discovery = endpoint.EndpointDiscovery(CONF)
|
||||||
self.manager = mock.MagicMock()
|
self.manager = mock.MagicMock()
|
||||||
self.catalog = (self.manager.keystone.session.auth.get_access.
|
self.catalog = (self.manager.keystone.session.auth.get_access.
|
||||||
return_value.service_catalog)
|
return_value.service_catalog)
|
||||||
|
@ -64,9 +62,8 @@ class TestEndpointDiscovery(base.BaseTestCase):
|
||||||
class TestLocalnodeDiscovery(base.BaseTestCase):
|
class TestLocalnodeDiscovery(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestLocalnodeDiscovery, self).setUp()
|
super(TestLocalnodeDiscovery, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.discovery = localnode.LocalNodeDiscovery(CONF)
|
||||||
self.discovery = localnode.LocalNodeDiscovery(self.CONF)
|
|
||||||
self.manager = mock.MagicMock()
|
self.manager = mock.MagicMock()
|
||||||
|
|
||||||
def test_lockalnode_discovery(self):
|
def test_lockalnode_discovery(self):
|
||||||
|
@ -103,8 +100,7 @@ class TestHardwareDiscovery(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestHardwareDiscovery, self).setUp()
|
super(TestHardwareDiscovery, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.discovery = hardware.NodesDiscoveryTripleO(self.CONF)
|
self.discovery = hardware.NodesDiscoveryTripleO(self.CONF)
|
||||||
self.discovery.nova_cli = mock.MagicMock()
|
self.discovery.nova_cli = mock.MagicMock()
|
||||||
self.manager = mock.MagicMock()
|
self.manager = mock.MagicMock()
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
from keystoneauth1 import exceptions as ka_exceptions
|
from keystoneauth1 import exceptions as ka_exceptions
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
@ -49,8 +48,7 @@ class TestPollsterBuilder(agentbase.TestPollster):
|
||||||
class TestManager(base.BaseTestCase):
|
class TestManager(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestManager, self).setUp()
|
super(TestManager, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.conf = service.prepare_service([], [])
|
||||||
self.conf = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
|
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
|
||||||
def test_load_plugins(self):
|
def test_load_plugins(self):
|
||||||
|
|
|
@ -14,19 +14,12 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer.agent import plugin_base
|
from ceilometer.agent import plugin_base
|
||||||
from ceilometer import service
|
|
||||||
|
|
||||||
|
|
||||||
class NotificationBaseTestCase(base.BaseTestCase):
|
class NotificationBaseTestCase(base.BaseTestCase):
|
||||||
def setUp(self):
|
|
||||||
super(NotificationBaseTestCase, self).setUp()
|
|
||||||
conf = service.prepare_service([], [])
|
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
class FakePlugin(plugin_base.NotificationBase):
|
class FakePlugin(plugin_base.NotificationBase):
|
||||||
event_types = ['compute.*']
|
event_types = ['compute.*']
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
|
|
||||||
from ceilometer.api import app
|
from ceilometer.api import app
|
||||||
from ceilometer import service
|
from ceilometer import service
|
||||||
|
@ -26,8 +25,7 @@ class TestApp(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestApp, self).setUp()
|
super(TestApp, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_api_paste_file_not_exist(self):
|
def test_api_paste_file_not_exist(self):
|
||||||
self.CONF.set_override('api_paste_config', 'non-existent-file')
|
self.CONF.set_override('api_paste_config', 'non-existent-file')
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging
|
import oslo_messaging
|
||||||
|
|
||||||
from ceilometer.api import hooks
|
from ceilometer.api import hooks
|
||||||
|
@ -25,8 +24,7 @@ class TestTestNotifierHook(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestTestNotifierHook, self).setUp()
|
super(TestTestNotifierHook, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_init_notifier_with_drivers(self):
|
def test_init_notifier_with_drivers(self):
|
||||||
hook = hooks.NotifierHook(self.CONF)
|
hook = hooks.NotifierHook(self.CONF)
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
from ceilometer.compute.virt import inspector as virt_inspector
|
from ceilometer.compute.virt import inspector as virt_inspector
|
||||||
|
@ -27,8 +26,7 @@ class TestPollsterBase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestPollsterBase, self).setUp()
|
super(TestPollsterBase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
self.inspector = mock.Mock()
|
self.inspector = mock.Mock()
|
||||||
self.instance = mock.MagicMock()
|
self.instance = mock.MagicMock()
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
@ -46,8 +45,7 @@ class TestLocationMetadata(base.BaseTestCase):
|
||||||
|
|
||||||
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
super(TestLocationMetadata, self).setUp()
|
super(TestLocationMetadata, self).setUp()
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ import datetime
|
||||||
|
|
||||||
import iso8601
|
import iso8601
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
from ceilometer.compute import discovery
|
from ceilometer.compute import discovery
|
||||||
|
@ -121,8 +120,7 @@ class TestDiscovery(base.BaseTestCase):
|
||||||
self.utc_now)
|
self.utc_now)
|
||||||
self.useFixture(patch_timeutils)
|
self.useFixture(patch_timeutils)
|
||||||
|
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.set_override('host', 'test')
|
self.CONF.set_override('host', 'test')
|
||||||
|
|
||||||
def test_normal_discovery(self):
|
def test_normal_discovery(self):
|
||||||
|
|
|
@ -19,7 +19,6 @@ import sys
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from os_win import exceptions as os_win_exc
|
from os_win import exceptions as os_win_exc
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import units
|
from oslo_utils import units
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -35,8 +34,7 @@ class TestHyperVInspection(base.BaseTestCase):
|
||||||
'_compute_host_max_cpu_clock')
|
'_compute_host_max_cpu_clock')
|
||||||
def setUp(self, mock_compute_host_cpu_clock):
|
def setUp(self, mock_compute_host_cpu_clock):
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self._inspector = hyperv_inspector.HyperVInspector(conf)
|
||||||
self._inspector = hyperv_inspector.HyperVInspector(self.CONF)
|
|
||||||
self._inspector._utils = mock.MagicMock()
|
self._inspector._utils = mock.MagicMock()
|
||||||
|
|
||||||
super(TestHyperVInspection, self).setUp()
|
super(TestHyperVInspection, self).setUp()
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import units
|
from oslo_utils import units
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -40,7 +39,6 @@ class TestLibvirtInspection(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestLibvirtInspection, self).setUp()
|
super(TestLibvirtInspection, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
self.instance = VMInstance()
|
self.instance = VMInstance()
|
||||||
libvirt_inspector.libvirt = mock.Mock()
|
libvirt_inspector.libvirt = mock.Mock()
|
||||||
|
@ -50,7 +48,7 @@ class TestLibvirtInspection(base.BaseTestCase):
|
||||||
utils.libvirt = libvirt_inspector.libvirt
|
utils.libvirt = libvirt_inspector.libvirt
|
||||||
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
|
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
|
||||||
'refresh_libvirt_connection', return_value=None):
|
'refresh_libvirt_connection', return_value=None):
|
||||||
self.inspector = libvirt_inspector.LibvirtInspector(self.CONF)
|
self.inspector = libvirt_inspector.LibvirtInspector(conf)
|
||||||
|
|
||||||
def test_inspect_instance_stats(self):
|
def test_inspect_instance_stats(self):
|
||||||
domain = mock.Mock()
|
domain = mock.Mock()
|
||||||
|
@ -436,7 +434,6 @@ class TestLibvirtInspectionWithError(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestLibvirtInspectionWithError, self).setUp()
|
super(TestLibvirtInspectionWithError, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.useFixture(fixtures.MonkeyPatch(
|
self.useFixture(fixtures.MonkeyPatch(
|
||||||
'ceilometer.compute.virt.libvirt.utils.'
|
'ceilometer.compute.virt.libvirt.utils.'
|
||||||
'refresh_libvirt_connection',
|
'refresh_libvirt_connection',
|
||||||
|
@ -444,7 +441,7 @@ class TestLibvirtInspectionWithError(base.BaseTestCase):
|
||||||
libvirt_inspector.libvirt = mock.Mock()
|
libvirt_inspector.libvirt = mock.Mock()
|
||||||
libvirt_inspector.libvirt.libvirtError = FakeLibvirtError
|
libvirt_inspector.libvirt.libvirtError = FakeLibvirtError
|
||||||
utils.libvirt = libvirt_inspector.libvirt
|
utils.libvirt = libvirt_inspector.libvirt
|
||||||
self.inspector = libvirt_inspector.LibvirtInspector(self.CONF)
|
self.inspector = libvirt_inspector.LibvirtInspector(conf)
|
||||||
|
|
||||||
def test_inspect_unknown_error(self):
|
def test_inspect_unknown_error(self):
|
||||||
self.assertRaises(virt_inspector.InspectorException,
|
self.assertRaises(virt_inspector.InspectorException,
|
||||||
|
|
|
@ -17,7 +17,6 @@ Tests for VMware vSphere inspector.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_vmware import api
|
from oslo_vmware import api
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -31,13 +30,12 @@ class TestVsphereInspection(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVsphereInspection, self).setUp()
|
super(TestVsphereInspection, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
api_session = api.VMwareAPISession("test_server", "test_user",
|
api_session = api.VMwareAPISession("test_server", "test_user",
|
||||||
"test_password", 0, None,
|
"test_password", 0, None,
|
||||||
create_session=False, port=7443)
|
create_session=False, port=7443)
|
||||||
vsphere_inspector.get_api_session = mock.Mock(
|
vsphere_inspector.get_api_session = mock.Mock(
|
||||||
return_value=api_session)
|
return_value=api_session)
|
||||||
self._inspector = vsphere_inspector.VsphereInspector(self.CONF)
|
self._inspector = vsphere_inspector.VsphereInspector(conf)
|
||||||
self._inspector._ops = mock.MagicMock()
|
self._inspector._ops = mock.MagicMock()
|
||||||
|
|
||||||
def test_instance_notFound(self):
|
def test_instance_notFound(self):
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer.compute.virt.xenapi import inspector as xenapi_inspector
|
from ceilometer.compute.virt.xenapi import inspector as xenapi_inspector
|
||||||
|
@ -55,10 +54,9 @@ class TestXenapiInspection(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestXenapiInspection, self).setUp()
|
super(TestXenapiInspection, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
api_session = mock.Mock()
|
api_session = mock.Mock()
|
||||||
xenapi_inspector.get_api_session = mock.Mock(return_value=api_session)
|
xenapi_inspector.get_api_session = mock.Mock(return_value=api_session)
|
||||||
self.inspector = xenapi_inspector.XenapiInspector(self.CONF)
|
self.inspector = xenapi_inspector.XenapiInspector(conf)
|
||||||
|
|
||||||
def test_inspect_instance(self):
|
def test_inspect_instance(self):
|
||||||
fake_instance = {'OS-EXT-SRV-ATTR:instance_name': 'fake_instance_name',
|
fake_instance = {'OS-EXT-SRV-ATTR:instance_name': 'fake_instance_name',
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer.dispatcher import database
|
from ceilometer.dispatcher import database
|
||||||
|
@ -27,8 +26,7 @@ class TestDispatcherDB(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestDispatcherDB, self).setUp()
|
super(TestDispatcherDB, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.set_override('connection', 'sqlite://', group='database')
|
self.CONF.set_override('connection', 'sqlite://', group='database')
|
||||||
self.meter_dispatcher = database.MeterDatabaseDispatcher(self.CONF)
|
self.meter_dispatcher = database.MeterDatabaseDispatcher(self.CONF)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ import logging.handlers
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer.dispatcher import file
|
from ceilometer.dispatcher import file
|
||||||
|
@ -28,8 +27,7 @@ class TestDispatcherFile(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestDispatcherFile, self).setUp()
|
super(TestDispatcherFile, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_file_dispatcher_with_all_config(self):
|
def test_file_dispatcher_with_all_config(self):
|
||||||
# Create a temporaryFile to get a file name
|
# Create a temporaryFile to get a file name
|
||||||
|
|
|
@ -17,7 +17,6 @@ import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
@ -32,8 +31,7 @@ class TestDispatcherHttp(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestDispatcherHttp, self).setUp()
|
super(TestDispatcherHttp, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.msg = {'counter_name': 'test',
|
self.msg = {'counter_name': 'test',
|
||||||
'resource_id': self.id(),
|
'resource_id': self.id(),
|
||||||
'counter_volume': 1,
|
'counter_volume': 1,
|
||||||
|
@ -144,8 +142,7 @@ class TestEventDispatcherHttp(base.BaseTestCase):
|
||||||
"""Test sending events with the http dispatcher"""
|
"""Test sending events with the http dispatcher"""
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestEventDispatcherHttp, self).setUp()
|
super(TestEventDispatcherHttp, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
# repr(uuid.uuid4()) is used in test event creation to avoid an
|
# repr(uuid.uuid4()) is used in test event creation to avoid an
|
||||||
# exception being thrown when the uuid is serialized to JSON
|
# exception being thrown when the uuid is serialized to JSON
|
||||||
|
|
|
@ -17,7 +17,6 @@ import datetime
|
||||||
|
|
||||||
import jsonpath_rw_ext
|
import jsonpath_rw_ext
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ceilometer import declarative
|
from ceilometer import declarative
|
||||||
|
@ -598,8 +597,7 @@ class TestNotificationConverter(ConverterBase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNotificationConverter, self).setUp()
|
super(TestNotificationConverter, self).setUp()
|
||||||
conf = ceilometer_service.prepare_service(argv=[], config_files=[])
|
self.CONF = ceilometer_service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.valid_event_def1 = [{
|
self.valid_event_def1 = [{
|
||||||
'event_type': 'compute.instance.create.*',
|
'event_type': 'compute.instance.create.*',
|
||||||
'traits': {
|
'traits': {
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
"""Tests for Ceilometer notify daemon."""
|
"""Tests for Ceilometer notify daemon."""
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging
|
import oslo_messaging
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
@ -124,8 +123,7 @@ class TestEventEndpoint(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestEventEndpoint, self).setUp()
|
super(TestEventEndpoint, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.set_override("connection", "log://", group='database')
|
self.CONF.set_override("connection", "log://", group='database')
|
||||||
self.setup_messaging(self.CONF)
|
self.setup_messaging(self.CONF)
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@ import mock
|
||||||
import six
|
import six
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -110,8 +109,7 @@ class TestGenericPollsters(test_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestGenericPollsters, self).setUp()
|
super(TestGenericPollsters, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.conf = service.prepare_service([], [])
|
||||||
self.conf = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.resources = ["snmp://test", "snmp://test2"]
|
self.resources = ["snmp://test", "snmp://test2"]
|
||||||
self.useFixture(mockpatch.Patch(
|
self.useFixture(mockpatch.Patch(
|
||||||
'ceilometer.hardware.inspector.get_inspector',
|
'ceilometer.hardware.inspector.get_inspector',
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
|
|
||||||
from ceilometer.agent import manager
|
from ceilometer.agent import manager
|
||||||
from ceilometer.image import glance
|
from ceilometer.image import glance
|
||||||
|
@ -89,9 +88,8 @@ class TestImagePollsterPageSize(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImagePollsterPageSize, self).setUp()
|
super(TestImagePollsterPageSize, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.manager = manager.AgentManager(0, conf)
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.pollster = glance.ImageSizePollster(conf)
|
||||||
self.pollster = glance.ImageSizePollster(self.CONF)
|
|
||||||
|
|
||||||
def test_image_pollster(self):
|
def test_image_pollster(self):
|
||||||
image_samples = list(
|
image_samples = list(
|
||||||
|
|
|
@ -16,7 +16,6 @@ import abc
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
@ -36,11 +35,10 @@ class _Base(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_Base, self).setUp()
|
super(_Base, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.init_test_engine()
|
self.init_test_engine()
|
||||||
with mock.patch.object(node_manager.NodeManager, '__new__',
|
with mock.patch.object(node_manager.NodeManager, '__new__',
|
||||||
side_effect=self._new_no_singleton):
|
side_effect=self._new_no_singleton):
|
||||||
self.nm = node_manager.NodeManager(self.CONF)
|
self.nm = node_manager.NodeManager(conf)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _new_no_singleton(cls, *args, **kwargs):
|
def _new_no_singleton(cls, *args, **kwargs):
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
@ -29,8 +28,7 @@ class TestPollsterBase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestPollsterBase, self).setUp()
|
super(TestPollsterBase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def fake_data(self):
|
def fake_data(self):
|
||||||
"""Fake data used for test."""
|
"""Fake data used for test."""
|
||||||
|
|
|
@ -18,7 +18,6 @@ import os
|
||||||
import six
|
import six
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
|
|
||||||
|
@ -284,8 +283,7 @@ class TestMeterProcessing(test.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestMeterProcessing, self).setUp()
|
super(TestMeterProcessing, self).setUp()
|
||||||
conf = ceilometer_service.prepare_service(argv=[], config_files=[])
|
self.CONF = ceilometer_service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.handler = notifications.ProcessMeterNotifications(
|
self.handler = notifications.ProcessMeterNotifications(
|
||||||
mock.Mock(conf=self.CONF))
|
mock.Mock(conf=self.CONF))
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class _BaseTestFWPollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_BaseTestFWPollster, self).setUp()
|
super(_BaseTestFWPollster, self).setUp()
|
||||||
self.addCleanup(mock.patch.stopall)
|
self.addCleanup(mock.patch.stopall)
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
plugin_base._get_keystone = mock.Mock()
|
plugin_base._get_keystone = mock.Mock()
|
||||||
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -32,8 +31,7 @@ class _BaseTestLBPollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_BaseTestLBPollster, self).setUp()
|
super(_BaseTestLBPollster, self).setUp()
|
||||||
self.addCleanup(mock.patch.stopall)
|
self.addCleanup(mock.patch.stopall)
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
self.CONF.set_override('neutron_lbaas_version',
|
self.CONF.set_override('neutron_lbaas_version',
|
||||||
'v1',
|
'v1',
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class _BaseTestLBPollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_BaseTestLBPollster, self).setUp()
|
super(_BaseTestLBPollster, self).setUp()
|
||||||
self.addCleanup(mock.patch.stopall)
|
self.addCleanup(mock.patch.stopall)
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
plugin_base._get_keystone = mock.Mock()
|
plugin_base._get_keystone = mock.Mock()
|
||||||
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class _BaseTestVPNPollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_BaseTestVPNPollster, self).setUp()
|
super(_BaseTestVPNPollster, self).setUp()
|
||||||
self.addCleanup(mock.patch.stopall)
|
self.addCleanup(mock.patch.stopall)
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
plugin_base._get_keystone = mock.Mock()
|
plugin_base._get_keystone = mock.Mock()
|
||||||
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
catalog = (plugin_base._get_keystone.session.auth.get_access.
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer import service
|
from ceilometer import service
|
||||||
|
@ -22,8 +21,7 @@ from ceilometer import service
|
||||||
class _PollsterTestBase(base.BaseTestCase):
|
class _PollsterTestBase(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_PollsterTestBase, self).setUp()
|
super(_PollsterTestBase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def _test_pollster(self, pollster_class, meter_name,
|
def _test_pollster(self, pollster_class, meter_name,
|
||||||
meter_type, meter_unit):
|
meter_type, meter_unit):
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class TestOpencontrailDriver(base.BaseTestCase):
|
||||||
return_value=self.fake_ports())
|
return_value=self.fake_ports())
|
||||||
self.nc_ports.start()
|
self.nc_ports.start()
|
||||||
|
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.driver = driver.OpencontrailDriver(self.CONF)
|
self.driver = driver.OpencontrailDriver(self.CONF)
|
||||||
self.parse_url = urlparse.ParseResult('opencontrail',
|
self.parse_url = urlparse.ParseResult('opencontrail',
|
||||||
'127.0.0.1:8143',
|
'127.0.0.1:8143',
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import six
|
import six
|
||||||
from six import moves
|
from six import moves
|
||||||
|
@ -79,8 +78,7 @@ class _Base(base.BaseTestCase):
|
||||||
super(_Base, self).setUp()
|
super(_Base, self).setUp()
|
||||||
self.addCleanup(mock.patch.stopall)
|
self.addCleanup(mock.patch.stopall)
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.driver = driver.OpenDayLightDriver(conf)
|
||||||
self.driver = driver.OpenDayLightDriver(self.CONF)
|
|
||||||
|
|
||||||
self.get_flow_statistics = mock.patch(
|
self.get_flow_statistics = mock.patch(
|
||||||
'ceilometer.network.statistics.opendaylight.client.'
|
'ceilometer.network.statistics.opendaylight.client.'
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -29,8 +28,7 @@ class TestBase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestBase, self).setUp()
|
super(TestBase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_subclass_ok(self):
|
def test_subclass_ok(self):
|
||||||
|
|
||||||
|
@ -71,8 +69,7 @@ class TestBaseGetSamples(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestBaseGetSamples, self).setUp()
|
super(TestBaseGetSamples, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
class FakePollster(statistics._Base):
|
class FakePollster(statistics._Base):
|
||||||
meter_name = 'foo'
|
meter_name = 'foo'
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class _BaseTestFloatingIPPollster(base.BaseTestCase):
|
||||||
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(_BaseTestFloatingIPPollster, self).setUp()
|
super(_BaseTestFloatingIPPollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.manager = manager.AgentManager(0, self.CONF)
|
||||||
plugin_base._get_keystone = mock.Mock()
|
plugin_base._get_keystone = mock.Mock()
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ import collections
|
||||||
|
|
||||||
from keystoneauth1 import exceptions
|
from keystoneauth1 import exceptions
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
import testscenarios.testcase
|
import testscenarios.testcase
|
||||||
|
@ -90,11 +89,10 @@ class TestRgwPollster(testscenarios.testcase.WithScenarios,
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestRgwPollster, self).setUp()
|
super(TestRgwPollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
conf.set_override('radosgw', 'object-store',
|
||||||
self.CONF.set_override('radosgw', 'object-store',
|
|
||||||
group='service_types')
|
group='service_types')
|
||||||
self.pollster = self.factory(self.CONF)
|
self.pollster = self.factory(conf)
|
||||||
self.manager = TestManager(0, self.CONF)
|
self.manager = TestManager(0, conf)
|
||||||
|
|
||||||
if self.pollster.CACHE_KEY_METHOD == 'rgw.get_bucket':
|
if self.pollster.CACHE_KEY_METHOD == 'rgw.get_bucket':
|
||||||
self.ACCOUNTS = GET_BUCKETS
|
self.ACCOUNTS = GET_BUCKETS
|
||||||
|
|
|
@ -16,7 +16,6 @@ import collections
|
||||||
|
|
||||||
from keystoneauth1 import exceptions
|
from keystoneauth1 import exceptions
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
from swiftclient import client as swift_client
|
from swiftclient import client as swift_client
|
||||||
|
@ -106,8 +105,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios,
|
||||||
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestSwiftPollster, self).setUp()
|
super(TestSwiftPollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.pollster = self.factory(self.CONF)
|
self.pollster = self.factory(self.CONF)
|
||||||
self.manager = TestManager(0, self.CONF)
|
self.manager = TestManager(0, self.CONF)
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ import traceback
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
import six
|
import six
|
||||||
|
@ -133,8 +132,7 @@ class BasePipelineTestCase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(BasePipelineTestCase, self).setUp()
|
super(BasePipelineTestCase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
self.test_counter = sample.Sample(
|
self.test_counter = sample.Sample(
|
||||||
name='a',
|
name='a',
|
||||||
|
|
|
@ -20,7 +20,6 @@ import logging.handlers
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import netutils
|
from oslo_utils import netutils
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -69,8 +68,7 @@ class TestFilePublisher(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestFilePublisher, self).setUp()
|
super(TestFilePublisher, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_file_publisher_maxbytes(self):
|
def test_file_publisher_maxbytes(self):
|
||||||
# Test valid configurations
|
# Test valid configurations
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import requests
|
import requests
|
||||||
from six.moves.urllib import parse as urlparse
|
from six.moves.urllib import parse as urlparse
|
||||||
|
@ -76,8 +75,7 @@ class TestHttpPublisher(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestHttpPublisher, self).setUp()
|
super(TestHttpPublisher, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_http_publisher_config(self):
|
def test_http_publisher_config(self):
|
||||||
"""Test publisher config parameters."""
|
"""Test publisher config parameters."""
|
||||||
|
|
|
@ -18,7 +18,6 @@ import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import netutils
|
from oslo_utils import netutils
|
||||||
|
|
||||||
from ceilometer.event.storage import models as event
|
from ceilometer.event.storage import models as event
|
||||||
|
@ -99,8 +98,7 @@ class TestKafkaPublisher(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestKafkaPublisher, self).setUp()
|
super(TestKafkaPublisher, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_publish(self):
|
def test_publish(self):
|
||||||
publisher = kafka.KafkaBrokerPublisher(self.CONF, netutils.urlsplit(
|
publisher = kafka.KafkaBrokerPublisher(self.CONF, netutils.urlsplit(
|
||||||
|
|
|
@ -18,7 +18,6 @@ import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import netutils
|
from oslo_utils import netutils
|
||||||
import testscenarios.testcase
|
import testscenarios.testcase
|
||||||
|
|
||||||
|
@ -98,8 +97,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(BasePublisherTestCase, self).setUp()
|
super(BasePublisherTestCase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.setup_messaging(self.CONF)
|
self.setup_messaging(self.CONF)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ import socket
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import msgpack
|
import msgpack
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslo_utils import netutils
|
from oslo_utils import netutils
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -111,8 +110,7 @@ class TestUDPPublisher(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestUDPPublisher, self).setUp()
|
super(TestUDPPublisher, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.CONF.publisher.telemetry_secret = 'not-so-secret'
|
self.CONF.publisher.telemetry_secret = 'not-so-secret'
|
||||||
|
|
||||||
def _check_udp_socket(self, url, expected_addr_family):
|
def _check_udp_socket(self, url, expected_addr_family):
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
"""Tests for ceilometer/storage/
|
"""Tests for ceilometer/storage/
|
||||||
"""
|
"""
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer import service
|
from ceilometer import service
|
||||||
|
@ -29,8 +28,7 @@ import six
|
||||||
class EngineTest(base.BaseTestCase):
|
class EngineTest(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(EngineTest, self).setUp()
|
super(EngineTest, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_get_connection(self):
|
def test_get_connection(self):
|
||||||
engine = storage.get_connection(self.CONF,
|
engine = storage.get_connection(self.CONF,
|
||||||
|
@ -48,8 +46,7 @@ class EngineTest(base.BaseTestCase):
|
||||||
class ConnectionRetryTest(base.BaseTestCase):
|
class ConnectionRetryTest(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(ConnectionRetryTest, self).setUp()
|
super(ConnectionRetryTest, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_retries(self):
|
def test_retries(self):
|
||||||
with mock.patch.object(storage, 'get_connection') as retries:
|
with mock.patch.object(storage, 'get_connection') as retries:
|
||||||
|
@ -66,8 +63,7 @@ class ConnectionRetryTest(base.BaseTestCase):
|
||||||
class ConnectionConfigTest(base.BaseTestCase):
|
class ConnectionConfigTest(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(ConnectionConfigTest, self).setUp()
|
super(ConnectionConfigTest, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
def test_only_default_url(self):
|
def test_only_default_url(self):
|
||||||
self.CONF.set_override("connection", "log://", group="database")
|
self.CONF.set_override("connection", "log://", group="database")
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import tooz.coordination
|
import tooz.coordination
|
||||||
from tooz import hashring
|
from tooz import hashring
|
||||||
|
|
||||||
|
@ -121,8 +120,7 @@ class TestPartitioning(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestPartitioning, self).setUp()
|
super(TestPartitioning, self).setUp()
|
||||||
self.CONF = self.useFixture(fixture_config.Config(
|
self.CONF = service.prepare_service([], [])
|
||||||
service.prepare_service([], []))).conf
|
|
||||||
self.str_handler = MockLoggingHandler()
|
self.str_handler = MockLoggingHandler()
|
||||||
coordination.LOG.logger.addHandler(self.str_handler)
|
coordination.LOG.logger.addHandler(self.str_handler)
|
||||||
self.shared_storage = {}
|
self.shared_storage = {}
|
||||||
|
|
|
@ -16,7 +16,6 @@ import traceback
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging
|
import oslo_messaging
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -46,8 +45,7 @@ class EventPipelineTestCase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(EventPipelineTestCase, self).setUp()
|
super(EventPipelineTestCase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
self.p_type = pipeline.EVENT_TYPE
|
self.p_type = pipeline.EVENT_TYPE
|
||||||
self.transformer_manager = None
|
self.transformer_manager = None
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
import oslo_messaging.conffixture
|
import oslo_messaging.conffixture
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
|
@ -23,8 +22,7 @@ from ceilometer import service
|
||||||
class MessagingTests(base.BaseTestCase):
|
class MessagingTests(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(MessagingTests, self).setUp()
|
super(MessagingTests, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.useFixture(oslo_messaging.conffixture.ConfFixture(self.CONF))
|
self.useFixture(oslo_messaging.conffixture.ConfFixture(self.CONF))
|
||||||
|
|
||||||
def test_get_transport_invalid_url(self):
|
def test_get_transport_invalid_url(self):
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
|
|
||||||
from ceilometer import middleware
|
from ceilometer import middleware
|
||||||
from ceilometer import service
|
from ceilometer import service
|
||||||
|
@ -70,8 +69,7 @@ class TestNotifications(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNotifications, self).setUp()
|
super(TestNotifications, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.setup_messaging(self.CONF)
|
self.setup_messaging(self.CONF)
|
||||||
|
|
||||||
def test_process_request_notification(self):
|
def test_process_request_notification(self):
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer import neutron_client
|
from ceilometer import neutron_client
|
||||||
|
@ -25,8 +24,7 @@ class TestNeutronClient(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNeutronClient, self).setUp()
|
super(TestNeutronClient, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self.nc = neutron_client.Client(self.CONF)
|
self.nc = neutron_client.Client(self.CONF)
|
||||||
self.nc.lb_version = 'v1'
|
self.nc.lb_version = 'v1'
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from neutronclient.v2_0 import client
|
from neutronclient.v2_0 import client
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
|
|
||||||
from ceilometer import neutron_client
|
from ceilometer import neutron_client
|
||||||
|
@ -25,8 +24,7 @@ class TestNeutronClientLBaaSV2(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNeutronClientLBaaSV2, self).setUp()
|
super(TestNeutronClientLBaaSV2, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.nc = neutron_client.Client(conf)
|
||||||
self.nc = neutron_client.Client(self.CONF)
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def fake_list_lbaas_pools():
|
def fake_list_lbaas_pools():
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
import glanceclient
|
import glanceclient
|
||||||
import mock
|
import mock
|
||||||
import novaclient
|
import novaclient
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
|
@ -27,8 +26,7 @@ class TestNovaClient(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestNovaClient, self).setUp()
|
super(TestNovaClient, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
self._flavors_count = 0
|
self._flavors_count = 0
|
||||||
self._images_count = 0
|
self._images_count = 0
|
||||||
self.nv = nova_client.Client(self.CONF)
|
self.nv = nova_client.Client(self.CONF)
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
@ -31,8 +30,7 @@ class PollingTestCase(base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(PollingTestCase, self).setUp()
|
super(PollingTestCase, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
self.CONF = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
|
||||||
|
|
||||||
self.tmp_cfg = tempfile.NamedTemporaryFile(mode='w', delete=False)
|
self.tmp_cfg = tempfile.NamedTemporaryFile(mode='w', delete=False)
|
||||||
self.poll_cfg = {'sources': [{'name': 'test_source',
|
self.poll_cfg = {'sources': [{'name': 'test_source',
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import fixture as fixture_config
|
|
||||||
|
|
||||||
from ceilometer.agent import manager
|
from ceilometer.agent import manager
|
||||||
from ceilometer import service
|
from ceilometer import service
|
||||||
|
@ -109,9 +108,8 @@ class TestVolumeSizePollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVolumeSizePollster, self).setUp()
|
super(TestVolumeSizePollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.manager = manager.AgentManager(0, conf)
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.pollster = cinder.VolumeSizePollster(conf)
|
||||||
self.pollster = cinder.VolumeSizePollster(self.CONF)
|
|
||||||
|
|
||||||
def test_volume_size_pollster(self):
|
def test_volume_size_pollster(self):
|
||||||
volume_size_samples = list(
|
volume_size_samples = list(
|
||||||
|
@ -130,9 +128,8 @@ class TestVolumeSnapshotSizePollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVolumeSnapshotSizePollster, self).setUp()
|
super(TestVolumeSnapshotSizePollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.manager = manager.AgentManager(0, conf)
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.pollster = cinder.VolumeSnapshotSize(conf)
|
||||||
self.pollster = cinder.VolumeSnapshotSize(self.CONF)
|
|
||||||
|
|
||||||
def test_volume_snapshot_size_pollster(self):
|
def test_volume_snapshot_size_pollster(self):
|
||||||
volume_snapshot_size_samples = list(
|
volume_snapshot_size_samples = list(
|
||||||
|
@ -153,9 +150,8 @@ class TestVolumeBackupSizePollster(base.BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVolumeBackupSizePollster, self).setUp()
|
super(TestVolumeBackupSizePollster, self).setUp()
|
||||||
conf = service.prepare_service([], [])
|
conf = service.prepare_service([], [])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.manager = manager.AgentManager(0, conf)
|
||||||
self.manager = manager.AgentManager(0, self.CONF)
|
self.pollster = cinder.VolumeBackupSize(conf)
|
||||||
self.pollster = cinder.VolumeBackupSize(self.CONF)
|
|
||||||
|
|
||||||
def test_volume_backup_size_pollster(self):
|
def test_volume_backup_size_pollster(self):
|
||||||
volume_backup_size_samples = list(
|
volume_backup_size_samples = list(
|
||||||
|
|
Loading…
Reference in New Issue