Skip to content

Commit f792b88

Browse files
stephenfinstephenfin
committed
compute: Replace remaining use of cinderclient
Change-Id: If9933a44ad54d17abdb63f4a83e9792db345e23c Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 56e10cd commit f792b88

2 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎openstackclient/compute/v2/server.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ def _show_progress(progress: int | None) -> None:
15961596
self.app.stdout.flush()
15971597

15981598
compute_client = self.app.client_manager.compute
1599-
volume_client = self.app.client_manager.volume
1599+
volume_client = self.app.client_manager.sdk_connection.volume
16001600
image_client = self.app.client_manager.image
16011601

16021602
# Lookup parsed_args.image
@@ -1669,9 +1669,9 @@ def _match_image(image_api: Any, wanted_properties: Any) -> Any:
16691669
msg = _('--volume is not allowed with --boot-from-volume')
16701670
raise exceptions.CommandError(msg)
16711671

1672-
volume = utils.find_resource(
1673-
volume_client.volumes,
1672+
volume = volume_client.find_volume(
16741673
parsed_args.volume,
1674+
ignore_missing=False,
16751675
).id
16761676

16771677
snapshot = None
@@ -1681,9 +1681,9 @@ def _match_image(image_api: Any, wanted_properties: Any) -> Any:
16811681
msg = _('--snapshot is not allowed with --boot-from-volume')
16821682
raise exceptions.CommandError(msg)
16831683

1684-
snapshot = utils.find_resource(
1685-
volume_client.volume_snapshots,
1684+
snapshot = volume_client.find_snapshot(
16861685
parsed_args.snapshot,
1686+
ignore_missing=False,
16871687
).id
16881688

16891689
flavor = compute_client.find_flavor(
@@ -1823,15 +1823,15 @@ def _match_image(image_api: Any, wanted_properties: Any) -> Any:
18231823
# The 'uuid' field isn't necessarily a UUID yet; let's validate it
18241824
# just in case
18251825
if mapping['source_type'] == 'volume':
1826-
volume_id = utils.find_resource(
1827-
volume_client.volumes,
1826+
volume_id = volume_client.find_volume(
18281827
mapping['uuid'],
1828+
ignore_missing=False,
18291829
).id
18301830
mapping['uuid'] = volume_id
18311831
elif mapping['source_type'] == 'snapshot':
1832-
snapshot_id = utils.find_resource(
1833-
volume_client.volume_snapshots,
1832+
snapshot_id = volume_client.find_snapshot(
18341833
mapping['uuid'],
1834+
ignore_missing=False,
18351835
).id
18361836
mapping['uuid'] = snapshot_id
18371837
elif mapping['source_type'] == 'image':

‎openstackclient/tests/unit/compute/v2/test_server.py‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import uuid
2121

2222
import iso8601
23+
from openstack.block_storage.v3 import snapshot as _snapshot
24+
from openstack.block_storage.v3 import volume as _volume
2325
from openstack.compute.v2 import flavor as _flavor
2426
from openstack.compute.v2 import server as _server
2527
from openstack.compute.v2 import server_group as _server_group
@@ -646,7 +648,7 @@ def setUp(self):
646648
self.server = compute_fakes.create_one_server()
647649
self.compute_client.find_server.return_value = self.server
648650

649-
self.volume = volume_fakes.create_one_sdk_volume()
651+
self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
650652
self.volume_sdk_client.find_volume.return_value = self.volume
651653

652654
attrs = {
@@ -1240,8 +1242,8 @@ def setUp(self):
12401242
self.compute_client.create_server.return_value = self.server
12411243
self.compute_client.get_server.return_value = self.server
12421244

1243-
self.volume = volume_fakes.create_one_volume()
1244-
self.snapshot = volume_fakes.create_one_snapshot()
1245+
self.volume = sdk_fakes.generate_fake_resource(_volume.Volume)
1246+
self.snapshot = sdk_fakes.generate_fake_resource(_snapshot.Snapshot)
12451247

12461248
# Get the command object to test
12471249
self.cmd = server.CreateServer(self.app, None)
@@ -2402,7 +2404,7 @@ def test_server_create_userdata(self):
24022404
self.assertEqual(self.datalist(), data)
24032405

24042406
def test_server_create_with_volume(self):
2405-
self.volume_client.volumes.get.return_value = self.volume
2407+
self.volume_sdk_client.find_volume.return_value = self.volume
24062408

24072409
arglist = [
24082410
'--flavor',
@@ -2420,8 +2422,8 @@ def test_server_create_with_volume(self):
24202422
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
24212423
columns, data = self.cmd.take_action(parsed_args)
24222424

2423-
self.volume_client.volumes.get.assert_called_once_with(
2424-
self.volume.name
2425+
self.volume_sdk_client.find_volume.assert_called_once_with(
2426+
self.volume.name, ignore_missing=False
24252427
)
24262428
self.compute_client.create_server.assert_called_once_with(
24272429
name=self.server.name,
@@ -2444,7 +2446,7 @@ def test_server_create_with_volume(self):
24442446
self.assertEqual(self.datalist(), data)
24452447

24462448
def test_server_create_with_snapshot(self):
2447-
self.volume_client.volume_snapshots.get.return_value = self.snapshot
2449+
self.volume_sdk_client.find_snapshot.return_value = self.snapshot
24482450

24492451
arglist = [
24502452
'--flavor',
@@ -2462,8 +2464,8 @@ def test_server_create_with_snapshot(self):
24622464
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
24632465
columns, data = self.cmd.take_action(parsed_args)
24642466

2465-
self.volume_client.volume_snapshots.get.assert_called_once_with(
2466-
self.snapshot.name
2467+
self.volume_sdk_client.find_snapshot.assert_called_once_with(
2468+
self.snapshot.name, ignore_missing=False
24672469
)
24682470
self.compute_client.create_server.assert_called_once_with(
24692471
name=self.server.name,
@@ -2515,7 +2517,7 @@ def test_server_create_with_block_device(self):
25152517
columns, data = self.cmd.take_action(parsed_args)
25162518

25172519
# we don't do any validation of IDs when using the legacy option
2518-
self.volume_client.volumes.get.assert_not_called()
2520+
self.volume_sdk_client.find_volume.assert_not_called()
25192521
self.compute_client.create_server.assert_called_once_with(
25202522
name=self.server.name,
25212523
image_id='',
@@ -2593,7 +2595,7 @@ def test_server_create_with_block_device_full(self):
25932595
columns, data = self.cmd.take_action(parsed_args)
25942596

25952597
# we don't do any validation of IDs when using the legacy option
2596-
self.volume_client.volumes.get.assert_not_called()
2598+
self.volume_sdk_client.find_volume.assert_not_called()
25972599
self.compute_client.create_server.assert_called_once_with(
25982600
name=self.server.name,
25992601
image_id=self.image.id,
@@ -2675,7 +2677,7 @@ def test_server_create_with_block_device_from_file(self):
26752677
columns, data = self.cmd.take_action(parsed_args)
26762678

26772679
# we don't do any validation of IDs when using the legacy option
2678-
self.volume_client.volumes.get.assert_not_called()
2680+
self.volume_sdk_client.find_volume.assert_not_called()
26792681
self.compute_client.create_server.assert_called_once_with(
26802682
name=self.server.name,
26812683
image_id=self.image.id,
@@ -2832,7 +2834,7 @@ def test_server_create_with_block_device_volume_type_pre_v267(self):
28322834
self.compute_client.create_server.assert_not_called()
28332835

28342836
def test_server_create_with_block_device_mapping(self):
2835-
self.volume_client.volumes.get.return_value = self.volume
2837+
self.volume_sdk_client.find_volume.return_value = self.volume
28362838

28372839
arglist = [
28382840
'--image',
@@ -2865,8 +2867,8 @@ def test_server_create_with_block_device_mapping(self):
28652867
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
28662868
columns, data = self.cmd.take_action(parsed_args)
28672869

2868-
self.volume_client.volumes.get.assert_called_once_with(
2869-
self.volume.name
2870+
self.volume_sdk_client.find_volume.assert_called_once_with(
2871+
self.volume.name, ignore_missing=False
28702872
)
28712873
self.compute_client.create_server.assert_called_once_with(
28722874
name=self.server.name,
@@ -2897,7 +2899,7 @@ def test_server_create_with_block_device_mapping(self):
28972899
self.assertEqual(self.datalist(), data)
28982900

28992901
def test_server_create_with_block_device_mapping_min_input(self):
2900-
self.volume_client.volumes.get.return_value = self.volume
2902+
self.volume_sdk_client.find_volume.return_value = self.volume
29012903

29022904
arglist = [
29032905
'--image',
@@ -2929,8 +2931,8 @@ def test_server_create_with_block_device_mapping_min_input(self):
29292931
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
29302932
columns, data = self.cmd.take_action(parsed_args)
29312933

2932-
self.volume_client.volumes.get.assert_called_once_with(
2933-
self.volume.name
2934+
self.volume_sdk_client.find_volume.assert_called_once_with(
2935+
self.volume.name, ignore_missing=False
29342936
)
29352937
self.compute_client.create_server.assert_called_once_with(
29362938
name=self.server.name,
@@ -2960,7 +2962,7 @@ def test_server_create_with_block_device_mapping_min_input(self):
29602962
self.assertEqual(self.datalist(), data)
29612963

29622964
def test_server_create_with_block_device_mapping_default_input(self):
2963-
self.volume_client.volumes.get.return_value = self.volume
2965+
self.volume_sdk_client.find_volume.return_value = self.volume
29642966

29652967
arglist = [
29662968
'--image',
@@ -2992,8 +2994,8 @@ def test_server_create_with_block_device_mapping_default_input(self):
29922994
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
29932995
columns, data = self.cmd.take_action(parsed_args)
29942996

2995-
self.volume_client.volumes.get.assert_called_once_with(
2996-
self.volume.name
2997+
self.volume_sdk_client.find_volume.assert_called_once_with(
2998+
self.volume.name, ignore_missing=False
29972999
)
29983000
self.compute_client.create_server.assert_called_once_with(
29993001
name=self.server.name,
@@ -3023,7 +3025,7 @@ def test_server_create_with_block_device_mapping_default_input(self):
30233025
self.assertEqual(self.datalist(), data)
30243026

30253027
def test_server_create_with_block_device_mapping_full_input(self):
3026-
self.volume_client.volumes.get.return_value = self.volume
3028+
self.volume_sdk_client.find_volume.return_value = self.volume
30273029

30283030
arglist = [
30293031
'--image',
@@ -3057,8 +3059,8 @@ def test_server_create_with_block_device_mapping_full_input(self):
30573059
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
30583060
columns, data = self.cmd.take_action(parsed_args)
30593061

3060-
self.volume_client.volumes.get.assert_called_once_with(
3061-
self.volume.name
3062+
self.volume_sdk_client.find_volume.assert_called_once_with(
3063+
self.volume.name, ignore_missing=False
30623064
)
30633065
self.compute_client.create_server.assert_called_once_with(
30643066
name=self.server.name,
@@ -3090,8 +3092,8 @@ def test_server_create_with_block_device_mapping_full_input(self):
30903092
self.assertEqual(self.datalist(), data)
30913093

30923094
def test_server_create_with_block_device_mapping_snapshot(self):
3093-
self.snapshot = volume_fakes.create_one_snapshot()
3094-
self.volume_client.volume_snapshots.get.return_value = self.snapshot
3095+
self.snapshot = sdk_fakes.generate_fake_resource(_snapshot.Snapshot)
3096+
self.volume_sdk_client.find_snapshot.return_value = self.snapshot
30953097

30963098
arglist = [
30973099
'--image',
@@ -3125,8 +3127,8 @@ def test_server_create_with_block_device_mapping_snapshot(self):
31253127
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
31263128
columns, data = self.cmd.take_action(parsed_args)
31273129

3128-
self.volume_client.volume_snapshots.get.assert_called_once_with(
3129-
self.snapshot.name
3130+
self.volume_sdk_client.find_snapshot.assert_called_once_with(
3131+
self.snapshot.name, ignore_missing=False
31303132
)
31313133
self.compute_client.create_server.assert_called_once_with(
31323134
name=self.server.name,
@@ -3158,7 +3160,7 @@ def test_server_create_with_block_device_mapping_snapshot(self):
31583160
self.assertEqual(self.datalist(), data)
31593161

31603162
def test_server_create_with_block_device_mapping_multiple(self):
3161-
self.volume_client.volumes.get.return_value = self.volume
3163+
self.volume_sdk_client.find_volume.return_value = self.volume
31623164

31633165
arglist = [
31643166
'--image',
@@ -3200,8 +3202,8 @@ def test_server_create_with_block_device_mapping_multiple(self):
32003202
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
32013203
columns, data = self.cmd.take_action(parsed_args)
32023204

3203-
self.volume_client.volumes.get.assert_has_calls(
3204-
[mock.call(self.volume.name)] * 2
3205+
self.volume_sdk_client.find_volume.assert_has_calls(
3206+
[mock.call(self.volume.name, ignore_missing=False)] * 2
32053207
)
32063208
self.compute_client.create_server.assert_called_once_with(
32073209
name=self.server.name,

0 commit comments

Comments
 (0)