python-manilaclient 4.4.1__py3-none-any.whl → 4.4.2__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.
@@ -160,7 +160,6 @@ class QuotaSet(command.Command):
160
160
  "gigabytes": parsed_args.gigabytes,
161
161
  "snapshot_gigabytes": parsed_args.snapshot_gigabytes,
162
162
  "share_networks": parsed_args.share_networks,
163
- "per_share_gigabytes": parsed_args.per_share_gigabytes,
164
163
  }
165
164
 
166
165
  if parsed_args.share_type is not None:
@@ -350,7 +350,7 @@ class DeleteShare(command.Command):
350
350
 
351
351
  if parsed_args.force:
352
352
  share_client.shares.force_delete(share_obj)
353
- if parsed_args.soft:
353
+ elif parsed_args.soft:
354
354
  if share_client.api_version >= api_versions.APIVersion(
355
355
  '2.69'):
356
356
  share_client.shares.soft_delete(share_obj)
@@ -19,6 +19,7 @@ from osc_lib import utils as oscutils
19
19
 
20
20
  from manilaclient import api_versions
21
21
  from manilaclient.common._i18n import _
22
+ from manilaclient.common import cliutils
22
23
 
23
24
 
24
25
  LOG = logging.getLogger(__name__)
@@ -113,6 +114,15 @@ class CreateShareNetworkSubnet(command.ShowOne):
113
114
  share_network_id=share_network_id)
114
115
  )
115
116
  subnet_data = subnet_create_check[1]
117
+ if subnet_data:
118
+ if parsed_args.formatter == 'table':
119
+ for k, v in subnet_data.items():
120
+ if isinstance(v, dict):
121
+ capabilities_list = [v]
122
+ dict_values = cliutils.convert_dict_list_to_string(
123
+ capabilities_list
124
+ )
125
+ subnet_data[k] = dict_values
116
126
  else:
117
127
  share_network_subnet = share_client.share_network_subnets.create(
118
128
  neutron_net_id=parsed_args.neutron_net_id,
@@ -297,13 +297,16 @@ class CreateShareNetwork(command.ShowOne):
297
297
  elif parsed_args.availability_zone:
298
298
  availability_zone = parsed_args.availability_zone
299
299
 
300
- share_network = share_client.share_networks.create(
301
- name=parsed_args.name,
302
- description=parsed_args.description,
303
- neutron_net_id=parsed_args.neutron_net_id,
304
- neutron_subnet_id=parsed_args.neutron_subnet_id,
305
- availability_zone=availability_zone,
306
- )
300
+ kwargs = {
301
+ "name": parsed_args.name,
302
+ "description": parsed_args.description,
303
+ "neutron_net_id": parsed_args.neutron_net_id,
304
+ "neutron_subnet_id": parsed_args.neutron_subnet_id,
305
+ }
306
+ if availability_zone:
307
+ kwargs['availability_zone'] = availability_zone
308
+ share_network = share_client.share_networks.create(**kwargs)
309
+
307
310
  share_network_data = share_network._info
308
311
  share_network_data.pop('links', None)
309
312
  if parsed_args.formatter == 'table':
@@ -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('{}', check_result['hosts_check_result'])
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('{}', check_result['hosts_check_result'])
37
+ self.assertEqual('', check_result['hosts_check_result'])
@@ -78,8 +78,7 @@ class TestQuotaSet(TestQuotas):
78
78
  share_networks=None,
79
79
  shares=40,
80
80
  snapshot_gigabytes=None,
81
- snapshots=None,
82
- per_share_gigabytes=None)
81
+ snapshots=None)
83
82
  self.assertIsNone(result)
84
83
  mock_find_resource.assert_not_called()
85
84
  self.quotas_mock.assert_not_called()
@@ -107,7 +106,6 @@ class TestQuotaSet(TestQuotas):
107
106
  shares=40,
108
107
  snapshot_gigabytes=None,
109
108
  snapshots=None,
110
- per_share_gigabytes=None,
111
109
  tenant_id=self.project.id,
112
110
  user_id=None)
113
111
  self.assertIsNone(result)
@@ -135,7 +133,6 @@ class TestQuotaSet(TestQuotas):
135
133
  shares=None,
136
134
  snapshot_gigabytes=None,
137
135
  snapshots=None,
138
- per_share_gigabytes=None,
139
136
  tenant_id=self.project.id,
140
137
  user_id=None)
141
138
  self.assertIsNone(result)
