python-manilaclient 4.8.0__py3-none-any.whl → 4.9.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- manilaclient/api_versions.py +1 -1
- manilaclient/base.py +2 -2
- manilaclient/osc/v2/share.py +18 -1
- manilaclient/osc/v2/share_network_subnets.py +10 -0
- manilaclient/osc/v2/share_networks.py +14 -7
- manilaclient/tests/functional/client.py +4 -16
- manilaclient/tests/functional/osc/test_share_network_subnets.py +2 -2
- manilaclient/tests/unit/osc/v2/fakes.py +1 -0
- manilaclient/tests/unit/osc/v2/test_share.py +53 -5
- manilaclient/tests/unit/osc/v2/test_share_networks.py +1 -2
- manilaclient/tests/unit/v2/fakes.py +2 -1
- manilaclient/tests/unit/v2/test_shares.py +23 -0
- manilaclient/tests/unit/v2/test_shell.py +125 -2
- manilaclient/v2/shares.py +8 -1
- manilaclient/v2/shell.py +50 -30
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/AUTHORS +6 -0
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/METADATA +4 -4
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/RECORD +23 -23
- python_manilaclient-4.9.1.dist-info/pbr.json +1 -0
- python_manilaclient-4.8.0.dist-info/pbr.json +0 -1
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/LICENSE +0 -0
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/WHEEL +0 -0
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/entry_points.txt +0 -0
- {python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/top_level.txt +0 -0
manilaclient/api_versions.py
CHANGED
manilaclient/base.py
CHANGED
|
@@ -129,8 +129,8 @@ class Manager(utils.HookableMixin):
|
|
|
129
129
|
# pair
|
|
130
130
|
username = cliutils.env('OS_USERNAME', 'MANILA_USERNAME')
|
|
131
131
|
url = cliutils.env('OS_URL', 'MANILA_URL')
|
|
132
|
-
uniqifier = hashlib.
|
|
133
|
-
|
|
132
|
+
uniqifier = hashlib.sha256(username.encode('utf-8') +
|
|
133
|
+
url.encode('utf-8')).hexdigest()
|
|
134
134
|
|
|
135
135
|
cache_dir = os.path.expanduser(os.path.join(base_dir, uniqifier))
|
|
136
136
|
|
manilaclient/osc/v2/share.py
CHANGED
|
@@ -188,6 +188,13 @@ class CreateShare(command.ShowOne):
|
|
|
188
188
|
"possible keys are same_host, different_host."
|
|
189
189
|
"(repeat option to set multiple hints)"),
|
|
190
190
|
)
|
|
191
|
+
parser.add_argument(
|
|
192
|
+
'--mount-point-name',
|
|
193
|
+
metavar="<mount_point_name>",
|
|
194
|
+
default=None,
|
|
195
|
+
help=_('Optional custom export location. Available for '
|
|
196
|
+
'microversion >= 2.84')
|
|
197
|
+
)
|
|
191
198
|
|
|
192
199
|
return parser
|
|
193
200
|
|
|
@@ -232,6 +239,15 @@ class CreateShare(command.ShowOne):
|
|
|
232
239
|
snapshot_id = snapshot.id
|
|
233
240
|
size = max(size or 0, snapshot.size)
|
|
234
241
|
|
|
242
|
+
mount_point_name = None
|
|
243
|
+
if parsed_args.mount_point_name:
|
|
244
|
+
if share_client.api_version < api_versions.APIVersion('2.84'):
|
|
245
|
+
raise exceptions.CommandError(
|
|
246
|
+
'Setting share mount point name is '
|
|
247
|
+
'available only for API microversion >= 2.84')
|
|
248
|
+
else:
|
|
249
|
+
mount_point_name = parsed_args.mount_point_name
|
|
250
|
+
|
|
235
251
|
scheduler_hints = {}
|
|
236
252
|
if parsed_args.scheduler_hint:
|
|
237
253
|
if share_client.api_version < api_versions.APIVersion('2.65'):
|
|
@@ -271,7 +287,8 @@ class CreateShare(command.ShowOne):
|
|
|
271
287
|
'is_public': parsed_args.public,
|
|
272
288
|
'availability_zone': parsed_args.availability_zone,
|
|
273
289
|
'share_group_id': share_group,
|
|
274
|
-
'scheduler_hints': scheduler_hints
|
|
290
|
+
'scheduler_hints': scheduler_hints,
|
|
291
|
+
'mount_point_name': mount_point_name,
|
|
275
292
|
}
|
|
276
293
|
|
|
277
294
|
share = share_client.shares.create(**body)
|
|
@@ -21,6 +21,7 @@ from osc_lib import utils as oscutils
|
|
|
21
21
|
|
|
22
22
|
from manilaclient import api_versions
|
|
23
23
|
from manilaclient.common._i18n import _
|
|
24
|
+
from manilaclient.common import cliutils
|
|
24
25
|
|
|
25
26
|
|
|
26
27
|
LOG = logging.getLogger(__name__)
|
|
@@ -135,6 +136,15 @@ class CreateShareNetworkSubnet(command.ShowOne):
|
|
|
135
136
|
share_network_id=share_network_id)
|
|
136
137
|
)
|
|
137
138
|
subnet_data = subnet_create_check[1]
|
|
139
|
+
if subnet_data:
|
|
140
|
+
if parsed_args.formatter == 'table':
|
|
141
|
+
for k, v in subnet_data.items():
|
|
142
|
+
if isinstance(v, dict):
|
|
143
|
+
capabilities_list = [v]
|
|
144
|
+
dict_values = cliutils.convert_dict_list_to_string(
|
|
145
|
+
capabilities_list
|
|
146
|
+
)
|
|
147
|
+
subnet_data[k] = dict_values
|
|
138
148
|
else:
|
|
139
149
|
share_network_subnet = share_client.share_network_subnets.create(
|
|
140
150
|
neutron_net_id=parsed_args.neutron_net_id,
|
|
@@ -211,6 +211,8 @@ class ShowShareNetwork(command.ShowOne):
|
|
|
211
211
|
parsed_args.share_network)
|
|
212
212
|
|
|
213
213
|
data = share_network._info
|
|
214
|
+
if 'share_network_subnets' not in data:
|
|
215
|
+
data['share_network_subnets'] = []
|
|
214
216
|
|
|
215
217
|
# Special mapping for columns to make the output easier to read:
|
|
216
218
|
# 'metadata' --> 'properties'
|
|
@@ -308,14 +310,19 @@ class CreateShareNetwork(command.ShowOne):
|
|
|
308
310
|
elif parsed_args.availability_zone:
|
|
309
311
|
availability_zone = parsed_args.availability_zone
|
|
310
312
|
|
|
311
|
-
|
|
312
|
-
name
|
|
313
|
-
description
|
|
314
|
-
neutron_net_id
|
|
315
|
-
neutron_subnet_id
|
|
316
|
-
|
|
317
|
-
|
|
313
|
+
kwargs = {
|
|
314
|
+
"name": parsed_args.name,
|
|
315
|
+
"description": parsed_args.description,
|
|
316
|
+
"neutron_net_id": parsed_args.neutron_net_id,
|
|
317
|
+
"neutron_subnet_id": parsed_args.neutron_subnet_id,
|
|
318
|
+
}
|
|
319
|
+
if availability_zone:
|
|
320
|
+
kwargs['availability_zone'] = availability_zone
|
|
321
|
+
share_network = share_client.share_networks.create(**kwargs)
|
|
322
|
+
|
|
318
323
|
share_network_data = share_network._info
|
|
324
|
+
if 'share_network_subnets' not in share_network_data:
|
|
325
|
+
share_network_data['share_network_subnets'] = []
|
|
319
326
|
share_network_data.pop('links', None)
|
|
320
327
|
if parsed_args.formatter == 'table':
|
|
321
328
|
share_network_data['share_network_subnets'] = (
|
|
@@ -453,24 +453,19 @@ class ManilaCLIClient(base.CLIClient):
|
|
|
453
453
|
# Share networks
|
|
454
454
|
|
|
455
455
|
def create_share_network(self, name=None, description=None,
|
|
456
|
-
|
|
457
|
-
|
|
456
|
+
neutron_net_id=None, neutron_subnet_id=None,
|
|
457
|
+
availability_zone=None,
|
|
458
458
|
microversion=None):
|
|
459
459
|
"""Creates share network.
|
|
460
460
|
|
|
461
461
|
:param name: text -- desired name of new share network
|
|
462
462
|
:param description: text -- desired description of new share network
|
|
463
|
-
:param nova_net_id: text -- ID of Nova network
|
|
464
463
|
:param neutron_net_id: text -- ID of Neutron network
|
|
465
464
|
:param neutron_subnet_id: text -- ID of Neutron subnet
|
|
466
|
-
|
|
467
|
-
NOTE: 'nova_net_id' and 'neutron_net_id'/'neutron_subnet_id' are
|
|
468
|
-
mutually exclusive.
|
|
469
465
|
"""
|
|
470
466
|
params = self._combine_share_network_data(
|
|
471
467
|
name=name,
|
|
472
468
|
description=description,
|
|
473
|
-
nova_net_id=nova_net_id,
|
|
474
469
|
neutron_net_id=neutron_net_id,
|
|
475
470
|
neutron_subnet_id=neutron_subnet_id,
|
|
476
471
|
availability_zone=availability_zone
|
|
@@ -481,7 +476,7 @@ class ManilaCLIClient(base.CLIClient):
|
|
|
481
476
|
return share_network
|
|
482
477
|
|
|
483
478
|
def _combine_share_network_data(self, name=None, description=None,
|
|
484
|
-
|
|
479
|
+
neutron_net_id=None,
|
|
485
480
|
neutron_subnet_id=None,
|
|
486
481
|
availability_zone=None):
|
|
487
482
|
"""Combines params for share network operations 'create' and 'update'.
|
|
@@ -493,8 +488,6 @@ class ManilaCLIClient(base.CLIClient):
|
|
|
493
488
|
data['--name'] = name
|
|
494
489
|
if description is not None:
|
|
495
490
|
data['--description'] = description
|
|
496
|
-
if nova_net_id is not None:
|
|
497
|
-
data['--nova_net_id'] = nova_net_id
|
|
498
491
|
if neutron_net_id is not None:
|
|
499
492
|
data['--neutron_net_id'] = neutron_net_id
|
|
500
493
|
if neutron_subnet_id is not None:
|
|
@@ -516,23 +509,18 @@ class ManilaCLIClient(base.CLIClient):
|
|
|
516
509
|
|
|
517
510
|
@not_found_wrapper
|
|
518
511
|
def update_share_network(self, share_network, name=None, description=None,
|
|
519
|
-
|
|
512
|
+
neutron_net_id=None,
|
|
520
513
|
neutron_subnet_id=None, microversion=None):
|
|
521
514
|
"""Updates share-network by its name or ID.
|
|
522
515
|
|
|
523
516
|
:param name: text -- new name for share network
|
|
524
517
|
:param description: text -- new description for share network
|
|
525
|
-
:param nova_net_id: text -- ID of some Nova network
|
|
526
518
|
:param neutron_net_id: text -- ID of some Neutron network
|
|
527
519
|
:param neutron_subnet_id: text -- ID of some Neutron subnet
|
|
528
|
-
|
|
529
|
-
NOTE: 'nova_net_id' and 'neutron_net_id'/'neutron_subnet_id' are
|
|
530
|
-
mutually exclusive.
|
|
531
520
|
"""
|
|
532
521
|
sn_params = self._combine_share_network_data(
|
|
533
522
|
name=name,
|
|
534
523
|
description=description,
|
|
535
|
-
nova_net_id=nova_net_id,
|
|
536
524
|
neutron_net_id=neutron_net_id,
|
|
537
525
|
neutron_subnet_id=neutron_subnet_id)
|
|
538
526
|
share_network_raw = self.manila(
|
|
@@ -25,7 +25,7 @@ class ShareNetworkSubnetsCLITest(base.OSCClientTestBase):
|
|
|
25
25
|
share_network['id'])
|
|
26
26
|
|
|
27
27
|
self.assertEqual('True', check_result['compatible'])
|
|
28
|
-
self.assertEqual('
|
|
28
|
+
self.assertEqual('', check_result['hosts_check_result'])
|
|
29
29
|
|
|
30
30
|
def test_openstack_share_network_create_check_restart(self):
|
|
31
31
|
share_network = self.create_share_network()
|
|
@@ -34,4 +34,4 @@ class ShareNetworkSubnetsCLITest(base.OSCClientTestBase):
|
|
|
34
34
|
share_network['id'], restart_check=True)
|
|
35
35
|
|
|
36
36
|
self.assertEqual('True', check_result['compatible'])
|
|
37
|
-
self.assertEqual('
|
|
37
|
+
self.assertEqual('', check_result['hosts_check_result'])
|
|
@@ -132,7 +132,8 @@ class TestShareCreate(TestShare):
|
|
|
132
132
|
share_type=self.share_type.id,
|
|
133
133
|
size=self.new_share.size,
|
|
134
134
|
snapshot_id=None,
|
|
135
|
-
scheduler_hints={}
|
|
135
|
+
scheduler_hints={},
|
|
136
|
+
mount_point_name=None,
|
|
136
137
|
)
|
|
137
138
|
|
|
138
139
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -180,7 +181,8 @@ class TestShareCreate(TestShare):
|
|
|
180
181
|
share_type=self.share_type.id,
|
|
181
182
|
size=self.new_share.size,
|
|
182
183
|
snapshot_id=None,
|
|
183
|
-
scheduler_hints={}
|
|
184
|
+
scheduler_hints={},
|
|
185
|
+
mount_point_name=None,
|
|
184
186
|
)
|
|
185
187
|
|
|
186
188
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -227,6 +229,49 @@ class TestShareCreate(TestShare):
|
|
|
227
229
|
snapshot_id=None,
|
|
228
230
|
scheduler_hints={'same_host': shares[0].id,
|
|
229
231
|
'different_host': shares[1].id},
|
|
232
|
+
mount_point_name=None,
|
|
233
|
+
)
|
|
234
|
+
|
|
235
|
+
self.assertCountEqual(self.columns, columns)
|
|
236
|
+
self.assertCountEqual(self.datalist, data)
|
|
237
|
+
|
|
238
|
+
def test_share_create_mount_point_name(self):
|
|
239
|
+
"""Verifies that the mount point name has been passed correctly."""
|
|
240
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
241
|
+
"2.84")
|
|
242
|
+
|
|
243
|
+
mount_point_name = "fake_mp"
|
|
244
|
+
|
|
245
|
+
arglist = [
|
|
246
|
+
self.new_share.share_proto,
|
|
247
|
+
str(self.new_share.size),
|
|
248
|
+
'--share-type', self.share_type.id,
|
|
249
|
+
'--mount-point-name', mount_point_name,
|
|
250
|
+
]
|
|
251
|
+
verifylist = [
|
|
252
|
+
('share_proto', self.new_share.share_proto),
|
|
253
|
+
('size', self.new_share.size),
|
|
254
|
+
('mount_point_name', mount_point_name),
|
|
255
|
+
('share_type', self.share_type.id),
|
|
256
|
+
]
|
|
257
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
258
|
+
|
|
259
|
+
columns, data = self.cmd.take_action(parsed_args)
|
|
260
|
+
|
|
261
|
+
self.shares_mock.create.assert_called_with(
|
|
262
|
+
availability_zone=None,
|
|
263
|
+
description=None,
|
|
264
|
+
is_public=False,
|
|
265
|
+
metadata={},
|
|
266
|
+
name=None,
|
|
267
|
+
share_group_id=None,
|
|
268
|
+
share_network=None,
|
|
269
|
+
share_proto=self.new_share.share_proto,
|
|
270
|
+
share_type=self.share_type.id,
|
|
271
|
+
size=self.new_share.size,
|
|
272
|
+
snapshot_id=None,
|
|
273
|
+
scheduler_hints={},
|
|
274
|
+
mount_point_name='fake_mp',
|
|
230
275
|
)
|
|
231
276
|
|
|
232
277
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -269,7 +314,8 @@ class TestShareCreate(TestShare):
|
|
|
269
314
|
share_type=None,
|
|
270
315
|
size=self.new_share.size,
|
|
271
316
|
snapshot_id=self.share_snapshot.id,
|
|
272
|
-
scheduler_hints={}
|
|
317
|
+
scheduler_hints={},
|
|
318
|
+
mount_point_name=None,
|
|
273
319
|
)
|
|
274
320
|
self.assertCountEqual(self.columns, columns)
|
|
275
321
|
self.assertCountEqual(self.datalist, data)
|
|
@@ -305,7 +351,8 @@ class TestShareCreate(TestShare):
|
|
|
305
351
|
share_type=self.share_type.id,
|
|
306
352
|
size=self.new_share.size,
|
|
307
353
|
snapshot_id=None,
|
|
308
|
-
scheduler_hints={}
|
|
354
|
+
scheduler_hints={},
|
|
355
|
+
mount_point_name=None,
|
|
309
356
|
)
|
|
310
357
|
|
|
311
358
|
self.shares_mock.get.assert_called_with(self.new_share.id)
|
|
@@ -345,7 +392,8 @@ class TestShareCreate(TestShare):
|
|
|
345
392
|
share_type=self.share_type.id,
|
|
346
393
|
size=self.new_share.size,
|
|
347
394
|
snapshot_id=None,
|
|
348
|
-
scheduler_hints={}
|
|
395
|
+
scheduler_hints={},
|
|
396
|
+
mount_point_name=None,
|
|
349
397
|
)
|
|
350
398
|
|
|
351
399
|
mock_logger.error.assert_called_with(
|
|
@@ -79,8 +79,7 @@ class TestShareNetworkCreate(TestShareNetwork):
|
|
|
79
79
|
name=None,
|
|
80
80
|
description=None,
|
|
81
81
|
neutron_net_id=None,
|
|
82
|
-
neutron_subnet_id=None
|
|
83
|
-
availability_zone=None)
|
|
82
|
+
neutron_subnet_id=None)
|
|
84
83
|
|
|
85
84
|
self.assertCountEqual(self.columns, columns)
|
|
86
85
|
self.assertCountEqual(expected_data.values(), data)
|
|
@@ -250,7 +250,8 @@ class FakeHTTPClient(fakes.FakeHTTPClient):
|
|
|
250
250
|
return (200, {}, shares)
|
|
251
251
|
|
|
252
252
|
def get_snapshots_1234(self, **kw):
|
|
253
|
-
snapshot = {'snapshot': {'id': 1234, 'name': 'sharename'
|
|
253
|
+
snapshot = {'snapshot': {'id': 1234, 'name': 'sharename',
|
|
254
|
+
'status': 'available'}}
|
|
254
255
|
return (200, {}, snapshot)
|
|
255
256
|
|
|
256
257
|
def get_share_servers(self, **kw):
|
|
@@ -140,6 +140,29 @@ class SharesTest(utils.TestCase):
|
|
|
140
140
|
availability_zone=availability_zone)
|
|
141
141
|
cs.assert_called('POST', '/shares', body)
|
|
142
142
|
|
|
143
|
+
@ddt.data({'mount_point_name': 'fake_mount_pt1'},
|
|
144
|
+
{'mount_point_name': 'fake_mount_pt2'})
|
|
145
|
+
@ddt.unpack
|
|
146
|
+
def test_create_share_with_mount_point_name(self, mount_point_name):
|
|
147
|
+
body = {
|
|
148
|
+
'share': {
|
|
149
|
+
'is_public': False,
|
|
150
|
+
'share_type': None,
|
|
151
|
+
'name': None,
|
|
152
|
+
'snapshot_id': None,
|
|
153
|
+
'description': None,
|
|
154
|
+
'metadata': {},
|
|
155
|
+
'share_proto': 'nfs',
|
|
156
|
+
'share_network_id': None,
|
|
157
|
+
'size': 1,
|
|
158
|
+
'availability_zone': None,
|
|
159
|
+
'scheduler_hints': {},
|
|
160
|
+
'mount_point_name': mount_point_name,
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
cs.shares.create('nfs', 1, mount_point_name=mount_point_name)
|
|
164
|
+
cs.assert_called('POST', '/shares', body)
|
|
165
|
+
|
|
143
166
|
@ddt.data(
|
|
144
167
|
type('ShareUUID', (object, ), {'uuid': '1234'}),
|
|
145
168
|
type('ShareID', (object, ), {'id': '1234'}),
|
|
@@ -981,13 +981,15 @@ class ShellTest(test_utils.TestCase):
|
|
|
981
981
|
)
|
|
982
982
|
@ddt.unpack
|
|
983
983
|
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
984
|
+
@mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
|
|
984
985
|
def test_snapshot_manage(self, cmd_args, valid_params):
|
|
985
|
-
|
|
986
|
+
share_containing_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
987
|
+
shell_v2._find_share.return_value = share_containing_snapshot
|
|
986
988
|
self.run_command('snapshot-manage fake_share fake_provider_location '
|
|
987
989
|
+ cmd_args)
|
|
988
990
|
expected = {
|
|
989
991
|
'snapshot': {
|
|
990
|
-
'share_id': '
|
|
992
|
+
'share_id': '1234',
|
|
991
993
|
'provider_location': 'fake_provider_location',
|
|
992
994
|
'name': None,
|
|
993
995
|
'description': None,
|
|
@@ -995,12 +997,64 @@ class ShellTest(test_utils.TestCase):
|
|
|
995
997
|
}
|
|
996
998
|
expected['snapshot'].update(valid_params)
|
|
997
999
|
self.assert_called('POST', '/snapshots/manage', body=expected)
|
|
1000
|
+
# _wait_for_resource_status should not be triggered
|
|
1001
|
+
self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
|
|
998
1002
|
|
|
1003
|
+
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
1004
|
+
@mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
|
|
1005
|
+
def test_snapshot_manage_with_wait(self):
|
|
1006
|
+
share_containing_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
1007
|
+
shell_v2._find_share.return_value = share_containing_snapshot
|
|
1008
|
+
cmd_args = '--wait --driver_options opt1=opt1 opt2=opt2'
|
|
1009
|
+
self.run_command('snapshot-manage fake_share fake_provider_location '
|
|
1010
|
+
+ cmd_args)
|
|
1011
|
+
expected = {
|
|
1012
|
+
'snapshot': {
|
|
1013
|
+
'share_id': '1234',
|
|
1014
|
+
'provider_location': 'fake_provider_location',
|
|
1015
|
+
'name': None,
|
|
1016
|
+
'description': None,
|
|
1017
|
+
}
|
|
1018
|
+
}
|
|
1019
|
+
valid_params = {'driver_options': {'opt1': 'opt1', 'opt2': 'opt2'}}
|
|
1020
|
+
expected['snapshot'].update(valid_params)
|
|
1021
|
+
self.assert_called('POST', '/snapshots/manage', body=expected)
|
|
1022
|
+
|
|
1023
|
+
shell_v2._find_share.assert_has_calls(
|
|
1024
|
+
[mock.call(self.shell.cs, 'fake_share')])
|
|
1025
|
+
self.assertEqual(1, shell_v2._find_share.call_count)
|
|
1026
|
+
# _wait_for_resource_status should be triggered once
|
|
1027
|
+
shell_v2._wait_for_resource_status.assert_called_once_with(
|
|
1028
|
+
self.shell.cs, mock.ANY, 'available', resource_type='snapshot')
|
|
1029
|
+
|
|
1030
|
+
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
1031
|
+
@mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
|
|
999
1032
|
def test_snapshot_unmanage(self):
|
|
1033
|
+
share_containing_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
1034
|
+
shell_v2._find_share.return_value = share_containing_snapshot
|
|
1000
1035
|
self.run_command('snapshot-unmanage 1234')
|
|
1036
|
+
|
|
1001
1037
|
self.assert_called('POST', '/snapshots/1234/action',
|
|
1002
1038
|
body={'unmanage': None})
|
|
1039
|
+
self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
|
|
1003
1040
|
|
|
1041
|
+
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
1042
|
+
@mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
|
|
1043
|
+
def test_snapshot_unmanage_with_wait(self):
|
|
1044
|
+
share_containing_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
1045
|
+
shell_v2._find_share.return_value = share_containing_snapshot
|
|
1046
|
+
self.run_command('snapshot-unmanage 1234 --wait')
|
|
1047
|
+
|
|
1048
|
+
self.assert_called('POST', '/snapshots/1234/action',
|
|
1049
|
+
body={'unmanage': None})
|
|
1050
|
+
expected_snapshot = shell_v2._find_share_snapshot(
|
|
1051
|
+
self.shell.cs, '1234')
|
|
1052
|
+
# _wait_for_resource_status should be trigerred once
|
|
1053
|
+
shell_v2._wait_for_resource_status.assert_called_once_with(
|
|
1054
|
+
self.shell.cs, expected_snapshot, 'deleted',
|
|
1055
|
+
resource_type='snapshot')
|
|
1056
|
+
|
|
1057
|
+
@mock.patch.object(shell_v2, '_wait_for_share_status', mock.Mock())
|
|
1004
1058
|
def test_revert_to_snapshot(self):
|
|
1005
1059
|
|
|
1006
1060
|
fake_share_snapshot = type(
|
|
@@ -1013,6 +1067,25 @@ class ShellTest(test_utils.TestCase):
|
|
|
1013
1067
|
|
|
1014
1068
|
self.assert_called('POST', '/shares/1234/action',
|
|
1015
1069
|
body={'revert': {'snapshot_id': '5678'}})
|
|
1070
|
+
# _wait_for_share_status should not be trigerred
|
|
1071
|
+
self.assertEqual(0, shell_v2._wait_for_share_status.call_count)
|
|
1072
|
+
|
|
1073
|
+
@mock.patch.object(shell_v2, '_wait_for_share_status', mock.Mock())
|
|
1074
|
+
def test_revert_to_snapshot_with_wait(self):
|
|
1075
|
+
|
|
1076
|
+
fake_share_snapshot = type(
|
|
1077
|
+
'FakeShareSnapshot', (object,), {'id': '5678', 'share_id': '1234'})
|
|
1078
|
+
self.mock_object(
|
|
1079
|
+
shell_v2, '_find_share_snapshot',
|
|
1080
|
+
mock.Mock(return_value=fake_share_snapshot))
|
|
1081
|
+
|
|
1082
|
+
self.run_command('revert-to-snapshot 5678 --wait')
|
|
1083
|
+
|
|
1084
|
+
self.assert_called('POST', '/shares/1234/action',
|
|
1085
|
+
body={'revert': {'snapshot_id': '5678'}})
|
|
1086
|
+
# _wait_for_share_status should be trigerred once
|
|
1087
|
+
shell_v2._wait_for_share_status.assert_called_once_with(
|
|
1088
|
+
self.shell.cs, mock.ANY)
|
|
1016
1089
|
|
|
1017
1090
|
def test_delete(self):
|
|
1018
1091
|
self.run_command('delete 1234')
|
|
@@ -3640,6 +3713,39 @@ class ShellTest(test_utils.TestCase):
|
|
|
3640
3713
|
'DELETE', '/share-networks/%s' % sn.id,
|
|
3641
3714
|
clear_callstack=False)
|
|
3642
3715
|
|
|
3716
|
+
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
3717
|
+
@mock.patch.object(shell_v2, '_wait_for_snapshot_status', mock.Mock())
|
|
3718
|
+
def test_snapshot_create(self):
|
|
3719
|
+
share_to_create_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
3720
|
+
shell_v2._find_share.return_value = share_to_create_snapshot
|
|
3721
|
+
|
|
3722
|
+
self.run_command(
|
|
3723
|
+
'snapshot-create fake_share --name testshare1snapshot')
|
|
3724
|
+
|
|
3725
|
+
shell_v2._find_share.assert_has_calls([
|
|
3726
|
+
mock.call(self.shell.cs, 'fake_share')])
|
|
3727
|
+
self.assert_called_anytime(
|
|
3728
|
+
'POST', '/snapshots', clear_callstack=False)
|
|
3729
|
+
# _wait_for_snapshot_status should not be trigerred
|
|
3730
|
+
self.assertEqual(0, shell_v2._wait_for_snapshot_status.call_count)
|
|
3731
|
+
|
|
3732
|
+
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
|
|
3733
|
+
@mock.patch.object(shell_v2, '_wait_for_snapshot_status', mock.Mock())
|
|
3734
|
+
def test_snapshot_create_with_wait(self):
|
|
3735
|
+
share_to_create_snapshot = shares.Share('fake_share', {'id': '1234'})
|
|
3736
|
+
shell_v2._find_share.return_value = share_to_create_snapshot
|
|
3737
|
+
|
|
3738
|
+
self.run_command(
|
|
3739
|
+
'snapshot-create fake_share --name testshare1snapshot --wait')
|
|
3740
|
+
|
|
3741
|
+
shell_v2._find_share.assert_has_calls([
|
|
3742
|
+
mock.call(self.shell.cs, 'fake_share')])
|
|
3743
|
+
self.assert_called_anytime(
|
|
3744
|
+
'POST', '/snapshots', clear_callstack=False)
|
|
3745
|
+
# _wait_for_snapshot_status should be trigerred once
|
|
3746
|
+
shell_v2._wait_for_snapshot_status.assert_called_once_with(
|
|
3747
|
+
self.shell.cs, mock.ANY, expected_status='available')
|
|
3748
|
+
|
|
3643
3749
|
@ddt.data(('fake_snapshot1', ), ('fake_snapshot1', 'fake_snapshot2'))
|
|
3644
3750
|
def test_snapshot_delete(self, snapshot_ids):
|
|
3645
3751
|
fake_snapshots = [
|
|
@@ -3660,6 +3766,23 @@ class ShellTest(test_utils.TestCase):
|
|
|
3660
3766
|
'DELETE', '/snapshots/%s' % snapshot.id,
|
|
3661
3767
|
clear_callstack=False)
|
|
3662
3768
|
|
|
3769
|
+
@mock.patch.object(shell_v2, '_find_share_snapshot', mock.Mock())
|
|
3770
|
+
@mock.patch.object(shell_v2, '_wait_for_snapshot_status', mock.Mock())
|
|
3771
|
+
def test_snapshot_delete_with_wait(self):
|
|
3772
|
+
fake_snapshot = share_snapshots.ShareSnapshot(
|
|
3773
|
+
'fake', {'id': 'fake_snapshot1'}, True)
|
|
3774
|
+
shell_v2._find_share_snapshot.return_value = fake_snapshot
|
|
3775
|
+
|
|
3776
|
+
self.run_command('snapshot-delete fake_snapshot1 --wait')
|
|
3777
|
+
|
|
3778
|
+
shell_v2._find_share_snapshot.assert_has_calls([
|
|
3779
|
+
mock.call(self.shell.cs, 'fake_snapshot1')])
|
|
3780
|
+
self.assert_called_anytime(
|
|
3781
|
+
'DELETE', '/snapshots/fake_snapshot1', clear_callstack=False)
|
|
3782
|
+
# _wait_for_resource_status should be trigerred once
|
|
3783
|
+
shell_v2._wait_for_snapshot_status.assert_called_once_with(
|
|
3784
|
+
self.shell.cs, 'fake_snapshot1', expected_status='deleted')
|
|
3785
|
+
|
|
3663
3786
|
@ddt.data(('snapshot_xyz', ), ('snapshot_abc', 'snapshot_xyz'))
|
|
3664
3787
|
def test_snapshot_force_delete_wait(self, snapshots_to_delete):
|
|
3665
3788
|
fake_manager = mock.Mock()
|
manilaclient/v2/shares.py
CHANGED
|
@@ -124,7 +124,8 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
124
124
|
def create(self, share_proto, size, snapshot_id=None, name=None,
|
|
125
125
|
description=None, metadata=None, share_network=None,
|
|
126
126
|
share_type=None, is_public=False, availability_zone=None,
|
|
127
|
-
share_group_id=None, scheduler_hints=None, return_raw=False
|
|
127
|
+
share_group_id=None, scheduler_hints=None, return_raw=False,
|
|
128
|
+
mount_point_name=None):
|
|
128
129
|
"""Create a share.
|
|
129
130
|
|
|
130
131
|
:param share_proto: text - share protocol for new share available
|
|
@@ -142,6 +143,9 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
142
143
|
:param scheduler_hints: dict - hints for the scheduler to place share
|
|
143
144
|
on most appropriate host e.g. keys are same_host for affinity and
|
|
144
145
|
different_host for anti-affinity
|
|
146
|
+
:param mount_point_name: text - share human-readable mount point name.
|
|
147
|
+
This name will be reflected in export location once
|
|
148
|
+
share is created.
|
|
145
149
|
:rtype: :class:`Share`
|
|
146
150
|
"""
|
|
147
151
|
share_metadata = metadata if metadata is not None else dict()
|
|
@@ -163,6 +167,9 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
163
167
|
if share_group_id:
|
|
164
168
|
body['share_group_id'] = share_group_id
|
|
165
169
|
|
|
170
|
+
if mount_point_name:
|
|
171
|
+
body['mount_point_name'] = mount_point_name
|
|
172
|
+
|
|
166
173
|
return self._create('/shares', {'share': body}, 'share',
|
|
167
174
|
return_raw=return_raw)
|
|
168
175
|
|
manilaclient/v2/shell.py
CHANGED
|
@@ -326,6 +326,11 @@ def _print_share_group_snapshot_members(cs, share_group_snapshot):
|
|
|
326
326
|
cliutils.print_dict(info.get('members', {}))
|
|
327
327
|
|
|
328
328
|
|
|
329
|
+
def _wait_for_snapshot_status(cs, snapshot, expected_status='available'):
|
|
330
|
+
return _wait_for_resource_status(
|
|
331
|
+
cs, snapshot, expected_status, resource_type='snapshot')
|
|
332
|
+
|
|
333
|
+
|
|
329
334
|
def _find_share_snapshot(cs, snapshot):
|
|
330
335
|
"""Get a snapshot by ID."""
|
|
331
336
|
return apiclient_utils.find_resource(cs.share_snapshots, snapshot)
|
|
@@ -1704,10 +1709,14 @@ def do_share_server_reset_state(cs, args):
|
|
|
1704
1709
|
action='single_alias',
|
|
1705
1710
|
help='Optional driver options as key=value pairs (Default=None).',
|
|
1706
1711
|
default=None)
|
|
1712
|
+
@cliutils.arg(
|
|
1713
|
+
'--wait',
|
|
1714
|
+
action='store_true',
|
|
1715
|
+
default=False,
|
|
1716
|
+
help='Wait for share snapshot to be managed')
|
|
1707
1717
|
def do_snapshot_manage(cs, args):
|
|
1708
1718
|
"""Manage share snapshot not handled by Manila (Admin only)."""
|
|
1709
1719
|
share_ref = _find_share(cs, args.share)
|
|
1710
|
-
|
|
1711
1720
|
driver_options = _extract_key_value_options(args, 'driver_options')
|
|
1712
1721
|
|
|
1713
1722
|
share_snapshot = cs.share_snapshots.manage(
|
|
@@ -1716,6 +1725,12 @@ def do_snapshot_manage(cs, args):
|
|
|
1716
1725
|
name=args.name, description=args.description
|
|
1717
1726
|
)
|
|
1718
1727
|
|
|
1728
|
+
if args.wait:
|
|
1729
|
+
try:
|
|
1730
|
+
_wait_for_snapshot_status(cs, share_snapshot,
|
|
1731
|
+
expected_status='available')
|
|
1732
|
+
except exceptions.CommandError as e:
|
|
1733
|
+
print(e, file=sys.stderr)
|
|
1719
1734
|
_print_share_snapshot(cs, share_snapshot)
|
|
1720
1735
|
|
|
1721
1736
|
|
|
@@ -1771,6 +1786,11 @@ def do_share_server_unmanage(cs, args):
|
|
|
1771
1786
|
metavar='<snapshot>',
|
|
1772
1787
|
nargs='+',
|
|
1773
1788
|
help='Name or ID of the snapshot(s).')
|
|
1789
|
+
@cliutils.arg(
|
|
1790
|
+
'--wait',
|
|
1791
|
+
action='store_true',
|
|
1792
|
+
default=False,
|
|
1793
|
+
help='Wait for share snapshot to be unmanaged')
|
|
1774
1794
|
def do_snapshot_unmanage(cs, args):
|
|
1775
1795
|
"""Unmanage one or more share snapshots (Admin only)."""
|
|
1776
1796
|
failure_count = 0
|
|
@@ -1778,6 +1798,9 @@ def do_snapshot_unmanage(cs, args):
|
|
|
1778
1798
|
try:
|
|
1779
1799
|
snapshot_ref = _find_share_snapshot(cs, snapshot)
|
|
1780
1800
|
snapshot_ref.unmanage_snapshot()
|
|
1801
|
+
if args.wait:
|
|
1802
|
+
_wait_for_snapshot_status(cs, snapshot_ref,
|
|
1803
|
+
expected_status='deleted')
|
|
1781
1804
|
except Exception as e:
|
|
1782
1805
|
failure_count += 1
|
|
1783
1806
|
print("Unmanage for share snapshot %s failed: %s" % (snapshot, e),
|
|
@@ -1794,11 +1817,18 @@ def do_snapshot_unmanage(cs, args):
|
|
|
1794
1817
|
metavar='<snapshot>',
|
|
1795
1818
|
help='Name or ID of the snapshot to restore. The snapshot must be the '
|
|
1796
1819
|
'most recent one known to manila.')
|
|
1820
|
+
@cliutils.arg(
|
|
1821
|
+
'--wait',
|
|
1822
|
+
action='store_true',
|
|
1823
|
+
default=False,
|
|
1824
|
+
help='Wait for share to be reverted from snapshot.')
|
|
1797
1825
|
def do_revert_to_snapshot(cs, args):
|
|
1798
1826
|
"""Revert a share to the specified snapshot."""
|
|
1799
1827
|
snapshot = _find_share_snapshot(cs, args.snapshot)
|
|
1800
1828
|
share = _find_share(cs, snapshot.share_id)
|
|
1801
1829
|
share.revert_to_snapshot(snapshot)
|
|
1830
|
+
if args.wait:
|
|
1831
|
+
_wait_for_share_status(cs, share)
|
|
1802
1832
|
|
|
1803
1833
|
|
|
1804
1834
|
@cliutils.arg(
|
|
@@ -3038,6 +3068,11 @@ def do_snapshot_instance_export_location_show(cs, args):
|
|
|
3038
3068
|
metavar='<description>',
|
|
3039
3069
|
default=None,
|
|
3040
3070
|
help='Optional snapshot description. (Default=None)')
|
|
3071
|
+
@cliutils.arg(
|
|
3072
|
+
'--wait',
|
|
3073
|
+
action='store_true',
|
|
3074
|
+
default=False,
|
|
3075
|
+
help='Wait for snapshot to be created.')
|
|
3041
3076
|
def do_snapshot_create(cs, args):
|
|
3042
3077
|
"""Add a new snapshot."""
|
|
3043
3078
|
share = _find_share(cs, args.share)
|
|
@@ -3045,6 +3080,12 @@ def do_snapshot_create(cs, args):
|
|
|
3045
3080
|
args.force,
|
|
3046
3081
|
args.name,
|
|
3047
3082
|
args.description)
|
|
3083
|
+
if args.wait:
|
|
3084
|
+
try:
|
|
3085
|
+
_wait_for_snapshot_status(cs, snapshot,
|
|
3086
|
+
expected_status='available')
|
|
3087
|
+
except exceptions.CommandError as e:
|
|
3088
|
+
print(e, file=sys.stderr)
|
|
3048
3089
|
_print_share_snapshot(cs, snapshot)
|
|
3049
3090
|
|
|
3050
3091
|
|
|
@@ -3120,6 +3161,11 @@ def do_snapshot_rename(cs, args):
|
|
|
3120
3161
|
metavar='<snapshot>',
|
|
3121
3162
|
nargs='+',
|
|
3122
3163
|
help='Name or ID of the snapshot(s) to delete.')
|
|
3164
|
+
@cliutils.arg(
|
|
3165
|
+
'--wait',
|
|
3166
|
+
action='store_true',
|
|
3167
|
+
default=False,
|
|
3168
|
+
help='Wait for snapshot to be deleted')
|
|
3123
3169
|
def do_snapshot_delete(cs, args):
|
|
3124
3170
|
"""Remove one or more snapshots."""
|
|
3125
3171
|
failure_count = 0
|
|
@@ -3129,6 +3175,9 @@ def do_snapshot_delete(cs, args):
|
|
|
3129
3175
|
snapshot_ref = _find_share_snapshot(
|
|
3130
3176
|
cs, snapshot)
|
|
3131
3177
|
cs.share_snapshots.delete(snapshot_ref)
|
|
3178
|
+
if args.wait:
|
|
3179
|
+
_wait_for_snapshot_status(cs, snapshot,
|
|
3180
|
+
expected_status='deleted')
|
|
3132
3181
|
except Exception as e:
|
|
3133
3182
|
failure_count += 1
|
|
3134
3183
|
print("Delete for snapshot %s failed: %s" % (
|
|
@@ -3290,15 +3339,6 @@ def do_reset_state(cs, args):
|
|
|
3290
3339
|
|
|
3291
3340
|
|
|
3292
3341
|
@api_versions.wraps("1.0", "2.25")
|
|
3293
|
-
@cliutils.arg(
|
|
3294
|
-
'--nova-net-id',
|
|
3295
|
-
'--nova-net_id', '--nova_net_id', '--nova_net-id', # aliases
|
|
3296
|
-
metavar='<nova-net-id>',
|
|
3297
|
-
default=None,
|
|
3298
|
-
action='single_alias',
|
|
3299
|
-
help="Nova net ID. Used to set up network for share servers. This "
|
|
3300
|
-
"option is deprecated and will be rejected in newer releases "
|
|
3301
|
-
"of OpenStack Manila.")
|
|
3302
3342
|
@cliutils.arg(
|
|
3303
3343
|
'--neutron-net-id',
|
|
3304
3344
|
'--neutron-net_id', '--neutron_net_id', '--neutron_net-id',
|
|
@@ -3329,7 +3369,6 @@ def do_share_network_create(cs, args):
|
|
|
3329
3369
|
values = {
|
|
3330
3370
|
'neutron_net_id': args.neutron_net_id,
|
|
3331
3371
|
'neutron_subnet_id': args.neutron_subnet_id,
|
|
3332
|
-
'nova_net_id': args.nova_net_id,
|
|
3333
3372
|
'name': args.name,
|
|
3334
3373
|
'description': args.description,
|
|
3335
3374
|
}
|
|
@@ -3398,15 +3437,6 @@ def do_share_network_create(cs, args): # noqa
|
|
|
3398
3437
|
'share_network',
|
|
3399
3438
|
metavar='<share-network>',
|
|
3400
3439
|
help='Name or ID of share network to update.')
|
|
3401
|
-
@cliutils.arg(
|
|
3402
|
-
'--nova-net-id',
|
|
3403
|
-
'--nova-net_id', '--nova_net_id', '--nova_net-id', # aliases
|
|
3404
|
-
metavar='<nova-net-id>',
|
|
3405
|
-
default=None,
|
|
3406
|
-
action='single_alias',
|
|
3407
|
-
help="Nova net ID. Used to set up network for share servers. This "
|
|
3408
|
-
"option is deprecated and will be rejected in newer releases "
|
|
3409
|
-
"of OpenStack Manila.")
|
|
3410
3440
|
@cliutils.arg(
|
|
3411
3441
|
'--neutron-net-id',
|
|
3412
3442
|
'--neutron-net_id', '--neutron_net_id', '--neutron_net-id',
|
|
@@ -3437,7 +3467,6 @@ def do_share_network_update(cs, args):
|
|
|
3437
3467
|
values = {
|
|
3438
3468
|
'neutron_net_id': args.neutron_net_id,
|
|
3439
3469
|
'neutron_subnet_id': args.neutron_subnet_id,
|
|
3440
|
-
'nova_net_id': args.nova_net_id,
|
|
3441
3470
|
'name': args.name,
|
|
3442
3471
|
'description': args.description,
|
|
3443
3472
|
}
|
|
@@ -3551,14 +3580,6 @@ def do_share_network_show(cs, args):
|
|
|
3551
3580
|
action='single_alias',
|
|
3552
3581
|
default=None,
|
|
3553
3582
|
help='Filter results by attached security service.')
|
|
3554
|
-
@cliutils.arg(
|
|
3555
|
-
'--nova-net-id',
|
|
3556
|
-
'--nova_net_id', '--nova_net-id', '--nova-net_id', # aliases
|
|
3557
|
-
metavar='<nova_net_id>',
|
|
3558
|
-
action='single_alias',
|
|
3559
|
-
default=None,
|
|
3560
|
-
help='Filter results by Nova net ID. This option is deprecated and will '
|
|
3561
|
-
'be rejected in newer releases of OpenStack Manila.')
|
|
3562
3583
|
@cliutils.arg(
|
|
3563
3584
|
'--neutron-net-id',
|
|
3564
3585
|
'--neutron_net_id', '--neutron_net-id', '--neutron-net_id', # aliases
|
|
@@ -3634,7 +3655,6 @@ def do_share_network_list(cs, args):
|
|
|
3634
3655
|
'name': args.name,
|
|
3635
3656
|
'created_since': args.created_since,
|
|
3636
3657
|
'created_before': args.created_before,
|
|
3637
|
-
'nova_net_id': args.nova_net_id,
|
|
3638
3658
|
'neutron_net_id': args.neutron_net_id,
|
|
3639
3659
|
'neutron_subnet_id': args.neutron_subnet_id,
|
|
3640
3660
|
'network_type': args.network_type,
|
|
@@ -22,6 +22,7 @@ Chen <dstbtgagt@foxmail.com>
|
|
|
22
22
|
Chris MacNaughton <chris.macnaughton@canonical.com>
|
|
23
23
|
Christian Berendt <berendt@b1-systems.de>
|
|
24
24
|
Chuck Fouts <fchuck@netapp.com>
|
|
25
|
+
Clifford Emeka <emclidon@gmail.com>
|
|
25
26
|
Clinton Knight <cknight@netapp.com>
|
|
26
27
|
Cloud User <stack@devstack-maari.novalocal>
|
|
27
28
|
Corey Bryant <corey.bryant@canonical.com>
|
|
@@ -118,6 +119,7 @@ YuehuiLei <leiyuehui-s@inspur.com>
|
|
|
118
119
|
Yulia Portnova <yportnova@mirantis.com>
|
|
119
120
|
altanai <tara181989@gmail.com>
|
|
120
121
|
andrebeltrami <andreluizbeltrami@hotmail.com>
|
|
122
|
+
annwesha.das <annwesha.das@ndsu.edu>
|
|
121
123
|
archanaserver <ak31960466@gmail.com>
|
|
122
124
|
ashrod98 <ashrod98@gmail.com>
|
|
123
125
|
binean <ting.wang@easystack.cn>
|
|
@@ -143,6 +145,7 @@ houming-wang <houming.wang@easystack.cn>
|
|
|
143
145
|
howardlee <lihongweibj@inspur.com>
|
|
144
146
|
iswarya_vakati <v.iswarya@nectechnologies.in>
|
|
145
147
|
jacky06 <zhang.min@99cloud.net>
|
|
148
|
+
jayaanand.borra@netapp.com <jayaanand.borra@netapp.com>
|
|
146
149
|
ji-xuepeng <ji.xuepeng@zte.com.cn>
|
|
147
150
|
junboli <junbo85.li@gmail.com>
|
|
148
151
|
kafilat-adeleke <adelekekafilatadenike@gmail.com>
|
|
@@ -159,7 +162,9 @@ lkuchlan <lkuchlan@redhat.com>
|
|
|
159
162
|
luke.li <lilu7189@fiberhome.com>
|
|
160
163
|
maaoyu <maaoyu@inspur.com>
|
|
161
164
|
mark.sturdevant <mark.sturdevant@hpe.com>
|
|
165
|
+
melakualehegn <melakualehegn34@gmail.com>
|
|
162
166
|
melissaml <ma.lei@99cloud.net>
|
|
167
|
+
morozovalekseywot <morozovalekseywot@gmail.com>
|
|
163
168
|
namrata <namrata.sitlani@citynetwork.eu>
|
|
164
169
|
nidhimittalhada <nidhimittal19@gmail.com>
|
|
165
170
|
paulali <paulali@protonmail.com>
|
|
@@ -175,6 +180,7 @@ sriram ramakrishnan <sramakr@gmail.com>
|
|
|
175
180
|
sunjia <sunjia@inspur.com>
|
|
176
181
|
ting.wang <ting.wang@easystack.cn>
|
|
177
182
|
tpsilva <tiago.pasqualini@gmail.com>
|
|
183
|
+
tspyderboy <tspyderboy@gmail.com>
|
|
178
184
|
venkatamahesh <venkatamaheshkotha@gmail.com>
|
|
179
185
|
vik <vik@ubuntu.(none)>
|
|
180
186
|
vkmc <victoria@redhat.com>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: python-manilaclient
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.9.1
|
|
4
4
|
Summary: Client library for OpenStack Manila API.
|
|
5
5
|
Home-page: https://docs.openstack.org/python-manilaclient/latest/
|
|
6
6
|
Author: OpenStack
|
|
@@ -22,15 +22,15 @@ Classifier: Programming Language :: Python :: 3.9
|
|
|
22
22
|
Classifier: Programming Language :: Python :: 3.10
|
|
23
23
|
Classifier: Programming Language :: Python :: 3.11
|
|
24
24
|
Requires-Python: >=3.8
|
|
25
|
-
Requires-Dist: Babel (
|
|
25
|
+
Requires-Dist: Babel (>=2.5.0)
|
|
26
26
|
Requires-Dist: PrettyTable (>=0.7.1)
|
|
27
27
|
Requires-Dist: debtcollector (>=1.2.0)
|
|
28
28
|
Requires-Dist: osc-lib (>=1.10.0)
|
|
29
29
|
Requires-Dist: oslo.config (>=5.2.0)
|
|
30
30
|
Requires-Dist: oslo.log (>=3.36.0)
|
|
31
|
-
Requires-Dist: oslo.serialization (
|
|
31
|
+
Requires-Dist: oslo.serialization (>=2.20.0)
|
|
32
32
|
Requires-Dist: oslo.utils (>=3.33.0)
|
|
33
|
-
Requires-Dist: pbr (
|
|
33
|
+
Requires-Dist: pbr (>=3.0.0)
|
|
34
34
|
Requires-Dist: python-keystoneclient (>=3.8.0)
|
|
35
35
|
Requires-Dist: requests (>=2.14.2)
|
|
36
36
|
Requires-Dist: simplejson (>=3.5.1)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
manilaclient/__init__.py,sha256=yLvujNabAf28-BYLBD9MEqkumXr9nfohOAOgvce5qxA,1248
|
|
2
|
-
manilaclient/api_versions.py,sha256=
|
|
3
|
-
manilaclient/base.py,sha256=
|
|
2
|
+
manilaclient/api_versions.py,sha256=q1qttzxIHmCfWd96R1x6pQgy8BmgEoxUKzVTMFoMzFo,15186
|
|
3
|
+
manilaclient/base.py,sha256=5p-7Wjvf4NnsvFi21XWbFhoDzNVt78cK6t6ePyW-PYs,18340
|
|
4
4
|
manilaclient/client.py,sha256=_8GKDn72tiY34X5qLeNYYm5PGucPuusyTBBcFsTgBlI,2387
|
|
5
5
|
manilaclient/config.py,sha256=pyazLQjW3IbblaSX-PtkRnu49E0oADThFXjR0ijIxYE,10524
|
|
6
6
|
manilaclient/exceptions.py,sha256=uNsKuV6KtOtZpFvRnkm0GdIJRvZ_CrB6oiA2c30Hsa8,1825
|
|
@@ -25,7 +25,7 @@ manilaclient/osc/v2/quotas.py,sha256=bRF1U8wjjBqeaDROlB3kyi-2cTA-iElCc677l0hRo_o
|
|
|
25
25
|
manilaclient/osc/v2/resource_locks.py,sha256=rGsdpkxYA3ZQ4UFTNeq0GDpbb_MZ4b5QJYCxD4duKXs,14033
|
|
26
26
|
manilaclient/osc/v2/security_services.py,sha256=48ML9X7_4iZTlDIFRI9UmvtpW0J7HOC3jb0Kt6S4Wfg,20321
|
|
27
27
|
manilaclient/osc/v2/services.py,sha256=ulQQAGxypJmDFddA694HUpDiPqKOr1grQilEiXvt-S4,5486
|
|
28
|
-
manilaclient/osc/v2/share.py,sha256=
|
|
28
|
+
manilaclient/osc/v2/share.py,sha256=gXY8D8VlxBZUZbL_-4YaEO9EhoitJgd8gJ4PqLN1iJI,53747
|
|
29
29
|
manilaclient/osc/v2/share_access_rules.py,sha256=815R8utTN3T9LPQ-eC2KPvUrI3HeVUDeh5Pqvw8OH-U,17889
|
|
30
30
|
manilaclient/osc/v2/share_backups.py,sha256=17yE6Z5NrKzpUNuajSBnlaYZy3YRFQT9_ID-DAq3JL8,14055
|
|
31
31
|
manilaclient/osc/v2/share_group_snapshots.py,sha256=Vkq2vK0K7vaDxKl3TBVm_xMWpJZRfn80JIqusLoFiWY,14824
|
|
@@ -35,8 +35,8 @@ manilaclient/osc/v2/share_groups.py,sha256=7njPDWgxF_tMwBkyZPEOhDf7qe0ThPENm2fYG
|
|
|
35
35
|
manilaclient/osc/v2/share_instance_export_locations.py,sha256=i5ulZz6PCDbZd_KXoE_Cj1toRRTXSt5Bru-R-HhPC08,3089
|
|
36
36
|
manilaclient/osc/v2/share_instances.py,sha256=1DlW2ldo6VjzBMgovozgDh2g6HDkHMLANS43ZecGhtQ,7645
|
|
37
37
|
manilaclient/osc/v2/share_limits.py,sha256=3TtNFRYKd6VsUDjrFL_OZXq92dVO2luMGVHAelu08g8,2202
|
|
38
|
-
manilaclient/osc/v2/share_network_subnets.py,sha256=
|
|
39
|
-
manilaclient/osc/v2/share_networks.py,sha256
|
|
38
|
+
manilaclient/osc/v2/share_network_subnets.py,sha256=VPWCfRkDZ5YZusxIMpcU2I7ioqlg1IDvg3qEhGPXbBY,13540
|
|
39
|
+
manilaclient/osc/v2/share_networks.py,sha256=-mmms_53sHM2FtDHn_x_vOo8bxvxOVUEF40J3Iho0lc,28077
|
|
40
40
|
manilaclient/osc/v2/share_pools.py,sha256=4TjomBQby4D0fL43FFCfrfau0TTsv1i-MswZNFEPt9g,3636
|
|
41
41
|
manilaclient/osc/v2/share_replica_export_locations.py,sha256=FYUpNjb1jEzfCwmLh6-Kiczx_TKeVnOaQDCBoZZPn1s,2831
|
|
42
42
|
manilaclient/osc/v2/share_replicas.py,sha256=pc97Y2WPWKXkeZF2Oahxz2PfEyxQ3coUmy2eC3hj3vM,14367
|
|
@@ -51,7 +51,7 @@ manilaclient/osc/v2/data/manila.csv,sha256=N5se8hFGVuraUd66hNsr8ACLm1Yt_DZys4KkK
|
|
|
51
51
|
manilaclient/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
52
52
|
manilaclient/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
53
53
|
manilaclient/tests/functional/base.py,sha256=iFh_tvq1YN9FGmDDT369x2T25pJM3Kxtc7634KPJlSs,21492
|
|
54
|
-
manilaclient/tests/functional/client.py,sha256=
|
|
54
|
+
manilaclient/tests/functional/client.py,sha256=8xWkFttAjhIpRuI9y94ciB_cv58z-th7kNo_2OhU_pU,89526
|
|
55
55
|
manilaclient/tests/functional/exceptions.py,sha256=V0GlvBuE9bWFu1G5SM-2YX1hOzATkLuDg7rpdZDND_Q,2322
|
|
56
56
|
manilaclient/tests/functional/test_availability_zones.py,sha256=8WVIvEY3PFXPzHk8-3Bdg8c4pdZbwoGtCa9Iu8qRpPM,2146
|
|
57
57
|
manilaclient/tests/functional/test_common.py,sha256=wH2JL1EuaGH5gnqPpOhKSmYeSNPFnMSihHI_thqQeck,2442
|
|
@@ -87,7 +87,7 @@ manilaclient/tests/functional/osc/test_share_access_rules.py,sha256=AFNcdl0uRqeK
|
|
|
87
87
|
manilaclient/tests/functional/osc/test_share_backups.py,sha256=sWzpdxnz2KKX9BQ6nYFwMUlA74ZLFlmsVwcxciTKM1A,5178
|
|
88
88
|
manilaclient/tests/functional/osc/test_share_group_type_access.py,sha256=hjGjhCpz8N5PJdNY0AQrFX_kZ9PLZgNpElRw7H9mKd4,3533
|
|
89
89
|
manilaclient/tests/functional/osc/test_share_limits.py,sha256=nkQ7gQLTh9bwO-e4eU5WEK5D-IHJqOxQkUNL6BlMLOc,1281
|
|
90
|
-
manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256
|
|
90
|
+
manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256=SsLJmC2ZFyNFQiTFowzRTdoQDaaxoFA0traZdl8Pnvc,1414
|
|
91
91
|
manilaclient/tests/functional/osc/test_share_networks.py,sha256=_9vOnd_cc25HkBp7G-jA4m5x7LaEZvwzBBNzfG8ttII,3896
|
|
92
92
|
manilaclient/tests/functional/osc/test_share_pools.py,sha256=svBFXZrlIdP13rcS-SWRU9YIiXT9nns16sGjq7kX5eA,1539
|
|
93
93
|
manilaclient/tests/functional/osc/test_share_replica_export_locations.py,sha256=MsLgNKRWTANUm80Af7P2wFdNPVOJwOAoW3xY_W8wkUU,2618
|
|
@@ -114,14 +114,14 @@ manilaclient/tests/unit/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
|
|
|
114
114
|
manilaclient/tests/unit/osc/osc_fakes.py,sha256=eOO0huU6P_xz8PGb_nHwlaePFz-9S3GyyUnjlrgu0ag,6610
|
|
115
115
|
manilaclient/tests/unit/osc/osc_utils.py,sha256=8QXJ3Op1QQ9CfKJikheBABLURKqrV4iB9PdX3VvhdUo,2555
|
|
116
116
|
manilaclient/tests/unit/osc/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
117
|
-
manilaclient/tests/unit/osc/v2/fakes.py,sha256=
|
|
117
|
+
manilaclient/tests/unit/osc/v2/fakes.py,sha256=z-m9G3CR_1h0qUvbDuzmsC0DZE2tat6wrU0vRDel0wc,51679
|
|
118
118
|
manilaclient/tests/unit/osc/v2/test_availability_zones.py,sha256=lXruckwicufvzmp9uutvG9dIm-7UU0lGx9uzXVeAm3o,1963
|
|
119
119
|
manilaclient/tests/unit/osc/v2/test_messages.py,sha256=XiBKFNZNUEmKI9XL-X3G-tE220kiWQ7usvn3QExizW8,6194
|
|
120
120
|
manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=T7v3_Zt1TqWWZiD089fMpdrvuIWEoDo6eYPddajaZCg,16278
|
|
121
121
|
manilaclient/tests/unit/osc/v2/test_resource_locks.py,sha256=8PeAVw2PLDSOII3mXzyzxIfs55cLpUas-t4j-ySCdhQ,10236
|
|
122
122
|
manilaclient/tests/unit/osc/v2/test_security_services.py,sha256=dIZGOgWfY3rAul4IyV2jAImxaewAlMQ8jr9ac1NwniQ,22375
|
|
123
123
|
manilaclient/tests/unit/osc/v2/test_services.py,sha256=LA5KBW9z0_bID4WrCqIbFydUeutsLZWxSPuIqEW5PRA,9276
|
|
124
|
-
manilaclient/tests/unit/osc/v2/test_share.py,sha256=
|
|
124
|
+
manilaclient/tests/unit/osc/v2/test_share.py,sha256=hif1NO5F8owKAuIawhxT3OW6CUi3OxuQy4MwhMHsJIM,69765
|
|
125
125
|
manilaclient/tests/unit/osc/v2/test_share_access_rules.py,sha256=eDaZ9gM58b66Ea_0nstI0RHOEqE4HbR0kAkaYCLDXr0,20521
|
|
126
126
|
manilaclient/tests/unit/osc/v2/test_share_backups.py,sha256=vegKOqKJ150WSQqMiGbhHw5iMuRUdx_Bt3K-Ae9DKmU,13644
|
|
127
127
|
manilaclient/tests/unit/osc/v2/test_share_group_snapshots.py,sha256=zkchulCEXnzHQxgoVJmSo_LffCnPO2kEAu81sKHiL-8,21560
|
|
@@ -132,7 +132,7 @@ manilaclient/tests/unit/osc/v2/test_share_instance_export_locations.py,sha256=F0
|
|
|
132
132
|
manilaclient/tests/unit/osc/v2/test_share_instances.py,sha256=OCgMnmdhAM6s7aayty9XHwv6Ohq6BFTrFxUhu74LRU8,12339
|
|
133
133
|
manilaclient/tests/unit/osc/v2/test_share_limits.py,sha256=BXXlPJ4fThHKlBdY9OYf7tynSLCqwPstXt1gV6xIrK0,3044
|
|
134
134
|
manilaclient/tests/unit/osc/v2/test_share_network_subnets.py,sha256=HNlYaF93wVVf0DlUG3Ejx8qio5hQYPlrMtyWUwhZoDs,16353
|
|
135
|
-
manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=
|
|
135
|
+
manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=21w-WJe58ltDdbSsNY1x08Us4nESmnO5O0PfjLqzl98,27390
|
|
136
136
|
manilaclient/tests/unit/osc/v2/test_share_pools.py,sha256=URIdUtT3eQqtLWCHRKGu4t6cmI45qItQg3JXWBvC-z0,5395
|
|
137
137
|
manilaclient/tests/unit/osc/v2/test_share_replica_export_locations.py,sha256=vdRF8FJxdoHT6XWuRpHgBK-va9q6td9ES2Hask3lfJY,3996
|
|
138
138
|
manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=cdmUNK96olSe0TgOUMD8fVxsoX0hVJFkCHThcxxeUmc,22544
|
|
@@ -157,7 +157,7 @@ manilaclient/tests/unit/v1/test_share_types.py,sha256=-ZUqSPQ6kydh9EZtyIVfBKRYqc
|
|
|
157
157
|
manilaclient/tests/unit/v1/test_shares.py,sha256=pkDKFJXmrIQU3SR9x9eciAZtlR_9b8Ie6BfOpc_RmFE,1155
|
|
158
158
|
manilaclient/tests/unit/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
159
159
|
manilaclient/tests/unit/v2/fake_clients.py,sha256=Znrr1EGp41zvIQfo1TWsOIYujbcnPHUEeiGPoGLzU1I,6889
|
|
160
|
-
manilaclient/tests/unit/v2/fakes.py,sha256=
|
|
160
|
+
manilaclient/tests/unit/v2/fakes.py,sha256=1bbERhjTHzZa2Yxdb74kh_E26TEI3Y_VoYIhwJVJHPY,47329
|
|
161
161
|
manilaclient/tests/unit/v2/test_availability_zones.py,sha256=hwCT9WseG3ajJD1EnD34wBxmEnWYjhlbv0adYgZRoEc,2129
|
|
162
162
|
manilaclient/tests/unit/v2/test_client.py,sha256=_f1kKaTrbNbNsVoaRFuh8zJ5FS1-d2xoChbqMJF-3aU,13669
|
|
163
163
|
manilaclient/tests/unit/v2/test_limits.py,sha256=cZcEedCdtv0SngEAiidwo2xzHLDhrSC4vuX_acJmppU,5458
|
|
@@ -185,8 +185,8 @@ manilaclient/tests/unit/v2/test_share_snapshot_instance_export_locations.py,sha2
|
|
|
185
185
|
manilaclient/tests/unit/v2/test_share_snapshot_instances.py,sha256=LJNOTFFfB8Q5EIpGmdD72KrvgS4wzLuMLfw6eFKAqrw,3612
|
|
186
186
|
manilaclient/tests/unit/v2/test_share_snapshots.py,sha256=lnfeINKM-g9pk3EraQAA_I5lHVXUbloT5jXexFduxHI,9976
|
|
187
187
|
manilaclient/tests/unit/v2/test_share_transfers.py,sha256=ziq2Kb54SI35Lp87jmCEfr_ttlRAjrpszBwzi7qwp6c,1801
|
|
188
|
-
manilaclient/tests/unit/v2/test_shares.py,sha256=
|
|
189
|
-
manilaclient/tests/unit/v2/test_shell.py,sha256=
|
|
188
|
+
manilaclient/tests/unit/v2/test_shares.py,sha256=kVr-dxRH71TqyUV0osyneYUdc39MXSjSqPwBpmG_Bzs,31247
|
|
189
|
+
manilaclient/tests/unit/v2/test_shell.py,sha256=Uu4v0rDgWvoUo-nimbzp4K2Q8t0j_HJOMnYaRfQ1gbc,163788
|
|
190
190
|
manilaclient/tests/unit/v2/test_type_access.py,sha256=zvwoS42zVEnHrMyDpEruvaxxpkzAaGHzjLtxeVVb6cI,3595
|
|
191
191
|
manilaclient/tests/unit/v2/test_types.py,sha256=k2doWdg1swCd7Kb96PVqbQA4wUs3I95rXWEhqNOV8tA,18918
|
|
192
192
|
manilaclient/v1/__init__.py,sha256=FbNJHP1bcH2FE4-eUvyLcrqnWW4DvPtul15zcdFJDPQ,917
|
|
@@ -237,15 +237,15 @@ manilaclient/v2/share_snapshots.py,sha256=VyoR6xpLy-CRaQvoRS-7w8eVL7fyooBRu2xr14
|
|
|
237
237
|
manilaclient/v2/share_transfers.py,sha256=blgj20xF3BEj3mRoXjsf_QuRCXaYjVPf24En8EAcjyM,4526
|
|
238
238
|
manilaclient/v2/share_type_access.py,sha256=kK-dHI4eDnJWaQsU670IG2A2rE1kmegiIT7Rtiy4Afs,2373
|
|
239
239
|
manilaclient/v2/share_types.py,sha256=wKhwZcxh-SUytrUtPtV1hyBYw8ZHbjLqhKUR92dyo3g,10307
|
|
240
|
-
manilaclient/v2/shares.py,sha256=
|
|
241
|
-
manilaclient/v2/shell.py,sha256=
|
|
240
|
+
manilaclient/v2/shares.py,sha256=Aletqm1t0nO62tBcJGw0QRNPCuN6XgJjPJXCQIl0TCk,32139
|
|
241
|
+
manilaclient/v2/shell.py,sha256=AouOcMAH9752wTmNOX4ueg6Yd6xGsM1JvTl8xvGGJko,226091
|
|
242
242
|
manilaclient/v2/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
243
243
|
manilaclient/v2/contrib/list_extensions.py,sha256=_JSrPBEca2oR3dUbRNDBahAqo9V4bAEpNx0Si2gOWN4,1448
|
|
244
|
-
python_manilaclient-4.
|
|
245
|
-
python_manilaclient-4.
|
|
246
|
-
python_manilaclient-4.
|
|
247
|
-
python_manilaclient-4.
|
|
248
|
-
python_manilaclient-4.
|
|
249
|
-
python_manilaclient-4.
|
|
250
|
-
python_manilaclient-4.
|
|
251
|
-
python_manilaclient-4.
|
|
244
|
+
python_manilaclient-4.9.1.dist-info/AUTHORS,sha256=xEa1Tnkwr9cwxvQkfFKJoQdK36IKkQ9KnaEpUt1fCdA,7474
|
|
245
|
+
python_manilaclient-4.9.1.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
|
|
246
|
+
python_manilaclient-4.9.1.dist-info/METADATA,sha256=R7n4_-v0AeCp1phunXJzow9VoziWze0QQxj_UtfP1fg,5528
|
|
247
|
+
python_manilaclient-4.9.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
|
|
248
|
+
python_manilaclient-4.9.1.dist-info/entry_points.txt,sha256=-vfysXuwIYFL-CeP5OT0UH10KLPzH2dW5h7fTI16jL4,11626
|
|
249
|
+
python_manilaclient-4.9.1.dist-info/pbr.json,sha256=1TFQin0O3GMsapQlwsNuQtDaeNGAa7TE1NWTgYTlFqw,46
|
|
250
|
+
python_manilaclient-4.9.1.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
|
|
251
|
+
python_manilaclient-4.9.1.dist-info/RECORD,,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"git_version": "85f2173", "is_release": true}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"git_version": "06e96b7", "is_release": true}
|
|
File without changes
|
|
File without changes
|
{python_manilaclient-4.8.0.dist-info → python_manilaclient-4.9.1.dist-info}/entry_points.txt
RENAMED
|
File without changes
|
|
File without changes
|