python-manilaclient 5.4.0__py3-none-any.whl → 5.6.0__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/osc/plugin.py +13 -0
- manilaclient/osc/v2/quotas.py +17 -1
- manilaclient/osc/v2/share.py +34 -1
- manilaclient/osc/v2/share_backups.py +41 -2
- manilaclient/tests/functional/osc/test_messages.py +16 -0
- manilaclient/tests/functional/osc/test_share_backups.py +18 -0
- manilaclient/tests/unit/osc/v2/fakes.py +2 -0
- manilaclient/tests/unit/osc/v2/test_quotas.py +44 -0
- manilaclient/tests/unit/osc/v2/test_share.py +70 -1
- manilaclient/tests/unit/osc/v2/test_share_backups.py +22 -0
- manilaclient/tests/unit/v2/test_share_backups.py +12 -2
- manilaclient/tests/unit/v2/test_shares.py +23 -0
- manilaclient/v2/quotas.py +24 -2
- manilaclient/v2/share_backups.py +8 -3
- manilaclient/v2/shares.py +20 -2
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/AUTHORS +3 -0
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/METADATA +2 -3
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/RECORD +24 -24
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/WHEEL +1 -1
- python_manilaclient-5.6.0.dist-info/pbr.json +1 -0
- python_manilaclient-5.4.0.dist-info/pbr.json +0 -1
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/LICENSE +0 -0
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/entry_points.txt +0 -0
- {python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/top_level.txt +0 -0
manilaclient/api_versions.py
CHANGED
manilaclient/osc/plugin.py
CHANGED
|
@@ -113,4 +113,17 @@ def build_option_parser(parser):
|
|
|
113
113
|
'version supported by both the client and the server). '
|
|
114
114
|
'(Env: OS_SHARE_API_VERSION)',
|
|
115
115
|
)
|
|
116
|
+
parser.add_argument(
|
|
117
|
+
"--os-endpoint-override",
|
|
118
|
+
metavar="<endpoint-override>",
|
|
119
|
+
default=utils.env(
|
|
120
|
+
"OS_ENDPOINT_OVERRIDE",
|
|
121
|
+
"OS_MANILA_BYPASS_URL",
|
|
122
|
+
"MANILACLIENT_BYPASS_URL",
|
|
123
|
+
),
|
|
124
|
+
help=(
|
|
125
|
+
"Use this API endpoint instead of the Service Catalog. "
|
|
126
|
+
"Defaults to env[OS_ENDPOINT_OVERRIDE]."
|
|
127
|
+
),
|
|
128
|
+
)
|
|
116
129
|
return parser
|
manilaclient/osc/v2/quotas.py
CHANGED
|
@@ -134,6 +134,14 @@ class QuotaSet(command.Command):
|
|
|
134
134
|
help=_("New value for the 'per-share-gigabytes' quota."
|
|
135
135
|
"Available only for microversion >= 2.62")
|
|
136
136
|
)
|
|
137
|
+
parser.add_argument(
|
|
138
|
+
'--encryption-keys',
|
|
139
|
+
metavar='<encryption-keys>',
|
|
140
|
+
type=int,
|
|
141
|
+
default=None,
|
|
142
|
+
help=_("New value for the 'encryption-keys' quota."
|
|
143
|
+
"Available only for microversion >= 2.90")
|
|
144
|
+
)
|
|
137
145
|
parser.add_argument(
|
|
138
146
|
'--force',
|
|
139
147
|
dest='force',
|
|
@@ -200,6 +208,13 @@ class QuotaSet(command.Command):
|
|
|
200
208
|
"starting with '2.62' API microversion.")
|
|
201
209
|
)
|
|
202
210
|
kwargs["per_share_gigabytes"] = parsed_args.per_share_gigabytes
|
|
211
|
+
if parsed_args.encryption_keys is not None:
|
|
212
|
+
if share_client.api_version < api_versions.APIVersion('2.90'):
|
|
213
|
+
raise exceptions.CommandError(_(
|
|
214
|
+
"'encryption keys' quotas are available only "
|
|
215
|
+
"starting with '2.90' API microversion.")
|
|
216
|
+
)
|
|
217
|
+
kwargs["encryption_keys"] = parsed_args.encryption_keys
|
|
203
218
|
|
|
204
219
|
if all(value is None for value in kwargs.values()):
|
|
205
220
|
raise exceptions.CommandError(_(
|
|
@@ -208,7 +223,8 @@ class QuotaSet(command.Command):
|
|
|
208
223
|
"resources: 'shares', 'snapshots', 'gigabytes', "
|
|
209
224
|
"'snapshot-gigabytes', 'share-networks', 'share-type', "
|
|
210
225
|
"'share-groups', 'share-group-snapshots', 'share-replicas', "
|
|
211
|
-
"'replica-gigabytes', 'per-share-gigabytes'"
|
|
226
|
+
"'replica-gigabytes', 'per-share-gigabytes', "
|
|
227
|
+
"'encryption_keys'"))
|
|
212
228
|
|
|
213
229
|
if parsed_args.quota_class:
|
|
214
230
|
kwargs.update({
|
manilaclient/osc/v2/share.py
CHANGED
|
@@ -58,7 +58,8 @@ SHARE_ATTRIBUTES = [
|
|
|
58
58
|
'replication_type',
|
|
59
59
|
'has_replicas',
|
|
60
60
|
'created_at',
|
|
61
|
-
'metadata'
|
|
61
|
+
'metadata',
|
|
62
|
+
'encryption_key_ref'
|
|
62
63
|
]
|
|
63
64
|
|
|
64
65
|
SHARE_ATTRIBUTES_HEADERS = [
|
|
@@ -90,6 +91,7 @@ SHARE_ATTRIBUTES_HEADERS = [
|
|
|
90
91
|
'Has Replicas',
|
|
91
92
|
'Created At',
|
|
92
93
|
'Properties',
|
|
94
|
+
'Encryption Key Ref'
|
|
93
95
|
]
|
|
94
96
|
|
|
95
97
|
|
|
@@ -195,6 +197,14 @@ class CreateShare(command.ShowOne):
|
|
|
195
197
|
help=_('Optional custom export location. Available for '
|
|
196
198
|
'microversion >= 2.84')
|
|
197
199
|
)
|
|
200
|
+
parser.add_argument(
|
|
201
|
+
'--encryption-key-ref',
|
|
202
|
+
metavar="<encryption_key_ref>",
|
|
203
|
+
default=None,
|
|
204
|
+
help=_('Set encryption key reference i.e. UUID of the secret '
|
|
205
|
+
'stored in the key manager. Available for '
|
|
206
|
+
'microversion >= 2.90')
|
|
207
|
+
)
|
|
198
208
|
|
|
199
209
|
return parser
|
|
200
210
|
|
|
@@ -248,6 +258,15 @@ class CreateShare(command.ShowOne):
|
|
|
248
258
|
else:
|
|
249
259
|
mount_point_name = parsed_args.mount_point_name
|
|
250
260
|
|
|
261
|
+
encryption_key_ref = None
|
|
262
|
+
if parsed_args.encryption_key_ref:
|
|
263
|
+
if share_client.api_version < api_versions.APIVersion('2.90'):
|
|
264
|
+
raise exceptions.CommandError(
|
|
265
|
+
'Setting share encryption key reference is '
|
|
266
|
+
'available only for API microversion >= 2.90')
|
|
267
|
+
else:
|
|
268
|
+
encryption_key_ref = parsed_args.encryption_key_ref
|
|
269
|
+
|
|
251
270
|
scheduler_hints = {}
|
|
252
271
|
if parsed_args.scheduler_hint:
|
|
253
272
|
if share_client.api_version < api_versions.APIVersion('2.65'):
|
|
@@ -289,6 +308,7 @@ class CreateShare(command.ShowOne):
|
|
|
289
308
|
'share_group_id': share_group,
|
|
290
309
|
'scheduler_hints': scheduler_hints,
|
|
291
310
|
'mount_point_name': mount_point_name,
|
|
311
|
+
'encryption_key_ref': encryption_key_ref,
|
|
292
312
|
}
|
|
293
313
|
|
|
294
314
|
share = share_client.shares.create(**body)
|
|
@@ -537,6 +557,12 @@ class ListShare(command.Lister):
|
|
|
537
557
|
help=_("Filter results matching a share description pattern."
|
|
538
558
|
"Available only for microversion >= 2.36.")
|
|
539
559
|
)
|
|
560
|
+
parser.add_argument(
|
|
561
|
+
'--encryption-key-ref',
|
|
562
|
+
metavar="<encryption_key_ref>",
|
|
563
|
+
help=_('Filter shares by their encryption key ref. '
|
|
564
|
+
'Available for microversion >= 2.90'),
|
|
565
|
+
)
|
|
540
566
|
|
|
541
567
|
return parser
|
|
542
568
|
|
|
@@ -648,6 +674,13 @@ class ListShare(command.Lister):
|
|
|
648
674
|
"Filtering by export location is only "
|
|
649
675
|
"available with manila API version >= 2.35")
|
|
650
676
|
|
|
677
|
+
if share_client.api_version >= api_versions.APIVersion('2.90'):
|
|
678
|
+
search_opts['encryption_key_ref'] = parsed_args.encryption_key_ref
|
|
679
|
+
elif (getattr(parsed_args, 'encryption_key_ref')):
|
|
680
|
+
raise exceptions.CommandError(
|
|
681
|
+
"Filtering shares by encryption key ref is only "
|
|
682
|
+
"available with manila API version >= 2.90")
|
|
683
|
+
|
|
651
684
|
# NOTE(vkmc) We implemented sorting and filtering in manilaclient
|
|
652
685
|
# but we will use the one provided by osc
|
|
653
686
|
if share_client.api_version >= api_versions.APIVersion("2.36"):
|
|
@@ -20,10 +20,12 @@ from osc_lib.command import command
|
|
|
20
20
|
from osc_lib import exceptions
|
|
21
21
|
from osc_lib import utils as osc_utils
|
|
22
22
|
|
|
23
|
+
from manilaclient import api_versions
|
|
23
24
|
from manilaclient.common._i18n import _
|
|
24
25
|
from manilaclient.common import constants
|
|
25
26
|
from manilaclient.osc import utils
|
|
26
27
|
|
|
28
|
+
|
|
27
29
|
LOG = logging.getLogger(__name__)
|
|
28
30
|
|
|
29
31
|
|
|
@@ -282,14 +284,51 @@ class RestoreShareBackup(command.Command):
|
|
|
282
284
|
metavar="<backup>",
|
|
283
285
|
help=_('ID of backup to restore.')
|
|
284
286
|
)
|
|
287
|
+
parser.add_argument(
|
|
288
|
+
"--target-share",
|
|
289
|
+
metavar="<target-share>",
|
|
290
|
+
default=None,
|
|
291
|
+
help=_('share to restore backup to. Source share if none supplied')
|
|
292
|
+
)
|
|
293
|
+
parser.add_argument(
|
|
294
|
+
'--wait',
|
|
295
|
+
action='store_true',
|
|
296
|
+
default=False,
|
|
297
|
+
help=_('Wait for restore conclusion')
|
|
298
|
+
)
|
|
285
299
|
return parser
|
|
286
300
|
|
|
287
301
|
def take_action(self, parsed_args):
|
|
288
302
|
share_client = self.app.client_manager.share
|
|
303
|
+
kwargs = {}
|
|
304
|
+
|
|
289
305
|
share_backup = osc_utils.find_resource(
|
|
290
306
|
share_client.share_backups,
|
|
291
|
-
parsed_args.backup
|
|
292
|
-
|
|
307
|
+
parsed_args.backup
|
|
308
|
+
)
|
|
309
|
+
target_share_id = None
|
|
310
|
+
if parsed_args.target_share is not None:
|
|
311
|
+
if share_client.api_version < api_versions.APIVersion('2.91'):
|
|
312
|
+
raise exceptions.CommandError(
|
|
313
|
+
'performing targeted restores is only available '
|
|
314
|
+
'for API microversion >= 2.91')
|
|
315
|
+
else:
|
|
316
|
+
target_share_id = osc_utils.find_resource(
|
|
317
|
+
share_client.shares,
|
|
318
|
+
parsed_args.target_share
|
|
319
|
+
).id
|
|
320
|
+
kwargs['target_share_id'] = target_share_id
|
|
321
|
+
|
|
322
|
+
share_client.share_backups.restore(share_backup.id, **kwargs)
|
|
323
|
+
|
|
324
|
+
if parsed_args.wait:
|
|
325
|
+
if not osc_utils.wait_for_status(
|
|
326
|
+
status_f=share_client.shares.get,
|
|
327
|
+
res_id=(target_share_id or share_backup.share_id),
|
|
328
|
+
success_status=['available'],
|
|
329
|
+
error_status=['error', 'backup_restoring_error']
|
|
330
|
+
):
|
|
331
|
+
LOG.error(_("ERROR: share is in error state."))
|
|
293
332
|
|
|
294
333
|
|
|
295
334
|
class SetShareBackup(command.Command):
|
|
@@ -11,6 +11,8 @@
|
|
|
11
11
|
# under the License.
|
|
12
12
|
|
|
13
13
|
|
|
14
|
+
from tempest.lib import exceptions
|
|
15
|
+
|
|
14
16
|
from manilaclient.tests.functional.osc import base
|
|
15
17
|
|
|
16
18
|
|
|
@@ -101,3 +103,17 @@ class MessagesCLITest(base.OSCClientTestBase):
|
|
|
101
103
|
messages = [msg for msg in messages
|
|
102
104
|
if msg['ID'] == message["ID"]]
|
|
103
105
|
self.assertEqual(0, len(messages))
|
|
106
|
+
|
|
107
|
+
def test_delete_message_wrong_id(self):
|
|
108
|
+
self.assertRaises(
|
|
109
|
+
exceptions.CommandFailed,
|
|
110
|
+
self.openstack,
|
|
111
|
+
'share message delete 0'
|
|
112
|
+
)
|
|
113
|
+
|
|
114
|
+
def test_show_message_wrong_id(self):
|
|
115
|
+
self.assertRaises(
|
|
116
|
+
exceptions.CommandFailed,
|
|
117
|
+
self.openstack,
|
|
118
|
+
'share message show'
|
|
119
|
+
)
|
|
@@ -69,6 +69,24 @@ class ShareBackupCLITest(base.OSCClientTestBase):
|
|
|
69
69
|
self.assertEqual('test_backup_show', show_result["name"])
|
|
70
70
|
self.assertEqual('Description', show_result["description"])
|
|
71
71
|
|
|
72
|
+
def test_share_backup_restore(self):
|
|
73
|
+
share = self.create_share()
|
|
74
|
+
|
|
75
|
+
backup = self.create_backup(
|
|
76
|
+
share_id=share['id'],
|
|
77
|
+
backup_options={'dummy': True})
|
|
78
|
+
|
|
79
|
+
self.openstack(
|
|
80
|
+
f'share backup restore {backup["id"]} --wait')
|
|
81
|
+
|
|
82
|
+
backup = json.loads(self.openstack(
|
|
83
|
+
f'share backup show -f json {backup["id"]}'))
|
|
84
|
+
share = json.loads(self.openstack(
|
|
85
|
+
f'share show -f json {share["id"]}'))
|
|
86
|
+
|
|
87
|
+
self.assertEqual('available', backup['status'])
|
|
88
|
+
self.assertEqual('available', share['status'])
|
|
89
|
+
|
|
72
90
|
def test_share_backup_set(self):
|
|
73
91
|
share = self.create_share()
|
|
74
92
|
|
|
@@ -140,6 +140,7 @@ class FakeShare(object):
|
|
|
140
140
|
"source_share_group_snapshot_member_id": None,
|
|
141
141
|
"scheduler_hints": {},
|
|
142
142
|
"mount_point_name": None,
|
|
143
|
+
"encryption_key_ref": None,
|
|
143
144
|
}
|
|
144
145
|
|
|
145
146
|
# Overwrite default attributes.
|
|
@@ -420,6 +421,7 @@ class FakeQuotaSet(object):
|
|
|
420
421
|
'shapshot_gigabytes': 1000,
|
|
421
422
|
'snapshots': 50,
|
|
422
423
|
'per_share_gigabytes': -1,
|
|
424
|
+
'encryption_keys': 100,
|
|
423
425
|
}
|
|
424
426
|
|
|
425
427
|
quotas_info.update(attrs)
|
|
@@ -349,6 +349,50 @@ class TestQuotaSet(TestQuotas):
|
|
|
349
349
|
user_id=None)
|
|
350
350
|
self.assertIsNone(result)
|
|
351
351
|
|
|
352
|
+
def test_quota_set_encryption_keys_exception(self):
|
|
353
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
354
|
+
'2.89')
|
|
355
|
+
arglist = [
|
|
356
|
+
self.project.id,
|
|
357
|
+
'--encryption-keys', '10',
|
|
358
|
+
]
|
|
359
|
+
verifylist = [
|
|
360
|
+
('project', self.project.id),
|
|
361
|
+
('encryption_keys', 10)
|
|
362
|
+
]
|
|
363
|
+
|
|
364
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
365
|
+
self.assertRaises(
|
|
366
|
+
exceptions.CommandError, self.cmd.take_action, parsed_args)
|
|
367
|
+
|
|
368
|
+
def test_quota_set_encryption_keys(self):
|
|
369
|
+
arglist = [
|
|
370
|
+
self.project.id,
|
|
371
|
+
'--encryption-keys', '10',
|
|
372
|
+
]
|
|
373
|
+
verifylist = [
|
|
374
|
+
('project', self.project.id),
|
|
375
|
+
('encryption_keys', 10)
|
|
376
|
+
]
|
|
377
|
+
|
|
378
|
+
with mock.patch('osc_lib.utils.find_resource') as mock_find_resource:
|
|
379
|
+
mock_find_resource.return_value = self.project
|
|
380
|
+
|
|
381
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
382
|
+
|
|
383
|
+
result = self.cmd.take_action(parsed_args)
|
|
384
|
+
self.quotas_mock.update.assert_called_with(
|
|
385
|
+
force=None,
|
|
386
|
+
gigabytes=None,
|
|
387
|
+
share_networks=None,
|
|
388
|
+
shares=None,
|
|
389
|
+
snapshot_gigabytes=None,
|
|
390
|
+
snapshots=None,
|
|
391
|
+
encryption_keys=10,
|
|
392
|
+
tenant_id=self.project.id,
|
|
393
|
+
user_id=None)
|
|
394
|
+
self.assertIsNone(result)
|
|
395
|
+
|
|
352
396
|
|
|
353
397
|
class TestQuotaShow(TestQuotas):
|
|
354
398
|
project = identity_fakes.FakeProject.create_one_project()
|
|
@@ -133,6 +133,7 @@ class TestShareCreate(TestShare):
|
|
|
133
133
|
snapshot_id=None,
|
|
134
134
|
scheduler_hints={},
|
|
135
135
|
mount_point_name=None,
|
|
136
|
+
encryption_key_ref=None,
|
|
136
137
|
)
|
|
137
138
|
|
|
138
139
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -182,6 +183,7 @@ class TestShareCreate(TestShare):
|
|
|
182
183
|
snapshot_id=None,
|
|
183
184
|
scheduler_hints={},
|
|
184
185
|
mount_point_name=None,
|
|
186
|
+
encryption_key_ref=None,
|
|
185
187
|
)
|
|
186
188
|
|
|
187
189
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -229,6 +231,7 @@ class TestShareCreate(TestShare):
|
|
|
229
231
|
scheduler_hints={'same_host': shares[0].id,
|
|
230
232
|
'different_host': shares[1].id},
|
|
231
233
|
mount_point_name=None,
|
|
234
|
+
encryption_key_ref=None,
|
|
232
235
|
)
|
|
233
236
|
|
|
234
237
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -271,6 +274,49 @@ class TestShareCreate(TestShare):
|
|
|
271
274
|
snapshot_id=None,
|
|
272
275
|
scheduler_hints={},
|
|
273
276
|
mount_point_name='fake_mp',
|
|
277
|
+
encryption_key_ref=None,
|
|
278
|
+
)
|
|
279
|
+
|
|
280
|
+
self.assertCountEqual(self.columns, columns)
|
|
281
|
+
self.assertCountEqual(self.datalist, data)
|
|
282
|
+
|
|
283
|
+
def test_share_create_encryption_key_ref(self):
|
|
284
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
285
|
+
"2.90")
|
|
286
|
+
|
|
287
|
+
encryption_key_ref = 'fake_ekr'
|
|
288
|
+
|
|
289
|
+
arglist = [
|
|
290
|
+
self.new_share.share_proto,
|
|
291
|
+
str(self.new_share.size),
|
|
292
|
+
'--share-type', self.share_type.id,
|
|
293
|
+
'--encryption-key-ref', encryption_key_ref,
|
|
294
|
+
]
|
|
295
|
+
verifylist = [
|
|
296
|
+
('share_proto', self.new_share.share_proto),
|
|
297
|
+
('size', self.new_share.size),
|
|
298
|
+
('encryption_key_ref', encryption_key_ref),
|
|
299
|
+
('share_type', self.share_type.id),
|
|
300
|
+
]
|
|
301
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
302
|
+
|
|
303
|
+
columns, data = self.cmd.take_action(parsed_args)
|
|
304
|
+
|
|
305
|
+
self.shares_mock.create.assert_called_with(
|
|
306
|
+
availability_zone=None,
|
|
307
|
+
description=None,
|
|
308
|
+
is_public=False,
|
|
309
|
+
metadata={},
|
|
310
|
+
name=None,
|
|
311
|
+
share_group_id=None,
|
|
312
|
+
share_network=None,
|
|
313
|
+
share_proto=self.new_share.share_proto,
|
|
314
|
+
share_type=self.share_type.id,
|
|
315
|
+
size=self.new_share.size,
|
|
316
|
+
snapshot_id=None,
|
|
317
|
+
scheduler_hints={},
|
|
318
|
+
mount_point_name=None,
|
|
319
|
+
encryption_key_ref=encryption_key_ref,
|
|
274
320
|
)
|
|
275
321
|
|
|
276
322
|
self.assertCountEqual(self.columns, columns)
|
|
@@ -315,6 +361,7 @@ class TestShareCreate(TestShare):
|
|
|
315
361
|
snapshot_id=self.share_snapshot.id,
|
|
316
362
|
scheduler_hints={},
|
|
317
363
|
mount_point_name=None,
|
|
364
|
+
encryption_key_ref=None,
|
|
318
365
|
)
|
|
319
366
|
self.assertCountEqual(self.columns, columns)
|
|
320
367
|
self.assertCountEqual(self.datalist, data)
|
|
@@ -352,6 +399,7 @@ class TestShareCreate(TestShare):
|
|
|
352
399
|
snapshot_id=None,
|
|
353
400
|
scheduler_hints={},
|
|
354
401
|
mount_point_name=None,
|
|
402
|
+
encryption_key_ref=None,
|
|
355
403
|
)
|
|
356
404
|
|
|
357
405
|
self.shares_mock.get.assert_called_with(self.new_share.id)
|
|
@@ -393,6 +441,7 @@ class TestShareCreate(TestShare):
|
|
|
393
441
|
snapshot_id=None,
|
|
394
442
|
scheduler_hints={},
|
|
395
443
|
mount_point_name=None,
|
|
444
|
+
encryption_key_ref=None,
|
|
396
445
|
)
|
|
397
446
|
|
|
398
447
|
mock_logger.error.assert_called_with(
|
|
@@ -701,6 +750,7 @@ class TestShareList(TestShare):
|
|
|
701
750
|
'export_location': None,
|
|
702
751
|
'name~': None,
|
|
703
752
|
'description~': None,
|
|
753
|
+
'encryption_key_ref': None,
|
|
704
754
|
}
|
|
705
755
|
return search_opts
|
|
706
756
|
|
|
@@ -977,6 +1027,7 @@ class TestShareList(TestShare):
|
|
|
977
1027
|
'Has Replicas',
|
|
978
1028
|
'Created At',
|
|
979
1029
|
'Properties',
|
|
1030
|
+
'Encryption Key Ref'
|
|
980
1031
|
]
|
|
981
1032
|
self.assertEqual(collist, cmd_columns)
|
|
982
1033
|
|
|
@@ -1008,7 +1059,8 @@ class TestShareList(TestShare):
|
|
|
1008
1059
|
self.new_share.replication_type,
|
|
1009
1060
|
self.new_share.has_replicas,
|
|
1010
1061
|
self.new_share.created_at,
|
|
1011
|
-
self.new_share.metadata
|
|
1062
|
+
self.new_share.metadata,
|
|
1063
|
+
self.new_share.encryption_key_ref
|
|
1012
1064
|
),)
|
|
1013
1065
|
|
|
1014
1066
|
self.assertEqual(data, tuple(cmd_data))
|
|
@@ -1103,6 +1155,23 @@ class TestShareList(TestShare):
|
|
|
1103
1155
|
self.cmd.take_action,
|
|
1104
1156
|
parsed_args)
|
|
1105
1157
|
|
|
1158
|
+
def test_list_share_encryption_key_ref_api_version_exception(self):
|
|
1159
|
+
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
1160
|
+
"2.89")
|
|
1161
|
+
arglist = [
|
|
1162
|
+
'--encryption-key-ref', 'fake',
|
|
1163
|
+
]
|
|
1164
|
+
verifylist = [
|
|
1165
|
+
('encryption_key_ref', 'fake'),
|
|
1166
|
+
]
|
|
1167
|
+
|
|
1168
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
1169
|
+
|
|
1170
|
+
self.assertRaises(
|
|
1171
|
+
osc_exceptions.CommandError,
|
|
1172
|
+
self.cmd.take_action,
|
|
1173
|
+
parsed_args)
|
|
1174
|
+
|
|
1106
1175
|
def test_list_share_api_version_exception(self):
|
|
1107
1176
|
self.app.client_manager.share.api_version = api_versions.APIVersion(
|
|
1108
1177
|
"2.35")
|
|
@@ -309,7 +309,11 @@ class TestShareBackupRestore(TestShareBackup):
|
|
|
309
309
|
self.share_backup = (
|
|
310
310
|
manila_fakes.FakeShareBackup.create_one_backup()
|
|
311
311
|
)
|
|
312
|
+
self.target_share = (
|
|
313
|
+
manila_fakes.FakeShare.create_one_share()
|
|
314
|
+
)
|
|
312
315
|
self.backups_mock.get.return_value = self.share_backup
|
|
316
|
+
self.shares_mock.get.return_value = self.target_share
|
|
313
317
|
self.cmd = osc_share_backups.RestoreShareBackup(
|
|
314
318
|
self.app, None)
|
|
315
319
|
|
|
@@ -325,6 +329,24 @@ class TestShareBackupRestore(TestShareBackup):
|
|
|
325
329
|
self.backups_mock.restore.assert_called_with(self.share_backup.id)
|
|
326
330
|
self.assertIsNone(result)
|
|
327
331
|
|
|
332
|
+
def test_share_backup_restore_to_target(self):
|
|
333
|
+
arglist = [
|
|
334
|
+
self.share_backup.id,
|
|
335
|
+
'--target-share', self.target_share.id
|
|
336
|
+
]
|
|
337
|
+
verifylist = [
|
|
338
|
+
('backup', self.share_backup.id),
|
|
339
|
+
('target_share', self.target_share.id),
|
|
340
|
+
]
|
|
341
|
+
|
|
342
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
343
|
+
result = self.cmd.take_action(parsed_args)
|
|
344
|
+
self.backups_mock.restore.assert_called_with(
|
|
345
|
+
self.share_backup.id,
|
|
346
|
+
target_share_id=self.target_share.id
|
|
347
|
+
)
|
|
348
|
+
self.assertIsNone(result)
|
|
349
|
+
|
|
328
350
|
|
|
329
351
|
class TestShareBackupSet(TestShareBackup):
|
|
330
352
|
|
|
@@ -20,6 +20,7 @@ from manilaclient.tests.unit.v2 import fakes
|
|
|
20
20
|
from manilaclient.v2 import share_backups
|
|
21
21
|
|
|
22
22
|
FAKE_BACKUP = 'fake_backup'
|
|
23
|
+
FAKE_TARGET_SHARE_ID = 'fake_target_share_id'
|
|
23
24
|
|
|
24
25
|
|
|
25
26
|
@ddt.ddt
|
|
@@ -30,7 +31,7 @@ class ShareBackupsTest(utils.TestCase):
|
|
|
30
31
|
|
|
31
32
|
def setUp(self):
|
|
32
33
|
super(ShareBackupsTest, self).setUp()
|
|
33
|
-
microversion = api_versions.APIVersion("2.
|
|
34
|
+
microversion = api_versions.APIVersion("2.91")
|
|
34
35
|
self.manager = share_backups.ShareBackupManager(
|
|
35
36
|
fakes.FakeClient(api_version=microversion))
|
|
36
37
|
|
|
@@ -58,7 +59,16 @@ class ShareBackupsTest(utils.TestCase):
|
|
|
58
59
|
with mock.patch.object(self.manager, '_action', mock.Mock()):
|
|
59
60
|
self.manager.restore(FAKE_BACKUP)
|
|
60
61
|
self.manager._action.assert_called_once_with(
|
|
61
|
-
'restore', FAKE_BACKUP)
|
|
62
|
+
'restore', FAKE_BACKUP, info=None)
|
|
63
|
+
|
|
64
|
+
def test_restore_to_target(self):
|
|
65
|
+
with mock.patch.object(self.manager, '_action', mock.Mock()):
|
|
66
|
+
self.manager.restore(
|
|
67
|
+
FAKE_BACKUP,
|
|
68
|
+
target_share_id=FAKE_TARGET_SHARE_ID
|
|
69
|
+
)
|
|
70
|
+
self.manager._action.assert_called_once_with(
|
|
71
|
+
'restore', FAKE_BACKUP, info=FAKE_TARGET_SHARE_ID)
|
|
62
72
|
|
|
63
73
|
def test_list(self):
|
|
64
74
|
with mock.patch.object(self.manager, '_list', mock.Mock()):
|
|
@@ -163,6 +163,29 @@ class SharesTest(utils.TestCase):
|
|
|
163
163
|
cs.shares.create('nfs', 1, mount_point_name=mount_point_name)
|
|
164
164
|
cs.assert_called('POST', '/shares', body)
|
|
165
165
|
|
|
166
|
+
@ddt.data({'encryption_key_ref': 'fake_key1'},
|
|
167
|
+
{'encryption_key_ref': 'fake_key2'})
|
|
168
|
+
@ddt.unpack
|
|
169
|
+
def test_create_share_with_encryption_key_ref(self, encryption_key_ref):
|
|
170
|
+
body = {
|
|
171
|
+
'share': {
|
|
172
|
+
'is_public': False,
|
|
173
|
+
'share_type': None,
|
|
174
|
+
'name': None,
|
|
175
|
+
'snapshot_id': None,
|
|
176
|
+
'description': None,
|
|
177
|
+
'metadata': {},
|
|
178
|
+
'share_proto': 'nfs',
|
|
179
|
+
'share_network_id': None,
|
|
180
|
+
'size': 1,
|
|
181
|
+
'availability_zone': None,
|
|
182
|
+
'scheduler_hints': {},
|
|
183
|
+
'encryption_key_ref': encryption_key_ref,
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
cs.shares.create('nfs', 1, encryption_key_ref=encryption_key_ref)
|
|
187
|
+
cs.assert_called('POST', '/shares', body)
|
|
188
|
+
|
|
166
189
|
@ddt.data(
|
|
167
190
|
type('ShareUUID', (object, ), {'uuid': '1234'}),
|
|
168
191
|
type('ShareID', (object, ), {'id': '1234'}),
|
manilaclient/v2/quotas.py
CHANGED
|
@@ -94,7 +94,7 @@ class QuotaSetManager(base.ManagerWithFind):
|
|
|
94
94
|
force=None, user_id=None, share_type=None,
|
|
95
95
|
share_groups=None, share_group_snapshots=None,
|
|
96
96
|
share_replicas=None, replica_gigabytes=None,
|
|
97
|
-
per_share_gigabytes=None,
|
|
97
|
+
per_share_gigabytes=None, encryption_keys=None,
|
|
98
98
|
resource_path=RESOURCE_PATH):
|
|
99
99
|
self._check_user_id_and_share_type_args(user_id, share_type)
|
|
100
100
|
body = {
|
|
@@ -111,6 +111,7 @@ class QuotaSetManager(base.ManagerWithFind):
|
|
|
111
111
|
'share_replicas': share_replicas,
|
|
112
112
|
'replica_gigabytes': replica_gigabytes,
|
|
113
113
|
'per_share_gigabytes': per_share_gigabytes,
|
|
114
|
+
'encryption_keys': encryption_keys,
|
|
114
115
|
},
|
|
115
116
|
}
|
|
116
117
|
|
|
@@ -202,7 +203,7 @@ class QuotaSetManager(base.ManagerWithFind):
|
|
|
202
203
|
resource_path=RESOURCE_PATH
|
|
203
204
|
)
|
|
204
205
|
|
|
205
|
-
@api_versions.wraps("2.62") # noqa
|
|
206
|
+
@api_versions.wraps("2.62", "2.89") # noqa
|
|
206
207
|
def update(self, tenant_id, user_id=None, share_type=None, # noqa
|
|
207
208
|
shares=None, snapshots=None, gigabytes=None,
|
|
208
209
|
snapshot_gigabytes=None, share_networks=None,
|
|
@@ -222,6 +223,27 @@ class QuotaSetManager(base.ManagerWithFind):
|
|
|
222
223
|
resource_path=RESOURCE_PATH
|
|
223
224
|
)
|
|
224
225
|
|
|
226
|
+
@api_versions.wraps("2.90") # noqa
|
|
227
|
+
def update(self, tenant_id, user_id=None, share_type=None, # noqa
|
|
228
|
+
shares=None, snapshots=None, gigabytes=None,
|
|
229
|
+
snapshot_gigabytes=None, share_networks=None,
|
|
230
|
+
share_groups=None, share_group_snapshots=None,
|
|
231
|
+
share_replicas=None, replica_gigabytes=None, force=None,
|
|
232
|
+
per_share_gigabytes=None, encryption_keys=None):
|
|
233
|
+
self._validate_st_and_sn_in_same_request(share_type, share_networks)
|
|
234
|
+
return self._do_update(
|
|
235
|
+
tenant_id, shares, snapshots, gigabytes, snapshot_gigabytes,
|
|
236
|
+
share_networks, force, user_id,
|
|
237
|
+
share_type=share_type,
|
|
238
|
+
share_groups=share_groups,
|
|
239
|
+
share_group_snapshots=share_group_snapshots,
|
|
240
|
+
share_replicas=share_replicas,
|
|
241
|
+
replica_gigabytes=replica_gigabytes,
|
|
242
|
+
per_share_gigabytes=per_share_gigabytes,
|
|
243
|
+
encryption_keys=encryption_keys,
|
|
244
|
+
resource_path=RESOURCE_PATH
|
|
245
|
+
)
|
|
246
|
+
|
|
225
247
|
@api_versions.wraps("1.0", "2.6")
|
|
226
248
|
def defaults(self, tenant_id):
|
|
227
249
|
return self._get(
|
manilaclient/v2/share_backups.py
CHANGED
|
@@ -110,10 +110,15 @@ class ShareBackupManager(base.ManagerWithFind):
|
|
|
110
110
|
url = RESOURCE_PATH % backup_id
|
|
111
111
|
self._delete(url)
|
|
112
112
|
|
|
113
|
-
@api_versions.wraps("2.80")
|
|
113
|
+
@api_versions.wraps("2.80", "2.90")
|
|
114
|
+
@api_versions.experimental_api
|
|
115
|
+
def restore(self, backup_id):
|
|
116
|
+
return self._action('restore', backup_id)
|
|
117
|
+
|
|
118
|
+
@api_versions.wraps("2.91")
|
|
114
119
|
@api_versions.experimental_api
|
|
115
|
-
def restore(self,
|
|
116
|
-
return self._action('restore',
|
|
120
|
+
def restore(self, backup_id, target_share_id=None): # noqa F811
|
|
121
|
+
return self._action('restore', backup_id, info=target_share_id)
|
|
117
122
|
|
|
118
123
|
@api_versions.wraps("2.80")
|
|
119
124
|
@api_versions.experimental_api
|
manilaclient/v2/shares.py
CHANGED
|
@@ -125,7 +125,7 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
125
125
|
description=None, metadata=None, share_network=None,
|
|
126
126
|
share_type=None, is_public=False, availability_zone=None,
|
|
127
127
|
share_group_id=None, scheduler_hints=None, return_raw=False,
|
|
128
|
-
mount_point_name=None):
|
|
128
|
+
mount_point_name=None, encryption_key_ref=None):
|
|
129
129
|
"""Create a share.
|
|
130
130
|
|
|
131
131
|
:param share_proto: text - share protocol for new share available
|
|
@@ -146,6 +146,8 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
146
146
|
:param mount_point_name: text - share human-readable mount point name.
|
|
147
147
|
This name will be reflected in export location once
|
|
148
148
|
share is created.
|
|
149
|
+
:param encryption_key_ref: text - encryption key reference, i.e. UUID
|
|
150
|
+
of the secret stored in the key manager.
|
|
149
151
|
:rtype: :class:`Share`
|
|
150
152
|
"""
|
|
151
153
|
share_metadata = metadata if metadata is not None else dict()
|
|
@@ -170,6 +172,9 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
170
172
|
if mount_point_name:
|
|
171
173
|
body['mount_point_name'] = mount_point_name
|
|
172
174
|
|
|
175
|
+
if encryption_key_ref:
|
|
176
|
+
body['encryption_key_ref'] = encryption_key_ref
|
|
177
|
+
|
|
173
178
|
return self._create('/shares', {'share': body}, 'share',
|
|
174
179
|
return_raw=return_raw)
|
|
175
180
|
|
|
@@ -356,6 +361,7 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
356
361
|
search_opts = search_opts or {}
|
|
357
362
|
search_opts.pop("export_location", None)
|
|
358
363
|
search_opts.pop("is_soft_deleted", None)
|
|
364
|
+
search_opts.pop("encryption_key_ref", None)
|
|
359
365
|
return self.do_list(detailed=detailed, search_opts=search_opts,
|
|
360
366
|
sort_key=sort_key, sort_dir=sort_dir,
|
|
361
367
|
return_raw=return_raw)
|
|
@@ -367,11 +373,22 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
367
373
|
if search_opts is None:
|
|
368
374
|
search_opts = {}
|
|
369
375
|
search_opts.pop("is_soft_deleted", None)
|
|
376
|
+
search_opts.pop("encryption_key_ref", None)
|
|
377
|
+
return self.do_list(detailed=detailed, search_opts=search_opts,
|
|
378
|
+
sort_key=sort_key, sort_dir=sort_dir,
|
|
379
|
+
return_raw=return_raw)
|
|
380
|
+
|
|
381
|
+
@api_versions.wraps("2.69", "2.89") # noqa
|
|
382
|
+
def list(self, detailed=True, search_opts=None, # noqa
|
|
383
|
+
sort_key=None, sort_dir=None, return_raw=False):
|
|
384
|
+
"""Get a list of all shares."""
|
|
385
|
+
search_opts = search_opts or {}
|
|
386
|
+
search_opts.pop("encryption_key_ref", None)
|
|
370
387
|
return self.do_list(detailed=detailed, search_opts=search_opts,
|
|
371
388
|
sort_key=sort_key, sort_dir=sort_dir,
|
|
372
389
|
return_raw=return_raw)
|
|
373
390
|
|
|
374
|
-
@api_versions.wraps("2.
|
|
391
|
+
@api_versions.wraps("2.90") # noqa
|
|
375
392
|
def list(self, detailed=True, search_opts=None, # noqa
|
|
376
393
|
sort_key=None, sort_dir=None, return_raw=False):
|
|
377
394
|
"""Get a list of all shares."""
|
|
@@ -400,6 +417,7 @@ class ShareManager(base.MetadataCapableManager):
|
|
|
400
417
|
- (('share_type_id', 'share_type'), text)
|
|
401
418
|
- (('snapshot_id', 'snapshot'), text)
|
|
402
419
|
- ('is_soft_deleted', bool)
|
|
420
|
+
- ('encryption_key_ref', text)
|
|
403
421
|
Note, that member context will have restricted set of
|
|
404
422
|
available search opts. For admin context filtering also available
|
|
405
423
|
by each share attr from its Model. So, this list is not full for
|
|
@@ -23,6 +23,7 @@ ChangBo Guo(gcb) <eric.guo@easystack.cn>
|
|
|
23
23
|
Chen <dstbtgagt@foxmail.com>
|
|
24
24
|
Chris MacNaughton <chris.macnaughton@canonical.com>
|
|
25
25
|
Christian Berendt <berendt@b1-systems.de>
|
|
26
|
+
Chuan Miao <chuan.miao@sap.com>
|
|
26
27
|
Chuck Fouts <fchuck@netapp.com>
|
|
27
28
|
Clifford <emclidon@gmail.com>
|
|
28
29
|
Clifford Emeka <emclidon@gmail.com>
|
|
@@ -91,6 +92,7 @@ OpenStack Release Bot <infra-root@openstack.org>
|
|
|
91
92
|
Pete Zaitcev <zaitcev@kotori.zaitcev.us>
|
|
92
93
|
Pierre Riteau <pierre@stackhpc.com>
|
|
93
94
|
Ramana Raja <rraja@redhat.com>
|
|
95
|
+
Riane Torres <riane.torres@gmail.com>
|
|
94
96
|
Rodrigo Barbieri <rodrigo.barbieri@fit-tecnologia.org.br>
|
|
95
97
|
Rodrigo Barbieri <rodrigob@netapp.com>
|
|
96
98
|
Sascha Peilicke <speilicke@suse.com>
|
|
@@ -120,6 +122,7 @@ Xing Yang <xing.yang@emc.com>
|
|
|
120
122
|
Your Name <vponomaryov@mirantis.com>
|
|
121
123
|
YuehuiLei <leiyuehui-s@inspur.com>
|
|
122
124
|
Yulia Portnova <yportnova@mirantis.com>
|
|
125
|
+
Zachary Goggin <zachary.goggin@cern.ch>
|
|
123
126
|
altanai <tara181989@gmail.com>
|
|
124
127
|
andrebeltrami <andreluizbeltrami@hotmail.com>
|
|
125
128
|
annwesha.das <annwesha.das@ndsu.edu>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: python-manilaclient
|
|
3
|
-
Version: 5.
|
|
3
|
+
Version: 5.6.0
|
|
4
4
|
Summary: Client library for OpenStack Manila API.
|
|
5
5
|
Home-page: https://docs.openstack.org/python-manilaclient/latest/
|
|
6
6
|
Author: OpenStack
|
|
@@ -15,11 +15,10 @@ Classifier: Operating System :: OS Independent
|
|
|
15
15
|
Classifier: Programming Language :: Python
|
|
16
16
|
Classifier: Programming Language :: Python :: 3 :: Only
|
|
17
17
|
Classifier: Programming Language :: Python :: 3
|
|
18
|
-
Classifier: Programming Language :: Python :: 3.9
|
|
19
18
|
Classifier: Programming Language :: Python :: 3.10
|
|
20
19
|
Classifier: Programming Language :: Python :: 3.11
|
|
21
20
|
Classifier: Programming Language :: Python :: 3.12
|
|
22
|
-
Requires-Python: >=3.
|
|
21
|
+
Requires-Python: >=3.10
|
|
23
22
|
License-File: LICENSE
|
|
24
23
|
License-File: AUTHORS
|
|
25
24
|
Requires-Dist: pbr >=3.0.0
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
manilaclient/__init__.py,sha256=yLvujNabAf28-BYLBD9MEqkumXr9nfohOAOgvce5qxA,1248
|
|
2
|
-
manilaclient/api_versions.py,sha256=
|
|
2
|
+
manilaclient/api_versions.py,sha256=fmel6NDKmGLZtktum2iLRX5FLSrbpMTCwtOmyTLpKb4,15186
|
|
3
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
|
|
@@ -16,18 +16,18 @@ manilaclient/common/apiclient/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
|
|
|
16
16
|
manilaclient/common/apiclient/exceptions.py,sha256=Qy3Z84h8bpbhS3OqdNjOg1FVcmy4VxF5lh-xsYr5F6c,12887
|
|
17
17
|
manilaclient/common/apiclient/utils.py,sha256=gP33HSR7G-jaAMtQ32seO_yK84VolsFSqymtzSUg8jE,2781
|
|
18
18
|
manilaclient/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
19
|
-
manilaclient/osc/plugin.py,sha256=
|
|
19
|
+
manilaclient/osc/plugin.py,sha256=FBBENFy5D0ErtXS9ZztYjmU_iRTA8j2SU3XdKuzX2R8,4768
|
|
20
20
|
manilaclient/osc/utils.py,sha256=2CcJ70UZ1zxYRVBGCjA3urVCM9yFUQ6-XG4yiu1BsD4,4021
|
|
21
21
|
manilaclient/osc/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
22
22
|
manilaclient/osc/v2/availability_zones.py,sha256=hJAcEhqcxwbto8fFlgESbLHmfguYmbUrA2i9s7ZURe0,1310
|
|
23
23
|
manilaclient/osc/v2/messages.py,sha256=Z_nM0b7GWbYUFf2T-d2q8yWNT4eroYDv1c3LeJsdHU4,6631
|
|
24
|
-
manilaclient/osc/v2/quotas.py,sha256=
|
|
24
|
+
manilaclient/osc/v2/quotas.py,sha256=dB2wlioEqPQP0EYsneHX-fJBYSzGzpBGMXs4XKBVbvc,15423
|
|
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=CNZweoQqbAdoViU2Q00PYK2PKUrt4B253JzqYeA0YbM,6629
|
|
28
|
-
manilaclient/osc/v2/share.py,sha256=
|
|
28
|
+
manilaclient/osc/v2/share.py,sha256=YsDmhEA_bjQps2ufpIhve-sr2C4Ld8Lo14YzEwwaH6s,59494
|
|
29
29
|
manilaclient/osc/v2/share_access_rules.py,sha256=AA3_XdgcZgRA9s5ehrWfYcixVpZSG51cKpFf4ICtiBc,18927
|
|
30
|
-
manilaclient/osc/v2/share_backups.py,sha256=
|
|
30
|
+
manilaclient/osc/v2/share_backups.py,sha256=_YLuIi-nRf1pbM8VIW4L0DIQ_mO2J1I07hobPo8qFfg,15470
|
|
31
31
|
manilaclient/osc/v2/share_group_snapshots.py,sha256=Vkq2vK0K7vaDxKl3TBVm_xMWpJZRfn80JIqusLoFiWY,14824
|
|
32
32
|
manilaclient/osc/v2/share_group_type_access.py,sha256=FDCjx8V8dgAb3TMRvFaPHPURrhq1pT2oupo1qcLD8u0,6315
|
|
33
33
|
manilaclient/osc/v2/share_group_types.py,sha256=KiKZ4kylCh-vOUI6PhZjGK6n-oqwOxqLgz4B8p_aYVk,11713
|
|
@@ -81,10 +81,10 @@ manilaclient/tests/functional/utils.py,sha256=VJDsDterboa_JzM2h6x-ZPckAf5RDrlbhO
|
|
|
81
81
|
manilaclient/tests/functional/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
82
82
|
manilaclient/tests/functional/osc/base.py,sha256=-Q23mnx_xzI5KuH6HYA9K42HdVxEnwqYpXdihGULyHs,17567
|
|
83
83
|
manilaclient/tests/functional/osc/test_availability_zones.py,sha256=qzxGjDWVFjPo257L3hweSIB4RFb0MoS6gdaizqh3Q0o,980
|
|
84
|
-
manilaclient/tests/functional/osc/test_messages.py,sha256=
|
|
84
|
+
manilaclient/tests/functional/osc/test_messages.py,sha256=mr8SusJ3_sbP9KgTl9X9CZzPbKPHi0-mYYDXngg8WvY,4510
|
|
85
85
|
manilaclient/tests/functional/osc/test_resource_locks.py,sha256=P0G5lwywHiISslT4KLMP0vftfc5F2cbIZ5jbp5kChoY,7076
|
|
86
86
|
manilaclient/tests/functional/osc/test_share_access_rules.py,sha256=fhN8gGB6PuPBjgKZmDO0MYEzMIR0gE7-lrXBmGZtZdI,9917
|
|
87
|
-
manilaclient/tests/functional/osc/test_share_backups.py,sha256=
|
|
87
|
+
manilaclient/tests/functional/osc/test_share_backups.py,sha256=MtKQBfB_diRYTeDpTMqnRwgiqouLyaEX3gHzAAtxasQ,5764
|
|
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
90
|
manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256=SsLJmC2ZFyNFQiTFowzRTdoQDaaxoFA0traZdl8Pnvc,1414
|
|
@@ -114,16 +114,16 @@ 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=aS99QvL_2yTbGpP-_oWLy-RBSTruX_2A6S3qa0QUGoM,51842
|
|
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
|
-
manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=
|
|
120
|
+
manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=CH4hequCXVgEDkX9wbGwRtQ1thvf_UzcEnFdr1sI1tM,17740
|
|
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=VOS29A3XPkZ_e3s-Gpl0kaWg1OO0PIyMIjXhJnwWsro,11077
|
|
124
|
-
manilaclient/tests/unit/osc/v2/test_share.py,sha256=
|
|
124
|
+
manilaclient/tests/unit/osc/v2/test_share.py,sha256=LXKOId3fk9U1FwAed1WJ6B1GbByj1jXXE0Cu4laEnsc,76818
|
|
125
125
|
manilaclient/tests/unit/osc/v2/test_share_access_rules.py,sha256=jXA3cFftznP9H9GlANzvQD1Z_dLw8byKOSAKNnZS6gg,21067
|
|
126
|
-
manilaclient/tests/unit/osc/v2/test_share_backups.py,sha256=
|
|
126
|
+
manilaclient/tests/unit/osc/v2/test_share_backups.py,sha256=AX0sB6O7I5wHa18Bee_l8FVkMZjrKW_RdOhQi8nv5OY,14402
|
|
127
127
|
manilaclient/tests/unit/osc/v2/test_share_group_snapshots.py,sha256=zkchulCEXnzHQxgoVJmSo_LffCnPO2kEAu81sKHiL-8,21560
|
|
128
128
|
manilaclient/tests/unit/osc/v2/test_share_group_type.py,sha256=WCIdqbXqtsWsWZK7CSKkmI1X_8DMb-PR6ZeuTAwtkos,17697
|
|
129
129
|
manilaclient/tests/unit/osc/v2/test_share_group_type_access.py,sha256=d5vgr-B7YhunFjvBpCT2_DlWf7Ob_aIMCHKyx6EmjUQ,6874
|
|
@@ -167,7 +167,7 @@ manilaclient/tests/unit/v2/test_quotas.py,sha256=cTTQ3Y80vMOcaSdHKLBduObiMOnsiju
|
|
|
167
167
|
manilaclient/tests/unit/v2/test_scheduler_stats.py,sha256=lBT_S-MCEfp8xhdKdMfyLZc7pzuLfajDTHWsP_g8wz0,2962
|
|
168
168
|
manilaclient/tests/unit/v2/test_security_services.py,sha256=TTcvUFYE7dVChhPzaUGrrnRQDXgmNnfMLeIADEYtyKU,8545
|
|
169
169
|
manilaclient/tests/unit/v2/test_services.py,sha256=8jH2B1B2pUswxz2HVWKdEhR5kL3dQIzGBJZDhCbQcuA,4053
|
|
170
|
-
manilaclient/tests/unit/v2/test_share_backups.py,sha256=
|
|
170
|
+
manilaclient/tests/unit/v2/test_share_backups.py,sha256=ZqUEV65CsddFGfxm2wzZaHrf6NK4OqsfAniOQWeURB8,4025
|
|
171
171
|
manilaclient/tests/unit/v2/test_share_export_locations.py,sha256=os6jrWQp8TKCN1XIX3BMgcT-_Qd5L0iLrH7bLEaI4hM,1945
|
|
172
172
|
manilaclient/tests/unit/v2/test_share_group_snapshots.py,sha256=1xfGiwlw7dp_ePCGxtzGlrii1AcSrBQCD7BhmCkw208,9947
|
|
173
173
|
manilaclient/tests/unit/v2/test_share_group_type_access.py,sha256=FVzQEeEtWCV6pu6XpZGqCORuqOAIU4cGyx5Q2obbFp4,4083
|
|
@@ -185,7 +185,7 @@ 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=
|
|
188
|
+
manilaclient/tests/unit/v2/test_shares.py,sha256=AxlaRBhaWyngxdgTXyx_s_0QrHeHc3JGeIC6nNwachQ,32086
|
|
189
189
|
manilaclient/tests/unit/v2/test_shell.py,sha256=E5VaLtgQ6oP8zGb55YT18ck7eXuM83z737X67kKAUJA,170729
|
|
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
|
|
@@ -211,13 +211,13 @@ manilaclient/v2/client.py,sha256=Xv5BvKTfS9DkJ3i5DFcreTkbJBz-Jo9WLkJSjipU1JI,124
|
|
|
211
211
|
manilaclient/v2/limits.py,sha256=6uB-OB5vwwLRS4r_hHm0WgzDLKL_92nTeSMcwtWONBQ,2873
|
|
212
212
|
manilaclient/v2/messages.py,sha256=Qge4eIsoVyXG0ZuNKpF9qJOKgtpEWk8pcHj74zhaChI,2710
|
|
213
213
|
manilaclient/v2/quota_classes.py,sha256=vlO2C_D5mNmHaYQNpZpcifvO3ls2QKIW9stQ6uw8qis,6071
|
|
214
|
-
manilaclient/v2/quotas.py,sha256=
|
|
214
|
+
manilaclient/v2/quotas.py,sha256=nPIY7miNZe5cSvFf_QdmjewCtCDVinWSyDLeYxSsikA,12163
|
|
215
215
|
manilaclient/v2/resource_locks.py,sha256=ocB21rxZEUXR5DHOkCuKetta5GEC5oTkAKSo4GPPOpw,4713
|
|
216
216
|
manilaclient/v2/scheduler_stats.py,sha256=jPaDyUqZkHy9DPMHM-nqWKTv-Yii9Qh6YNAy-qqWp_U,1528
|
|
217
217
|
manilaclient/v2/security_services.py,sha256=xhUWdfcd6O3cq0OTjASSpTpUseUeoOgZkwBH2TqdJYM,9732
|
|
218
218
|
manilaclient/v2/services.py,sha256=Ap0eAxkI2tx8bdZtc_Hshb3THkAj4hiXU_xTenuSAKc,3942
|
|
219
219
|
manilaclient/v2/share_access_rules.py,sha256=BbvKA67sapvUFvIo4cOXc2Yv3kkWdImoUJ7fPJE7wFg,3583
|
|
220
|
-
manilaclient/v2/share_backups.py,sha256=
|
|
220
|
+
manilaclient/v2/share_backups.py,sha256=KEKWRRvC-wwh9XktIUPlzFmLZt-xdBnmY9Numi02M7g,5054
|
|
221
221
|
manilaclient/v2/share_export_locations.py,sha256=w72EE6-gQrD69-E4T8pZ4_oalz5lUEKIODCD2TQrRz8,2782
|
|
222
222
|
manilaclient/v2/share_group_snapshots.py,sha256=HmUUC3lbTKeD0j2fB-FyJANbIa3rl3PIThvcvSWsQFo,9326
|
|
223
223
|
manilaclient/v2/share_group_type_access.py,sha256=cbBVrZmfP-U-eqyE0OHUbs0Qlt2yHnJfQlQINetUnOo,3695
|
|
@@ -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=
|
|
240
|
+
manilaclient/v2/shares.py,sha256=4vxQnTe7n-KFC0npMultocCtqG4PRnMwKuU6pDsyDQc,33026
|
|
241
241
|
manilaclient/v2/shell.py,sha256=IrbBbyo5ixaSgqxbM21EKGkoxnbAA5k0R-HXl50nboM,227987
|
|
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-5.
|
|
245
|
-
python_manilaclient-5.
|
|
246
|
-
python_manilaclient-5.
|
|
247
|
-
python_manilaclient-5.
|
|
248
|
-
python_manilaclient-5.
|
|
249
|
-
python_manilaclient-5.
|
|
250
|
-
python_manilaclient-5.
|
|
251
|
-
python_manilaclient-5.
|
|
244
|
+
python_manilaclient-5.6.0.dist-info/AUTHORS,sha256=6KgHznVoMua0hMTSiTavwa4xCe-coH5O_PwXcsRbHlY,7697
|
|
245
|
+
python_manilaclient-5.6.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
|
|
246
|
+
python_manilaclient-5.6.0.dist-info/METADATA,sha256=zKdjSI3tH2gIrzuoq0JlGcTZ6s_fGUR16ilob77aFiY,5399
|
|
247
|
+
python_manilaclient-5.6.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
|
|
248
|
+
python_manilaclient-5.6.0.dist-info/entry_points.txt,sha256=784yGhnBUEO4dXa2jFZzNs0M5HfOgESGrokIwmY3GDA,11861
|
|
249
|
+
python_manilaclient-5.6.0.dist-info/pbr.json,sha256=X5VHWgnPwMJV3zCTK0GavCDqr5eWkAFJj6NnxCZOES0,46
|
|
250
|
+
python_manilaclient-5.6.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
|
|
251
|
+
python_manilaclient-5.6.0.dist-info/RECORD,,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"git_version": "b5292dc", "is_release": true}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"git_version": "6f725e0", "is_release": true}
|
|
File without changes
|
{python_manilaclient-5.4.0.dist-info → python_manilaclient-5.6.0.dist-info}/entry_points.txt
RENAMED
|
File without changes
|
|
File without changes
|