diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-08 15:42:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-08 15:42:22 +0000 |
| commit | 37b5d0d45eedd5917c1c9d343ba0fcac27249417 (patch) | |
| tree | 05ab72b7a3d6d15c6bb8c1fc089aaabb7ed98f3a /openstackclient/tests | |
| parent | dcb2de9db2ea9ff3b4673f9250b593c2aca3c241 (diff) | |
| parent | f4d3810c3e978382bf80e59d5d9a5dcd2485f56c (diff) | |
| download | python-openstackclient-37b5d0d45eedd5917c1c9d343ba0fcac27249417.tar.gz | |
Merge "command list: Move network meter appropriately"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/functional/network/v2/test_network_meter.py (renamed from openstackclient/tests/functional/network/v2/test_meter.py) | 0 | ||||
| -rw-r--r-- | openstackclient/tests/unit/network/v2/test_network_meter.py (renamed from openstackclient/tests/unit/network/v2/test_meter.py) | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/tests/functional/network/v2/test_meter.py b/openstackclient/tests/functional/network/v2/test_network_meter.py index 7dce34e7..7dce34e7 100644 --- a/openstackclient/tests/functional/network/v2/test_meter.py +++ b/openstackclient/tests/functional/network/v2/test_network_meter.py diff --git a/openstackclient/tests/unit/network/v2/test_meter.py b/openstackclient/tests/unit/network/v2/test_network_meter.py index b393f7fa..2b96f7a6 100644 --- a/openstackclient/tests/unit/network/v2/test_meter.py +++ b/openstackclient/tests/unit/network/v2/test_network_meter.py @@ -18,7 +18,7 @@ from mock import call from osc_lib import exceptions -from openstackclient.network.v2 import meter +from openstackclient.network.v2 import network_meter from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3 from openstackclient.tests.unit.network.v2 import fakes as network_fakes from openstackclient.tests.unit import utils as tests_utils @@ -62,7 +62,7 @@ class TestCreateMeter(TestMeter): self.network.create_metering_label = mock.Mock( return_value=self.new_meter) self.projects_mock.get.return_value = self.project - self.cmd = meter.CreateMeter(self.app, self.namespace) + self.cmd = network_meter.CreateMeter(self.app, self.namespace) def test_create_no_options(self): arglist = [] @@ -134,7 +134,7 @@ class TestDeleteMeter(TestMeter): meter=self.meter_list ) - self.cmd = meter.DeleteMeter(self.app, self.namespace) + self.cmd = network_meter.DeleteMeter(self.app, self.namespace) def test_delete_one_meter(self): arglist = [ @@ -235,7 +235,7 @@ class TestListMeter(TestMeter): return_value=self.meter_list ) - self.cmd = meter.ListMeter(self.app, self.namespace) + self.cmd = network_meter.ListMeter(self.app, self.namespace) def test_meter_list(self): arglist = [] @@ -274,7 +274,7 @@ class TestShowMeter(TestMeter): def setUp(self): super(TestShowMeter, self).setUp() - self.cmd = meter.ShowMeter(self.app, self.namespace) + self.cmd = network_meter.ShowMeter(self.app, self.namespace) self.network.find_metering_label = \ mock.Mock(return_value=self.new_meter) |