@@ -164,7 +161,6 @@ class TestQuotaSet(TestQuotas):
164
161
  shares=None,
165
162
  snapshot_gigabytes=None,
166
163
  snapshots=None,
167
- per_share_gigabytes=None,
168
164
  tenant_id=self.project.id,
169
165
  user_id=None)
170
166
  self.assertIsNone(result)
@@ -195,7 +191,6 @@ class TestQuotaSet(TestQuotas):
195
191
  snapshot_gigabytes=None,
196
192
  snapshots=None,
197
193
  tenant_id=self.project.id,
198
- per_share_gigabytes=None,
199
194
  user_id=None)
200
195
  self.assertIsNone(result)
201
196
 
@@ -290,7 +285,6 @@ class TestQuotaSet(TestQuotas):
290
285
  shares=None,
291
286
  snapshot_gigabytes=None,
292
287
  snapshots=None,
293
- per_share_gigabytes=None,
294
288
  tenant_id=self.project.id,
295
289
  user_id=None)
296
290
  self.assertIsNone(result)
@@ -311,6 +305,22 @@ class TestQuotaSet(TestQuotas):
311
305
  self.assertRaises(
312
306
  exceptions.CommandError, self.cmd.take_action, parsed_args)
313
307
 
308
+ def test_quota_set_per_share_gigabytes_exception(self):
309
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
310
+ '2.61')
311
+ arglist = [
312
+ self.project.id,
313
+ '--per-share-gigabytes', '10',
314
+ ]
315
+ verifylist = [
316
+ ('project', self.project.id),
317
+ ('per_share_gigabytes', 10)
318
+ ]
319
+
320
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
321
+ self.assertRaises(
322
+ exceptions.CommandError, self.cmd.take_action, parsed_args)
323
+
314
324
  def test_quota_set_per_share_gigabytes(self):
315
325
  arglist = [
316
326
  self.project.id,
@@ -425,6 +425,8 @@ class TestShareDelete(TestShare):
425
425
 
426
426
  result = self.cmd.take_action(parsed_args)
427
427
  self.shares_mock.delete.assert_called_with(shares[0], None)
428
+ self.shares_mock.soft_delete.assert_not_called()
429
+ self.shares_mock.force_delete.assert_not_called()
428
430
  self.assertIsNone(result)
429
431
 
430
432
  def test_share_delete_many(self):
@@ -481,6 +483,8 @@ class TestShareDelete(TestShare):
481
483
  result = self.cmd.take_action(parsed_args)
482
484
 
483
485
  self.shares_mock.force_delete.assert_called_once_with(shares[0])
486
+ self.shares_mock.delete.assert_not_called()
487
+ self.shares_mock.soft_delete.assert_not_called()
484
488
  self.assertIsNone(result)
485
489
 
486
490
  def test_share_delete_with_soft(self):
@@ -500,6 +504,8 @@ class TestShareDelete(TestShare):
500
504
  result = self.cmd.take_action(parsed_args)
501
505
 
502
506
  self.shares_mock.soft_delete.assert_called_once_with(shares[0])
507
+ self.shares_mock.delete.assert_not_called()
508
+ self.shares_mock.force_delete.assert_not_called()
503
509
  self.assertIsNone(result)
504
510
 
505
511
  def test_share_delete_wrong_name(self):
@@ -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)
@@ -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>
@@ -158,6 +159,7 @@ luke.li <lilu7189@fiberhome.com>
158
159
  maaoyu <maaoyu@inspur.com>
159
160
  mark.sturdevant <mark.sturdevant@hpe.com>
160
161
  melissaml <ma.lei@99cloud.net>
162
+ morozovalekseywot <morozovalekseywot@gmail.com>
161
163
  namrata <namrata.sitlani@citynetwork.eu>
162
164
  nidhimittalhada <nidhimittal19@gmail.com>
163
165
  paulali <paulali@protonmail.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: python-manilaclient
3
- Version: 4.4.1
3
+ Version: 4.4.2
4
4
  Summary: Client library for OpenStack Manila API.
5
5
  Home-page: https://docs.openstack.org/python-manilaclient/latest/
6
6
  Author: OpenStack
