python-manilaclient 4.1.2__py3-none-any.whl → 4.1.3__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/base.py CHANGED
@@ -63,7 +63,8 @@ class Manager(utils.HookableMixin):
63
63
  def api_version(self):
64
64
  return self.api.api_version
65
65
 
66
- def _list(self, url, response_key, manager=None, body=None):
66
+ def _list(self, url, response_key, manager=None, body=None,
67
+ return_raw=None):
67
68
  """List the collection.
68
69
 
69
70
  :param url: a partial URL, e.g., '/shares'
@@ -96,6 +97,8 @@ class Manager(utils.HookableMixin):
96
97
  pass
97
98
  with self.completion_cache('human_id', obj_class, mode="w"):
98
99
  with self.completion_cache('uuid', obj_class, mode="w"):
100
+ if return_raw:
101
+ return data
99
102
  resource = [obj_class(manager, res, loaded=True)
100
103
  for res in data if res]
101
104
  if 'count' in body:
@@ -167,9 +170,11 @@ class Manager(utils.HookableMixin):
167
170
  except UnicodeEncodeError:
168
171
  pass
169
172
 
170
- def _get(self, url, response_key=None):
173
+ def _get(self, url, response_key, return_raw=False):
171
174
  resp, body = self.api.client.get(url)
172
175
  if response_key:
176
+ if return_raw:
177
+ return body[response_key]
173
178
  return self.resource_class(self, body[response_key], loaded=True)
174
179
  else:
175
180
  return self.resource_class(self, body, loaded=True)
@@ -205,8 +205,8 @@ class CreateShare(command.ShowOne):
205
205
  parsed_args.share_type).id
206
206
  elif not parsed_args.snapshot_id:
207
207
  try:
208
- share_type = apiutils.find_resource(
209
- share_client.share_types, 'default').id
208
+ share_type = share_client.share_types.get(
209
+ share_type='default').id
210
210
  except apiclient_exceptions.CommandError:
211
211
  msg = ("There is no default share type available. You must "
212
212
  "pick a valid share type to create a share.")
@@ -149,8 +149,8 @@ class ShowShareAccessRulesTestCase(base.OSCClientTestBase):
149
149
  self.assertEqual(access_rule_show['access_key'], 'None')
150
150
  self.assertEqual(access_rule_show['created_at'],
151
151
  access_rule['created_at'])
152
- self.assertEqual(access_rule_show['updated_at'], 'None')
153
152
  self.assertEqual(access_rule_show['properties'], '')
153
+ self.assertTrue('updated_at' in access_rule_show)
154
154
 
155
155
 
156
156
  class SetShareAccessTestCase(base.OSCClientTestBase):
@@ -364,6 +364,8 @@ class TestShareCreate(TestShare):
364
364
  osc_exceptions.CommandError,
365
365
  self.cmd.take_action,
366
366
  parsed_args)
367
+ self.share_types_mock.get.assert_called_once_with(
368
+ share_type='default')
367
369
 
368
370
  @ddt.data('None', 'NONE', 'none')
369
371
  def test_create_share_with_the_name_none(self, name):
@@ -332,15 +332,15 @@ class SharesTest(utils.TestCase):
332
332
  if version >= api_versions.APIVersion('2.69'):
333
333
  manager.do_list.assert_called_once_with(
334
334
  detailed=False, search_opts=search_opts3,
335
- sort_key=None, sort_dir=None)
335
+ sort_key=None, sort_dir=None, return_raw=False)
336
336
  elif version >= api_versions.APIVersion('2.35'):
337
337
  manager.do_list.assert_called_once_with(
338
338
  detailed=False, search_opts=search_opts2,
339
- sort_key=None, sort_dir=None)
339
+ sort_key=None, sort_dir=None, return_raw=False)
340
340
  else:
341
341
  manager.do_list.assert_called_once_with(
342
342
  detailed=False, search_opts=search_opts1,
343
- sort_key=None, sort_dir=None)
343
+ sort_key=None, sort_dir=None, return_raw=False)
344
344
 
345
345
  def test_list_shares_index_with_search_opts(self):
346
346
  search_opts = {
@@ -122,10 +122,10 @@ class ShareTypeManager(base.ManagerWithFind):
122
122
  return self._list("/types%s" % query_string, "share_types")
123
123
 
124
124
  def show(self, share_type):
125
- """Get a share.
125
+ """Get a share type.
126
126
 
127
- :param share: either share object or text with its ID.
128
- :rtype: :class:`Share`
127
+ :param share type: either share type object or text with its ID.
128
+ :rtype: :class:`ShareType`
129
129
  """
