openstack/python-openstackclient
Code Issues Proposed changes

Merge "command list: Move network meter appropriately"

Browse Source
This commit is contained in:
Jenkins 2017-03-08 15:42:22 +00:00 committed by Gerrit Code Review
commit 37b5d0d45e
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
doc/source/command-objects/meter.rst → doc/source/command-objects/network-meter.rst
View File

0
openstackclient/network/v2/meter.py → openstackclient/network/v2/network_meter.py
View File

0
openstackclient/tests/functional/network/v2/test_meter.py → openstackclient/tests/functional/network/v2/test_network_meter.py
View File

10
openstackclient/tests/unit/network/v2/test_meter.py → openstackclient/tests/unit/network/v2/test_network_meter.py
View File

@ -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)

8
setup.cfg
View File

@ -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