python-manilaclient 6.1.0__py3-none-any.whl → 6.2.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.
@@ -29,7 +29,7 @@ from manilaclient import utils
29
29
 
30
30
  LOG = logging.getLogger(__name__)
31
31
 
32
- MAX_VERSION = '2.95'
32
+ MAX_VERSION = '2.96'
33
33
  MIN_VERSION = '2.0'
34
34
  DEPRECATED_VERSION = '1.0'
35
35
  _VERSIONED_METHOD_MAP = {}
@@ -181,3 +181,5 @@ REPLICA_PRE_GRADUATION_VERSION = '2.55'
181
181
  SHARE_TRANSFER_VERSION = '2.77'
182
182
  RESOURCE_LOCK_VERSION = '2.81'
183
183
  QOS_TYPE_VERSION = '2.94'
184
+ SHARE_MIGRATION_GRADUATION_VERSION = '2.96'
185
+ SHARE_MIGRATION_PRE_GRADUATION_VERSION = '2.95'
@@ -297,6 +297,19 @@ class ListShareReplica(command.Lister):
297
297
  'availability_zone',
298
298
  'updated_at',
299
299
  ]
300
+
301
+ if share_client.api_version >= api_versions.APIVersion("2.95"):
302
+ for replica in replicas:
303
+ replica._info.update(
304
+ {
305
+ 'properties': format_columns.DictColumn(
306
+ replica._info.pop('metadata', {})
307
+ ),
308
+ },
309
+ )
310
+
311
+ columns += ['properties']
312
+
300
313
  column_headers = utils.format_column_headers(columns)
301
314
  data = (
302
315
  osc_utils.get_dict_properties(replica._info, columns)
@@ -75,7 +75,7 @@ class TestShare(osc_utils.TestCommand):
75
75
  endpoint=osc_fakes.AUTH_URL, token=osc_fakes.AUTH_TOKEN
76
76
  )
77
77
 
78
- self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
78
+ self.app.client_manager.identity = identity_fakes.FakeIdentityClient(
79
79
  endpoint=osc_fakes.AUTH_URL, token=osc_fakes.AUTH_TOKEN
80
80
  )
81
81
 
@@ -12,6 +12,7 @@
12
12
  #
13
13
  from unittest import mock
14
14
 
15
+ from osc_lib.cli import format_columns
15
16
  from osc_lib import exceptions
16
17
  from osc_lib import utils as oscutils
17
18
 
@@ -421,6 +422,7 @@ class TestShareReplicaList(TestShareReplica):
421
422
  'host',
422
423
  'availability_zone',
423
424
  'updated_at',
425
+ 'properties',
424
426
  ]
425
427
 
426
428
  column_headers = utils.format_column_headers(columns)
@@ -471,6 +473,45 @@ class TestShareReplicaList(TestShareReplica):
471
473
  self.assertEqual(self.column_headers, columns)
472
474
  self.assertEqual(list(self.values), list(data))
473
475
 
476
+ def test_share_replica_list_with_properties_column(self):
477
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
478
+ "2.95"
479
+ )
480
+ metadata = {'replication_policy': 'Sync'}
481
+ self.replicas_list = (
482
+ manila_fakes.FakeShareReplica.create_share_replicas(
483
+ attrs={'metadata': metadata}, count=2
484
+ )
485
+ )
486
+ self.replicas_mock.list.return_value = self.replicas_list
487
+
488
+ arglist = []
489
+ verifylist = []
490
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
491
+
492
+ columns, data = self.cmd.take_action(parsed_args)
493
+
494
+ self.assertEqual(self.column_headers, columns)
495
+
496
+ data_list = list(data)
497
+ self.assertEqual(2, len(data_list))
498
+ for row in data_list:
499
+ props = row[-1]
500
+ self.assertIsInstance(props, format_columns.DictColumn)
501
+ self.assertEqual({'replication_policy': 'Sync'}, props._value)
502
+
503
+ def test_share_replica_list_without_properties_column(self):
504
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
505
+ "2.94"
506
+ )
507
+ arglist = []
508
+ verifylist = []
509
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
510
+
511
+ columns, data = self.cmd.take_action(parsed_args)
512
+
513
+ self.assertNotIn('Properties', columns)
514
+
474
515
 