130
130
  type_id = base.getid(share_type)
131
131
  return self._get("/types/%s" % type_id, "share_type")
manilaclient/v2/shares.py CHANGED
@@ -127,7 +127,7 @@ class ShareManager(base.ManagerWithFind):
127
127
  def create(self, share_proto, size, snapshot_id=None, name=None,
128
128
  description=None, metadata=None, share_network=None,
129
129
  share_type=None, is_public=False, availability_zone=None,
130
- share_group_id=None, scheduler_hints=None):
130
+ share_group_id=None, scheduler_hints=None, return_raw=False):
131
131
  """Create a share.
132
132
 
133
133
  :param share_proto: text - share protocol for new share available
@@ -166,7 +166,8 @@ class ShareManager(base.ManagerWithFind):
166
166
  if share_group_id:
167
167
  body['share_group_id'] = share_group_id
168
168
 
169
- return self._create('/shares', {'share': body}, 'share')
169
+ return self._create('/shares', {'share': body}, 'share',
170
+ return_raw=return_raw)
170
171
 
171
172
  @api_versions.wraps("2.29")
172
173
  @api_versions.experimental_api
@@ -321,14 +322,15 @@ class ShareManager(base.ManagerWithFind):
321
322
  info = {'snapshot_id': snapshot_id}
322
323
  return self._action('revert', share, info=info)
323
324
 
324
- def get(self, share):
325
+ def get(self, share, return_raw=False):
325
326
  """Get a share.
326
327
 
327
328
  :param share: either share object or text with its ID.
328
329
  :rtype: :class:`Share`
329
330
  """
330
331
  share_id = base.getid(share)
331
- return self._get("/shares/%s" % share_id, "share")
332
+ return self._get("/shares/%s" % share_id, "share",
333
+ return_raw=return_raw)
332
334
 
333
335
  def update(self, share, **kwargs):
334
336
  """Updates a share.
@@ -345,31 +347,34 @@ class ShareManager(base.ManagerWithFind):
345
347
 
346
348
  @api_versions.wraps("1.0", "2.34")
347
349
  def list(self, detailed=True, search_opts=None,
348
- sort_key=None, sort_dir=None):
350
+ sort_key=None, sort_dir=None, return_raw=False):
349
351
  """Get a list of all shares."""
350
352
  search_opts = search_opts or {}
351
353
  search_opts.pop("export_location", None)
352
354
  search_opts.pop("is_soft_deleted", None)
353
355
  return self.do_list(detailed=detailed, search_opts=search_opts,
354
- sort_key=sort_key, sort_dir=sort_dir)
356
+ sort_key=sort_key, sort_dir=sort_dir,
357
+ return_raw=return_raw)
355
358
 
356
359
  @api_versions.wraps("2.35", "2.68") # noqa
357
360
  def list(self, detailed=True, search_opts=None, # noqa
358
- sort_key=None, sort_dir=None):
361
+ sort_key=None, sort_dir=None, return_raw=False):
359
362
  """Get a list of all shares."""
360
363
  search_opts.pop("is_soft_deleted", None)
361
364
  return self.do_list(detailed=detailed, search_opts=search_opts,
362
- sort_key=sort_key, sort_dir=sort_dir)
365
+ sort_key=sort_key, sort_dir=sort_dir,
366
+ return_raw=return_raw)
363
367
 
364
368
  @api_versions.wraps("2.69") # noqa
365
369
  def list(self, detailed=True, search_opts=None, # noqa
366
- sort_key=None, sort_dir=None):
370
+ sort_key=None, sort_dir=None, return_raw=False):
367
371
  """Get a list of all shares."""
