Skip to content

Commit cbd4f67

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Add testcases for compute.v2.service"
2 parents 12cc634 + eb86729 commit cbd4f67

2 files changed

Lines changed: 109 additions & 5 deletions

File tree

openstackclient/tests/compute/v2/fakes.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
from openstackclient.tests.volume.v2 import fakes as volume_fakes
2626

2727

28-
service_id = '1'
29-
3028
extension_name = 'Multinic'
3129
extension_namespace = 'http://docs.openstack.org/compute/ext/'\
3230
'multinic/api/v1.1'
@@ -80,6 +78,15 @@
8078

8179
block_device_mapping = 'vda=' + volume_fakes.volume_name + ':::0'
8280

81+
service_host = 'host_test'
82+
service_binary = 'compute_test'
83+
service_status = 'enabled'
84+
SERVICE = {
85+
'host': service_host,
86+
'binary': service_binary,
87+
'status': service_status,
88+
}
89+
8390

8491
class FakeComputev2Client(object):
8592
def __init__(self, **kwargs):

openstackclient/tests/compute/v2/test_service.py

Lines changed: 100 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
# under the License.
1414
#
1515

16+
import copy
17+
1618
from openstackclient.compute.v2 import service
1719
from openstackclient.tests.compute.v2 import fakes as compute_fakes
20+
from openstackclient.tests import fakes
1821

1922

2023
class TestService(compute_fakes.TestComputev2):
@@ -39,16 +42,110 @@ def setUp(self):
3942

4043
def test_service_delete_no_options(self):
4144
arglist = [
42-
compute_fakes.service_id,
45+
compute_fakes.service_binary,
4346
]
4447
verifylist = [
45-
('service', compute_fakes.service_id),
48+
('service', compute_fakes.service_binary),
4649
]
4750
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
4851

4952
# DisplayCommandBase.take_action() returns two tuples
5053
self.cmd.take_action(parsed_args)
5154

5255
self.service_mock.delete.assert_called_with(
53-
compute_fakes.service_id,
56+
compute_fakes.service_binary,
57+
)
58+
59+
60+
class TestServiceList(TestService):
61+
62+
def setUp(self):
63+
super(TestServiceList, self).setUp()
64+
65+
self.service_mock.list.return_value = [fakes.FakeResource(
66+
None,
67+
copy.deepcopy(compute_fakes.SERVICE),
68+
loaded=True,
69+
)]
70+
71+
# Get the command object to test
72+
self.cmd = service.ListService(self.app, None)
73+
74+
def test_service_list(self):
75+
arglist = [
76+
'--host', compute_fakes.service_host,
77+
'--service', compute_fakes.service_binary,
78+
]
79+
verifylist = [
80+
('host', compute_fakes.service_host),
81+
('service', compute_fakes.service_binary),
82+
]
83+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
84+
85+
# DisplayCommandBase.take_action() returns two tuples
86+
self.cmd.take_action(parsed_args)
87+
88+
self.service_mock.list.assert_called_with(
89+
compute_fakes.service_host,
90+
compute_fakes.service_binary,
91+
)
92+
93+
94+
class TestServiceSet(TestService):
95+
96+
def setUp(self):
97+
super(TestServiceSet, self).setUp()
98+
99+
self.service_mock.enable.return_value = [fakes.FakeResource(
100+
None,
101+
copy.deepcopy(compute_fakes.SERVICE),
102+
loaded=True,
103+
)]
104+
105+
self.service_mock.disable.return_value = [fakes.FakeResource(
106+
None,
107+
copy.deepcopy(compute_fakes.SERVICE),
108+
loaded=True,
109+
)]
110+
111+
self.cmd = service.SetService(self.app, None)
112+
113+
def test_service_set_enable(self):
114+
arglist = [
115+
compute_fakes.service_host,
116+
compute_fakes.service_binary,
117+
'--enable',
118+
]
119+
verifylist = [
120+
('host', compute_fakes.service_host),
121+
('service', compute_fakes.service_binary),
122+
('enabled', True),
123+
]
124+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
125+
126+
self.cmd.take_action(parsed_args)
127+
128+
self.service_mock.enable.assert_called_with(
129+
compute_fakes.service_host,
130+
compute_fakes.service_binary,
131+
)
132+
133+
def test_service_set_disable(self):
134+
arglist = [
135+
compute_fakes.service_host,
136+
compute_fakes.service_binary,
137+
'--disable',
138+
]
139+
verifylist = [
140+
('host', compute_fakes.service_host),
141+
('service', compute_fakes.service_binary),
142+
('enabled', False),
143+
]
144+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
145+
146+
self.cmd.take_action(parsed_args)
147+
148+
self.service_mock.disable.assert_called_with(
149+
compute_fakes.service_host,
150+
compute_fakes.service_binary,
54151
)

0 commit comments

Comments
 (0)