Skip to content

Commit f8f2f4d

Browse files
committed
Use fake server name instead of id when testing "server_name" param.
"server create" command takes a server name parameter. The server id is generated by openstack. When we intended to pass a server name to the unit tests of "server create" command, we passed server id. It won't be any problem because the fake server id is also a string, but we should pass a fake server name because we have a string to fake one. Change-Id: I9944f0ea2a6c457e4fad8215a54778bca08965ab
1 parent 8a1fb85 commit f8f2f4d

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

openstackclient/tests/compute/v2/test_server.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ def setUp(self):
8585

8686
def test_server_create_no_options(self):
8787
arglist = [
88-
compute_fakes.server_id,
88+
compute_fakes.server_name,
8989
]
9090
verifylist = [
91-
('server_name', compute_fakes.server_id),
91+
('server_name', compute_fakes.server_name),
9292
]
9393
try:
9494
# Missing required args should bail here
@@ -100,13 +100,13 @@ def test_server_create_minimal(self):
100100
arglist = [
101101
'--image', 'image1',
102102
'--flavor', 'flavor1',
103-
compute_fakes.server_id,
103+
compute_fakes.server_name,
104104
]
105105
verifylist = [
106106
('image', 'image1'),
107107
('flavor', 'flavor1'),
108108
('config_drive', False),
109-
('server_name', compute_fakes.server_id),
109+
('server_name', compute_fakes.server_name),
110110
]
111111
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
112112

@@ -131,7 +131,7 @@ def test_server_create_minimal(self):
131131
)
132132
# ServerManager.create(name, image, flavor, **kwargs)
133133
self.servers_mock.create.assert_called_with(
134-
compute_fakes.server_id,
134+
compute_fakes.server_name,
135135
self.image,
136136
self.flavor,
137137
**kwargs
@@ -154,14 +154,14 @@ def test_server_create_with_network(self):
154154
'--flavor', 'flavor1',
155155
'--nic', 'net-id=net1',
156156
'--nic', 'port-id=port1',
157-
compute_fakes.server_id,
157+
compute_fakes.server_name,
158158
]
159159
verifylist = [
160160
('image', 'image1'),
161161
('flavor', 'flavor1'),
162162
('nic', ['net-id=net1', 'port-id=port1']),
163163
('config_drive', False),
164-
('server_name', compute_fakes.server_id),
164+
('server_name', compute_fakes.server_name),
165165
]
166166
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
167167

@@ -207,7 +207,7 @@ def test_server_create_with_network(self):
207207
)
208208
# ServerManager.create(name, image, flavor, **kwargs)
209209
self.servers_mock.create.assert_called_with(
210-
compute_fakes.server_id,
210+
compute_fakes.server_name,
211211
self.image,
212212
self.flavor,
213213
**kwargs
@@ -234,14 +234,14 @@ def test_server_create_userdata(self, mock_open):
234234
'--image', 'image1',
235235
'--flavor', 'flavor1',
236236
'--user-data', 'userdata.sh',
237-
compute_fakes.server_id,
237+
compute_fakes.server_name,
238238
]
239239
verifylist = [
240240
('image', 'image1'),
241241
('flavor', 'flavor1'),
242242
('user_data', 'userdata.sh'),
243243
('config_drive', False),
244-
('server_name', compute_fakes.server_id),
244+
('server_name', compute_fakes.server_name),
245245
]
246246
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
247247

@@ -272,7 +272,7 @@ def test_server_create_userdata(self, mock_open):
272272
)
273273
# ServerManager.create(name, image, flavor, **kwargs)
274274
self.servers_mock.create.assert_called_with(
275-
compute_fakes.server_id,
275+
compute_fakes.server_name,
276276
self.image,
277277
self.flavor,
278278
**kwargs

0 commit comments

Comments
 (0)