@@ -21,10 +21,10 @@ manilaclient/osc/utils.py,sha256=2CcJ70UZ1zxYRVBGCjA3urVCM9yFUQ6-XG4yiu1BsD4,402
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=RiXTQGs-DtXCMFyrmIjTxr2qesbUrvRyJRWMatB3G9Q,14775
24
+ manilaclient/osc/v2/quotas.py,sha256=bRF1U8wjjBqeaDROlB3kyi-2cTA-iElCc677l0hRo_o,14707
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=8UkPIJGW6tNMG-Vag5pU5q288fgJyCjxC35-tZYBaSM,53039
27
+ manilaclient/osc/v2/share.py,sha256=8j8ItU1yCPO4TuBgO2BWE-tYKpmaYuKGZmoQDzTz0_k,53041
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
@@ -33,8 +33,8 @@ manilaclient/osc/v2/share_groups.py,sha256=7njPDWgxF_tMwBkyZPEOhDf7qe0ThPENm2fYG
33
33
  manilaclient/osc/v2/share_instance_export_locations.py,sha256=i5ulZz6PCDbZd_KXoE_Cj1toRRTXSt5Bru-R-HhPC08,3089
34
34
  manilaclient/osc/v2/share_instances.py,sha256=1DlW2ldo6VjzBMgovozgDh2g6HDkHMLANS43ZecGhtQ,7645
35
35
  manilaclient/osc/v2/share_limits.py,sha256=3TtNFRYKd6VsUDjrFL_OZXq92dVO2luMGVHAelu08g8,2202
36
- manilaclient/osc/v2/share_network_subnets.py,sha256=E_5QSOixDZQTniLj8rSTIFAfjaYX4Q6zzm8NnZOLLDc,7674
37
- manilaclient/osc/v2/share_networks.py,sha256=jIQBm3kc5lD3iv8_ckBP5_XSbrdD0LdHqmhw8cXfgfc,27394
36
+ manilaclient/osc/v2/share_network_subnets.py,sha256=vkxJV0WF6RP0hbZc8xMRRVbncmET4pKTb3Oty4GrwlQ,8166
37
+ manilaclient/osc/v2/share_networks.py,sha256=jEY-sct19pygVX-R5cXz1jtT6jyBHtuSD0shOEg3hBo,27476
38
38
  manilaclient/osc/v2/share_pools.py,sha256=4TjomBQby4D0fL43FFCfrfau0TTsv1i-MswZNFEPt9g,3636
39
39
  manilaclient/osc/v2/share_replica_export_locations.py,sha256=FYUpNjb1jEzfCwmLh6-Kiczx_TKeVnOaQDCBoZZPn1s,2831
40
40
  manilaclient/osc/v2/share_replicas.py,sha256=pc97Y2WPWKXkeZF2Oahxz2PfEyxQ3coUmy2eC3hj3vM,14367
@@ -80,7 +80,7 @@ manilaclient/tests/functional/osc/test_messages.py,sha256=JBN6GnKetb0zmxVqF6_LOt
80
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
- manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256=-ebJTJRZYpdg-aHf8Di9hgQuQRpneVqDBXU02xvWwrk,1418
83
+ manilaclient/tests/functional/osc/test_share_network_subnets.py,sha256=SsLJmC2ZFyNFQiTFowzRTdoQDaaxoFA0traZdl8Pnvc,1414
84
84
  manilaclient/tests/functional/osc/test_share_networks.py,sha256=_9vOnd_cc25HkBp7G-jA4m5x7LaEZvwzBBNzfG8ttII,3896
85
85
  manilaclient/tests/functional/osc/test_share_pools.py,sha256=svBFXZrlIdP13rcS-SWRU9YIiXT9nns16sGjq7kX5eA,1539
86
86
  manilaclient/tests/functional/osc/test_share_replica_export_locations.py,sha256=MsLgNKRWTANUm80Af7P2wFdNPVOJwOAoW3xY_W8wkUU,2618
@@ -108,10 +108,10 @@ manilaclient/tests/unit/osc/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
108
108
  manilaclient/tests/unit/osc/v2/fakes.py,sha256=HIi9cp8v-aSqWntFbz3M0kWWEdmal1E9ziU5w7cgPFk,46247
109
109
  manilaclient/tests/unit/osc/v2/test_availability_zones.py,sha256=lXruckwicufvzmp9uutvG9dIm-7UU0lGx9uzXVeAm3o,1963
110
110
  manilaclient/tests/unit/osc/v2/test_messages.py,sha256=XiBKFNZNUEmKI9XL-X3G-tE220kiWQ7usvn3QExizW8,6194
