diff options
| -rw-r--r-- | doc/source/command-objects/network-meter.rst (renamed from doc/source/command-objects/meter.rst) | 0 | ||||
| -rw-r--r-- | openstackclient/network/v2/network_meter.py (renamed from openstackclient/network/v2/meter.py) | 0 | ||||
| -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 | ||||
| -rw-r--r-- | setup.cfg | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/source/command-objects/meter.rst b/doc/source/command-objects/network-meter.rst index 6077ce92..6077ce92 100644 --- a/doc/source/command-objects/meter.rst +++ b/doc/source/command-objects/network-meter.rst diff --git a/openstackclient/network/v2/meter.py b/openstackclient/network/v2/network_meter.py index df0e1da1..df0e1da1 100644 --- a/openstackclient/network/v2/meter.py +++ b/openstackclient/network/v2/network_meter.py 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) @@ -378,10 +378,10 @@ openstack.network.v2 = network_set = openstackclient.network.v2.network:SetNetwork network_show = openstackclient.network.v2.network:ShowNetwork - network_meter_create = openstackclient.network.v2.meter:CreateMeter - network_meter_delete = openstackclient.network.v2.meter:DeleteMeter - network_meter_list = openstackclient.network.v2.meter:ListMeter - network_meter_show = openstackclient.network.v2.meter:ShowMeter + network_meter_create = openstackclient.network.v2.network_meter:CreateMeter + network_meter_delete = openstackclient.network.v2.network_meter:DeleteMeter + network_meter_list = openstackclient.network.v2.network_meter:ListMeter + network_meter_show = openstackclient.network.v2.network_meter:ShowMeter network_meter_rule_create = openstackclient.network.v2.network_meter_rule:CreateMeterRule network_meter_rule_delete = openstackclient.network.v2.network_meter_rule:DeleteMeterRule |