475
516
  class TestShareReplicaShow(TestShareReplica):
476
517
  def setUp(self):
manilaclient/v2/shares.py CHANGED
@@ -208,7 +208,9 @@ class ShareManager(base.MetadataCapableManager):
208
208
  '/shares', {'share': body}, 'share', return_raw=return_raw
209
209
  )
210
210
 
211
- @api_versions.wraps("2.29")
211
+ @api_versions.wraps(
212
+ "2.29", constants.SHARE_MIGRATION_PRE_GRADUATION_VERSION
213
+ )
212
214
  @api_versions.experimental_api
213
215
  def migration_start(
214
216
  self,
@@ -221,6 +223,55 @@ class ShareManager(base.MetadataCapableManager):
221
223
  preserve_snapshots,
222
224
  new_share_network_id=None,
223
225
  new_share_type_id=None,
226
+ ):
227
+ return self._migration_start(
228
+ share,
229
+ host,
230
+ force_host_assisted_migration,
231
+ preserve_metadata,
232
+ writable,
233
+ nondisruptive,
234
+ preserve_snapshots,
235
+ new_share_network_id,
236
+ new_share_type_id,
237
+ )
238
+
239
+ @api_versions.wraps(constants.SHARE_MIGRATION_GRADUATION_VERSION) # noqa
240
+ def migration_start( # noqa F811
241
+ self,
242
+ share,
243
+ host,
244
+ force_host_assisted_migration,
245
+ preserve_metadata,
246
+ writable,
247
+ nondisruptive,
248
+ preserve_snapshots,
249
+ new_share_network_id=None,
250
+ new_share_type_id=None,
251
+ ):
252
+ return self._migration_start(
253
+ share,
254
+ host,
255
+ force_host_assisted_migration,
256
+ preserve_metadata,
257
+ writable,
258
+ nondisruptive,
259
+ preserve_snapshots,
260
+ new_share_network_id,
261
+ new_share_type_id,
262
+ )
263
+
264
+ def _migration_start(
265
+ self,
266
+ share,
267
+ host,
268
+ force_host_assisted_migration,
269
+ preserve_metadata,
270
+ writable,
271
+ nondisruptive,
272
+ preserve_snapshots,
273
+ new_share_network_id=None,
274
+ new_share_type_id=None,
224
275
  ):
225
276
  return self._action(
226
277
  "migration_start",
@@ -237,7 +288,9 @@ class ShareManager(base.MetadataCapableManager):
237
288
  },
238
289
  )
239
290
 
240
- @api_versions.wraps("2.22")
291
+ @api_versions.wraps(
292
+ "2.22", constants.SHARE_MIGRATION_PRE_GRADUATION_VERSION
293
+ )
241
294
  @api_versions.experimental_api
242
295
  def reset_task_state(self, share, task_state):
243
296
  """Update the provided share with the provided task state.
@@ -245,11 +298,25 @@ class ShareManager(base.MetadataCapableManager):
245
298
  :param share: either share object or text with its ID.
246
299
  :param task_state: text with new task state to set for share.
247
300
  """
301
+ return self._reset_task_state(share, task_state)
302
+
303
+ @api_versions.wraps(constants.SHARE_MIGRATION_GRADUATION_VERSION) # noqa
304
+ def reset_task_state(self, share, task_state): # noqa F811
305
+ """Update the provided share with the provided task state.
306
+
307
+ :param share: either share object or text with its ID.
308
+ :param task_state: text with new task state to set for share.
309
+ """
310
+ return self._reset_task_state(share, task_state)
311
+
312
+ def _reset_task_state(self, share, task_state):
248
313
  return self._action(
249
314
  'reset_task_state', share, {"task_state": task_state}
250
315
  )
251
316
 
252
- @api_versions.wraps("2.22")
317
+ @api_versions.wraps(
318
+ "2.22", constants.SHARE_MIGRATION_PRE_GRADUATION_VERSION
319
+ )
253
320
  @api_versions.experimental_api
254
321
  def migration_complete(self, share):
255
322
  """Completes migration for a given share.
@@ -258,7 +325,17 @@ class ShareManager(base.MetadataCapableManager):
258
325
  """
259
326
  return self._action('migration_complete', share)
260
327
 