111
- manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=rZCm1bqp_9qmUDspveFlo5CbmFkv_O-meORHn1u9HsM,15984
111
+ manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=T7v3_Zt1TqWWZiD089fMpdrvuIWEoDo6eYPddajaZCg,16278
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=dsC6KmzYoDuIa3NFUSp_Va2SjND6YDcoXAu_FMqr4oU,67767
114
+ manilaclient/tests/unit/osc/v2/test_share.py,sha256=Cat_SEHRnv1tW9PcO7lk4HU0zUHkiBJIw626Ctmalg4,68101
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
@@ -121,7 +121,7 @@ manilaclient/tests/unit/osc/v2/test_share_instance_export_locations.py,sha256=F0
121
121
  manilaclient/tests/unit/osc/v2/test_share_instances.py,sha256=OCgMnmdhAM6s7aayty9XHwv6Ohq6BFTrFxUhu74LRU8,12339
122
122
  manilaclient/tests/unit/osc/v2/test_share_limits.py,sha256=BXXlPJ4fThHKlBdY9OYf7tynSLCqwPstXt1gV6xIrK0,3044
123
123
  manilaclient/tests/unit/osc/v2/test_share_network_subnets.py,sha256=D43TIbMOTA7v5Rk4JRc77uNykDwcjp4A4Cx-BeyMkbM,9753
124
- manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=BO9ncD-cGAq92HFg3MD28olVhD25r8YvnX4ZUSOd0_w,27426
124
+ manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=21w-WJe58ltDdbSsNY1x08Us4nESmnO5O0PfjLqzl98,27390
125
125
  manilaclient/tests/unit/osc/v2/test_share_pools.py,sha256=URIdUtT3eQqtLWCHRKGu4t6cmI45qItQg3JXWBvC-z0,5395
126
126
  manilaclient/tests/unit/osc/v2/test_share_replica_export_locations.py,sha256=vdRF8FJxdoHT6XWuRpHgBK-va9q6td9ES2Hask3lfJY,3996
127
127
  manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=cdmUNK96olSe0TgOUMD8fVxsoX0hVJFkCHThcxxeUmc,22544
@@ -224,11 +224,11 @@ manilaclient/v2/shares.py,sha256=GUGOS8CZSbTz3wIoiZHW2DJ0B5ExF0ICTcR9ubmv-pU,304
224
224
  manilaclient/v2/shell.py,sha256=qmoTu0wOFERvXj-_B5ZVttCXfud-Urv1dfOT1uYFeT0,216521
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.4.1.dist-info/AUTHORS,sha256=yyoZnnSDNpbJl_d517A2xHXOjOcZMDE_inJadGvoiAQ,7111
228
- python_manilaclient-4.4.1.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
229
- python_manilaclient-4.4.1.dist-info/METADATA,sha256=OvlyjhLbdEVXG3g3hagtOAodT0hJRNoAgCsaC59ZtOI,5451
230
- python_manilaclient-4.4.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
231
- python_manilaclient-4.4.1.dist-info/entry_points.txt,sha256=jsDnFfMmi6zQF7YsHw9Wr7D3wYa_UKSTBd8Dyl_ZGLU,10116
232
- python_manilaclient-4.4.1.dist-info/pbr.json,sha256=Y329tz-y0zUqhpy8qh_LBdKczPj2KdtQ24u5iiv9Rzc,46
233
- python_manilaclient-4.4.1.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
234
- python_manilaclient-4.4.1.dist-info/RECORD,,
227
+ python_manilaclient-4.4.2.dist-info/AUTHORS,sha256=iSR8Zf7xfh4vcoITjwxla4gbrildOzZ1O7Flfx9aH7U,7195
228
+ python_manilaclient-4.4.2.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
229
+ python_manilaclient-4.4.2.dist-info/METADATA,sha256=q2IzOEkt4gf4E7YSM-FWBKQ5fvIO-NWUDA6sxLdU6Hc,5451
230
+ python_manilaclient-4.4.2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
231
+ python_manilaclient-4.4.2.dist-info/entry_points.txt,sha256=jsDnFfMmi6zQF7YsHw9Wr7D3wYa_UKSTBd8Dyl_ZGLU,10116
232
+ python_manilaclient-4.4.2.dist-info/pbr.json,sha256=lV4sy-jzBKiubf52szokr5AgtsB_quy_0yyooLQrP6E,46
233
+ python_manilaclient-4.4.2.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
234
+ python_manilaclient-4.4.2.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "96e51a3", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "2689f0d", "is_release": true}