368
372
  return self.do_list(detailed=detailed, search_opts=search_opts,
369
- sort_key=sort_key, sort_dir=sort_dir)
373
+ sort_key=sort_key, sort_dir=sort_dir,
374
+ return_raw=return_raw)
370
375
 
371
376
  def do_list(self, detailed=True, search_opts=None,
372
- sort_key=None, sort_dir=None):
377
+ sort_key=None, sort_dir=None, return_raw=False):
373
378
  """Get a list of all shares.
374
379
 
375
380
  :param detailed: Whether to return detailed share info or not.
@@ -440,7 +445,7 @@ class ShareManager(base.ManagerWithFind):
440
445
  else:
441
446
  path = "/shares%s" % (query_string,)
442
447
 
443
- return self._list(path, 'shares')
448
+ return self._list(path, 'shares', return_raw=return_raw)
444
449
 
445
450
  def delete(self, share, share_group_id=None):
446
451
  """Delete a share.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: python-manilaclient
3
- Version: 4.1.2
3
+ Version: 4.1.3
4
4
  Summary: Client library for OpenStack Manila API.
5
5
  Home-page: https://docs.openstack.org/python-manilaclient/latest/
6
6
  Author: OpenStack
@@ -1,6 +1,6 @@
1
1
  manilaclient/__init__.py,sha256=yLvujNabAf28-BYLBD9MEqkumXr9nfohOAOgvce5qxA,1248
2
2
  manilaclient/api_versions.py,sha256=jjtTgZ5ADJ0Gis8C9_qr1a06GmADubfQNufajVdgpgc,15186
3
- manilaclient/base.py,sha256=xXcyEPdbjNLHISS2SVkHaAXxhYnvsBzeL3LAs_miBAc,12161
3
+ manilaclient/base.py,sha256=Dl6tmJoFBEabWbbIs3SOS7d8Q5p7k8ITycSgEARDn3A,12337
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
@@ -24,7 +24,7 @@ manilaclient/osc/v2/messages.py,sha256=Z_nM0b7GWbYUFf2T-d2q8yWNT4eroYDv1c3LeJsdH
24
24
  manilaclient/osc/v2/quotas.py,sha256=RiXTQGs-DtXCMFyrmIjTxr2qesbUrvRyJRWMatB3G9Q,14775
25
25
  manilaclient/osc/v2/security_services.py,sha256=lKW0WcmKZBQYPlQ3ukwYQhfXnbAPKZ6PMuQNKcFpWeY,16678
26
26
  manilaclient/osc/v2/services.py,sha256=Rxb6JLZOR0666CJrT1fIDFB0XP0pf7ueEA-u48Osx6A,4321
27
- manilaclient/osc/v2/share.py,sha256=b7qS84d_YJxnQ6DnwKoJu4ZAHwcOVuun36BldHCcurM,53031
27
+ manilaclient/osc/v2/share.py,sha256=6FG-OMm89A0AwV1Z22wmjkQf74to9h-Uviku23tXApY,53022
28
28
  manilaclient/osc/v2/share_access_rules.py,sha256=j60Tn2N0CPIR-BV0q4MonDnlVknrKk3YCMH99cgtSMI,13519
29
29
  manilaclient/osc/v2/share_group_snapshots.py,sha256=Vkq2vK0K7vaDxKl3TBVm_xMWpJZRfn80JIqusLoFiWY,14824
30
30
  manilaclient/osc/v2/share_group_type_access.py,sha256=FDCjx8V8dgAb3TMRvFaPHPURrhq1pT2oupo1qcLD8u0,6315
@@ -77,7 +77,7 @@ manilaclient/tests/functional/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
77
77
  manilaclient/tests/functional/osc/base.py,sha256=ezmP_bh6zTW_J0VtP4mQsIT-0Xw_7lPeGXcf8UoDBU4,15215
78
78
  manilaclient/tests/functional/osc/test_availability_zones.py,sha256=qzxGjDWVFjPo257L3hweSIB4RFb0MoS6gdaizqh3Q0o,980
79
79
  manilaclient/tests/functional/osc/test_messages.py,sha256=JBN6GnKetb0zmxVqF6_LOtzI70H78iEhK4xUThTazng,4110