261
- @api_versions.wraps("2.22")
328
+ @api_versions.wraps(constants.SHARE_MIGRATION_GRADUATION_VERSION) # noqa
329
+ def migration_complete(self, share): # noqa F811
330
+ """Completes migration for a given share.
331
+
332
+ :param share: The :class:'share' to complete migration
333
+ """
334
+ return self._action('migration_complete', share)
335
+
336
+ @api_versions.wraps(
337
+ "2.22", constants.SHARE_MIGRATION_PRE_GRADUATION_VERSION
338
+ )
262
339
  @api_versions.experimental_api
263
340
  def migration_cancel(self, share):
264
341
  """Attempts to cancel migration for a given share.
@@ -267,7 +344,17 @@ class ShareManager(base.MetadataCapableManager):
267
344
  """
268
345
  return self._action('migration_cancel', share)
269
346
 
270
- @api_versions.wraps("2.22")
347
+ @api_versions.wraps(constants.SHARE_MIGRATION_GRADUATION_VERSION) # noqa
348
+ def migration_cancel(self, share): # noqa F811
349
+ """Attempts to cancel migration for a given share.
350
+
351
+ :param share: The :class:'share' to cancel migration
352
+ """
353
+ return self._action('migration_cancel', share)
354
+
355
+ @api_versions.wraps(
356
+ "2.22", constants.SHARE_MIGRATION_PRE_GRADUATION_VERSION
357
+ )
271
358
  @api_versions.experimental_api
272
359
  def migration_get_progress(self, share):
273
360
  """Obtains progress of share migration for a given share.
@@ -276,6 +363,14 @@ class ShareManager(base.MetadataCapableManager):
276
363
  """
277
364
  return self._action('migration_get_progress', share)
278
365
 