80
- manilaclient/tests/functional/osc/test_share_access_rules.py,sha256=JrbFM4UThueneXh7wvDXbKIqO1RTlF6WbzprdpoHyqk,7049
80
+ manilaclient/tests/functional/osc/test_share_access_rules.py,sha256=9lBMdQJS9eD6avADcLs8O7VSwnxRFoCIc6gX--V4YEw,7042
81
81
  manilaclient/tests/functional/osc/test_share_group_type_access.py,sha256=hjGjhCpz8N5PJdNY0AQrFX_kZ9PLZgNpElRw7H9mKd4,3533
82
82
  manilaclient/tests/functional/osc/test_share_limits.py,sha256=nkQ7gQLTh9bwO-e4eU5WEK5D-IHJqOxQkUNL6BlMLOc,1281
83
83
  manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256=-ebJTJRZYpdg-aHf8Di9hgQuQRpneVqDBXU02xvWwrk,1418
@@ -111,7 +111,7 @@ manilaclient/tests/unit/osc/v2/test_messages.py,sha256=XiBKFNZNUEmKI9XL-X3G-tE22
111
111
  manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=rZCm1bqp_9qmUDspveFlo5CbmFkv_O-meORHn1u9HsM,15984
112
112
  manilaclient/tests/unit/osc/v2/test_security_services.py,sha256=KkS4pyKXLwgHHTx3ayZfruvUfA3C8a8YkL7iEHHuOXo,19607
113
113
  manilaclient/tests/unit/osc/v2/test_services.py,sha256=S2rUL6nO006_zUCt_-heSA_PuTIp4qNQDfKuI0SaKAI,6858
114
- manilaclient/tests/unit/osc/v2/test_share.py,sha256=9SjlZsTezgjI8Cqy3uDK7xtEEu6GRqK_7lCCfWetHGY,66712
114
+ manilaclient/tests/unit/osc/v2/test_share.py,sha256=DRQMe_LGtq_rgopjArghRrBGofi8xw6g6wDVrxWaMjs,66805
115
115
  manilaclient/tests/unit/osc/v2/test_share_access_rules.py,sha256=U1UbQLPknfw2KU-sH5LMStUOynJRDsyyZBGhpHtMpQ8,14621
116
116
  manilaclient/tests/unit/osc/v2/test_share_group_snapshots.py,sha256=zkchulCEXnzHQxgoVJmSo_LffCnPO2kEAu81sKHiL-8,21560
117
117
  manilaclient/tests/unit/osc/v2/test_share_group_type.py,sha256=WCIdqbXqtsWsWZK7CSKkmI1X_8DMb-PR6ZeuTAwtkos,17697
@@ -171,7 +171,7 @@ manilaclient/tests/unit/v2/test_share_snapshot_export_locations.py,sha256=UAQWVa
171
171
  manilaclient/tests/unit/v2/test_share_snapshot_instance_export_locations.py,sha256=BUMoBdPvAK4x5GfH8j06dJUoqbxepV2yMoLLP-pNTtM,1831
172
172
  manilaclient/tests/unit/v2/test_share_snapshot_instances.py,sha256=LJNOTFFfB8Q5EIpGmdD72KrvgS4wzLuMLfw6eFKAqrw,3612
173
173
  manilaclient/tests/unit/v2/test_share_snapshots.py,sha256=CYLZYIEQ-1xOGtLzEHBH-kKOPPlgo-p9djobff6PJYc,8470
174
- manilaclient/tests/unit/v2/test_shares.py,sha256=4SDYK4j4iLavB42YmhjSpiSGracle3RPKbRk16xrmuo,30366
174
+ manilaclient/tests/unit/v2/test_shares.py,sha256=N0HlZONezRRgLsSMPD06pi4zKWVsHy8cEP0SZwVeIMI,30420
175
175
  manilaclient/tests/unit/v2/test_shell.py,sha256=SEW8qRKmf0nKDjNZf9ZSx57nml4PU8b79xOnRDSLL64,156433
176
176
  manilaclient/tests/unit/v2/test_type_access.py,sha256=zvwoS42zVEnHrMyDpEruvaxxpkzAaGHzjLtxeVVb6cI,3595
177
177
  manilaclient/tests/unit/v2/test_types.py,sha256=k2doWdg1swCd7Kb96PVqbQA4wUs3I95rXWEhqNOV8tA,18918
@@ -219,16 +219,16 @@ manilaclient/v2/share_snapshot_instance_export_locations.py,sha256=dw1F7CVhQMAKX
219
219
  manilaclient/v2/share_snapshot_instances.py,sha256=RlQLwmK3x14B8TQouIQe-LuAo2rlHGLGPBNSWMWbQhc,2700
220
220
  manilaclient/v2/share_snapshots.py,sha256=1ugfDtMfzJW8U2pSqav6D69iJxlf8l8UAdrf2BGMxAE,8597
221
221
  manilaclient/v2/share_type_access.py,sha256=kK-dHI4eDnJWaQsU670IG2A2rE1kmegiIT7Rtiy4Afs,2373
222
- manilaclient/v2/share_types.py,sha256=Oi7mWEfpnhc85Fo0K1Kkp7s-KcKCKlJR49MRsee27JU,10288
223
- manilaclient/v2/shares.py,sha256=8AKMcb46E9AucMjyYqYgsAv14C-msSzMp7vFWLPmtVU,31580
222
+ manilaclient/v2/share_types.py,sha256=wKhwZcxh-SUytrUtPtV1hyBYw8ZHbjLqhKUR92dyo3g,10307
223
+ manilaclient/v2/shares.py,sha256=RxiSUvZtfXF43tGCr1ouRLyCN6e0n4upnB5_uvPhHXA,31963
224
224
  manilaclient/v2/shell.py,sha256=saEE8bDKS4BbHpIFQPx6iGkqtCMQXXGS58oLWbxoTIg,215612
225
225
  manilaclient/v2/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
226
226
  manilaclient/v2/contrib/list_extensions.py,sha256=_JSrPBEca2oR3dUbRNDBahAqo9V4bAEpNx0Si2gOWN4,1448
227
- python_manilaclient-4.1.2.dist-info/AUTHORS,sha256=xh6B4Yj_kQg2IpoYJIENNmKyGwveCROX-0g8BbhDiqE,7035
228
- python_manilaclient-4.1.2.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
229
- python_manilaclient-4.1.2.dist-info/METADATA,sha256=1VVCtB5sDoSGUB2i9-_wPcUN8pcxo3TSP9tEnacAmVI,5451
230
- python_manilaclient-4.1.2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
231
- python_manilaclient-4.1.2.dist-info/entry_points.txt,sha256=jsDnFfMmi6zQF7YsHw9Wr7D3wYa_UKSTBd8Dyl_ZGLU,10116
232
- python_manilaclient-4.1.2.dist-info/pbr.json,sha256=NErh6PswHpspGiJ0Dn-MMrSLZ3eryKr3hN2dFUOytbw,46
233
- python_manilaclient-4.1.2.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
234
- python_manilaclient-4.1.2.dist-info/RECORD,,
227
+ python_manilaclient-4.1.3.dist-info/AUTHORS,sha256=xh6B4Yj_kQg2IpoYJIENNmKyGwveCROX-0g8BbhDiqE,7035
228
+ python_manilaclient-4.1.3.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
229
+ python_manilaclient-4.1.3.dist-info/METADATA,sha256=PS5qTyK5nXz1ZA1fQCoPkCW939LR5F4vTyRcVFYyw90,5451
230
+ python_manilaclient-4.1.3.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
231
+ python_manilaclient-4.1.3.dist-info/entry_points.txt,sha256=jsDnFfMmi6zQF7YsHw9Wr7D3wYa_UKSTBd8Dyl_ZGLU,10116
232
+ python_manilaclient-4.1.3.dist-info/pbr.json,sha256=0DKBMfsAiniyQ3RkCXFzXExCmv27W_oNFzRuGr4MDO4,46
233
+ python_manilaclient-4.1.3.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
234
+ python_manilaclient-4.1.3.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "0214e59", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "71c7805", "is_release": true}