366
+ @api_versions.wraps(constants.SHARE_MIGRATION_GRADUATION_VERSION) # noqa
367
+ def migration_get_progress(self, share): # noqa F811
368
+ """Obtains progress of share migration for a given share.
369
+
370
+ :param share: The :class:'share' to obtain migration progress
371
+ """
372
+ return self._action('migration_get_progress', share)
373
+
279
374
  def _do_manage(
280
375
  self,
281
376
  service_host,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: python-manilaclient
3
- Version: 6.1.0
3
+ Version: 6.2.0
4
4
  Summary: Client library for OpenStack Shared File System Storage
5
5
  Author-email: OpenStack <openstack-discuss@lists.openstack.org>
6
6
  License: Apache-2.0
@@ -1,5 +1,5 @@
1
1
  manilaclient/__init__.py,sha256=-fGR_OYZqOi-qFZeYWbdCEzsyjVD8sVpNqYHMjuded4,1249
2
- manilaclient/api_versions.py,sha256=6wWONfJD_5QUU6vcq59r5Sa1sLPSDZCXhCb22y1PhXE,15841
2
+ manilaclient/api_versions.py,sha256=65L9ZZHvKGolZPIZB3oDRnEoU8cZTLnSSR5Pwkbpd1M,15841
3
3
  manilaclient/base.py,sha256=ht-0cA9rZW-6RD4Y7BzPVpJe9QEkiO_TWfnHDybPkLM,18167
4
4
  manilaclient/client.py,sha256=MxBdkTlaT2cm8Oe88Af25fuB-Z-rJ9rhGLk1opJbbo4,2419
5
5
  manilaclient/config.py,sha256=4eZFx7Mx3rNofk7tdaGrKi4JyB_2e8m82RrOjEYHtTw,10079
@@ -9,7 +9,7 @@ manilaclient/utils.py,sha256=B_NC1nR9CGYbh7-cWMNsmUHdavbKvypS9d4s2EeCbws,2094
9
9
  manilaclient/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
10
10
  manilaclient/common/_i18n.py,sha256=-ia90LTyuQwvJXncEvUZTmoFk7n3_5B3Cib28B1nev0,1131
11
11
  manilaclient/common/cliutils.py,sha256=t_YqF3MdFYjcvLLGXj7sgol85R_61Thn8JVD6D2r2XE,8158
12
- manilaclient/common/constants.py,sha256=jadKE6cDNToIriCO8NosrDa1hHLL-qmgJ_sLhPzPuVM,4287
12
+ manilaclient/common/constants.py,sha256=Vl6pLNpUa86VkgPUkEiOyPWWXpc4rIGBrNcwvluzrHM,4379
13
13
  manilaclient/common/httpclient.py,sha256=5iVKrfWl8omO1WMahPRL8eK3_DCJM_4zTliMoPL6Hwc,7286
14
14
  manilaclient/common/apiclient/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  manilaclient/common/apiclient/exceptions.py,sha256=6Uw_i42j87W6gKEVaaXofsMz1psSH0B8uJja7xpzObU,12824
@@ -39,7 +39,7 @@ manilaclient/osc/v2/share_network_subnets.py,sha256=AqWFj0nPHDM-iIkHG94R2ya1jBRm
39
39
  manilaclient/osc/v2/share_networks.py,sha256=ArCA-EJGh4drn2JNnYWDbtlsm276WgYypb2ws_mL_Yc,30071
40
40
  manilaclient/osc/v2/share_pools.py,sha256=mwnqd_15-TEo4qgS6zf4ygyT-MusL0-Fj2C9oGvcGR8,3937
41
41
  manilaclient/osc/v2/share_replica_export_locations.py,sha256=KprVjmoou-k3X81WqSC07zozMCnGWL7kMphepp8wIhw,2719
42
- manilaclient/osc/v2/share_replicas.py,sha256=b4TvewvpTxpuIEsh2VzcpshX2CpOI58Pp2Guys76xKU,21050
42
+ manilaclient/osc/v2/share_replicas.py,sha256=UNNKXdzWNnJ87IUsW4m9pWZ_2lL6XLX1bvmmhBwwc2A,21455
43
43
  manilaclient/osc/v2/share_servers.py,sha256=MWMostsK-wxLePrlZT2iTVQmFHGCl4wHkj_elK14-D8,26084
44
44
  manilaclient/osc/v2/share_snapshot_instance_export_locations.py,sha256=MSwVSBsnSo5ine26QM0rIciOVGbQdk7HQjoEiwn_aYI,3202
45
45
  manilaclient/osc/v2/share_snapshot_instances.py,sha256=tpqgD0-iZw8cQqfRPOvU5JK-ZDwLLJzhW9PY-PvAEvQ,5207
@@ -90,7 +90,7 @@ manilaclient/tests/unit/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
90
90
  manilaclient/tests/unit/osc/osc_fakes.py,sha256=CRcsn9mAfl53y_t_cF72Np-VW978yGx7Vuc5TLJth9E,6506
91
91
  manilaclient/tests/unit/osc/osc_utils.py,sha256=GacyYDl4fbw9U8bMFIUjAoVuwyGTIL7ElYXooxqd5uM,2571
92
92
  manilaclient/tests/unit/osc/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
93
- manilaclient/tests/unit/osc/v2/fakes.py,sha256=ut1QNlvjD4V64irrMnNx5f8Whs97hJz-iQCrmGJmHdI,53094
93
+ manilaclient/tests/unit/osc/v2/fakes.py,sha256=DNvhkhAPhitHGfjWdnUAIjH1kLVNCDKlbOHNyq8ewlA,53092
94
94
  manilaclient/tests/unit/osc/v2/test_availability_zones.py,sha256=W1jqaBxyY1idVWVELQr89ujY29WiOQE-ZesQeQs6xpA,1933
95
95
  manilaclient/tests/unit/osc/v2/test_messages.py,sha256=rqQopopg0iF7UFHThh97GY1omvMY3iS47zCT9T4Rl0c,5921
96
96
  manilaclient/tests/unit/osc/v2/test_qos_types.py,sha256=hN3tuuI0gbuXrixbvBd8IGkm_hu842juUg73hcICx8U,13732
@@ -112,7 +112,7 @@ manilaclient/tests/unit/osc/v2/test_share_network_subnets.py,sha256=oJWbW_eydWkK
112
112
  manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=rYrZzwDDdmjYxL4aC9oFPmQFJYYZ4TvLOV6mLU26dJ0,30082
113
113
  manilaclient/tests/unit/osc/v2/test_share_pools.py,sha256=QgpvdCBbnKWzEy_TCoi-ROHMv2PEgNBrbej4eDIftxM,5376
114
114
  manilaclient/tests/unit/osc/v2/test_share_replica_export_locations.py,sha256=t6WrW7wdcM4hXm5A-EaNCBVDe6Wv3zKshd2gFk9hP1s,3775
115
- manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=0N8trdafVz_RRUI4MfwteelKBWGa63Lv6fVV7UZ3Xc0,28092
115
+ manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=PhzGcyCyydaRAIVoZd_UHRWGheia8MhG3X52PhIFl-s,29517
116
116
  manilaclient/tests/unit/osc/v2/test_share_servers.py,sha256=8aqRAX0iE_xYNLRI_ADSC5NisGSHBMDX-LTDBMyEnIY,27223
117
117
  manilaclient/tests/unit/osc/v2/test_share_snapshot_instance_export_locations.py,sha256=S8a49o8kf4WOUEnZfW19-ndlFO05oiC031CH-TpLV8E,5505
118
118
  manilaclient/tests/unit/osc/v2/test_share_snapshot_instances.py,sha256=FkPED2s_RpQi6C3H6qECIcA-uMhE7AE0OjFFZWuLv44,8148
@@ -215,14 +215,14 @@ manilaclient/v2/share_snapshots.py,sha256=9-TWgjyjgF976YDAFDXZ0vuPdNjMxu27O6i3O5
215
215
  manilaclient/v2/share_transfers.py,sha256=ncuR4XrKFVQFtH05uivqdovqAs7L8SZ6qIL3Ci483To,4629
216
216
  manilaclient/v2/share_type_access.py,sha256=FczykY4Nw2yZZyX4MUQolxAniOTy3BYfXQLxjnnXOSc,2296
217
217
  manilaclient/v2/share_types.py,sha256=N8YIO1qzghAV__ywUeQjiRPlX59AQyut_mbJG3403Qk,10559
218
- manilaclient/v2/shares.py,sha256=OH4cFkNtNaCVMrh-_WW97DoNcJ3jRyYetmRcgUNYSJI,35278
218
+ manilaclient/v2/shares.py,sha256=GU2lmeIjn4vT0Zd3Ozj15mjLjifb2TUijaa3kWUhdWg,38361
219
219
  manilaclient/v2/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
220
220
  manilaclient/v2/contrib/list_extensions.py,sha256=_JSrPBEca2oR3dUbRNDBahAqo9V4bAEpNx0Si2gOWN4,1448
221
- python_manilaclient-6.1.0.dist-info/licenses/AUTHORS,sha256=PE_zzPhEsLIKtH5wgoVFiwCZ8hLOX2QKuc1iouyQF3g,8110
222
- python_manilaclient-6.1.0.dist-info/licenses/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
223
- python_manilaclient-6.1.0.dist-info/METADATA,sha256=OfR7zlcq9eKKJwciprUN_hMizrEwoWIWr3vje9iB-GI,5463
224
- python_manilaclient-6.1.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
225
- python_manilaclient-6.1.0.dist-info/entry_points.txt,sha256=krquuT_dgByNW9LwxJ71A7rAnir2tLKb7a7-OivCQK0,12276
226
- python_manilaclient-6.1.0.dist-info/pbr.json,sha256=PWaoF0p1LA9_xF0td5Xf3dBGLORXqQcOK79aobbe5Xg,46
227
- python_manilaclient-6.1.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
228
- python_manilaclient-6.1.0.dist-info/RECORD,,
221
+ python_manilaclient-6.2.0.dist-info/licenses/AUTHORS,sha256=PE_zzPhEsLIKtH5wgoVFiwCZ8hLOX2QKuc1iouyQF3g,8110
222
+ python_manilaclient-6.2.0.dist-info/licenses/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
223
+ python_manilaclient-6.2.0.dist-info/METADATA,sha256=lkq3SJVR59MuEOqo8ehdpFPnNBtekjt-GMcvI3eD80s,5463
224
+ python_manilaclient-6.2.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
225
+ python_manilaclient-6.2.0.dist-info/entry_points.txt,sha256=krquuT_dgByNW9LwxJ71A7rAnir2tLKb7a7-OivCQK0,12276
226
+ python_manilaclient-6.2.0.dist-info/pbr.json,sha256=csXtI7zQIlUa6DkA_dRzrTat2Bz9LV_cYrwsLMUno3U,46
227
+ python_manilaclient-6.2.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
228
+ python_manilaclient-6.2.0.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "8b34b1b", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "2ceb369", "is_release": true}