python-manilaclient 5.1.0__py3-none-any.whl → 5.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.
@@ -28,10 +28,7 @@ import requests
28
28
 
29
29
  from manilaclient import exceptions
30
30
 
31
- try:
32
- from eventlet import sleep
33
- except ImportError:
34
- from time import sleep # noqa
31
+ from time import sleep # noqa
35
32
 
36
33
  try:
37
34
  osprofiler_web = importutils.try_import("osprofiler.web")
@@ -151,8 +151,40 @@ class ListShareService(command.Lister):
151
151
  ]
152
152
  if share_client.api_version >= api_versions.APIVersion("2.83"):
153
153
  columns.append('Disabled Reason')
154
+ if share_client.api_version >= api_versions.APIVersion("2.86"):
155
+ columns.append('Ensuring')
154
156
 
155
157
  data = (osc_utils.get_dict_properties(
156
158
  service._info, columns) for service in services)
157
159
 
158
160
  return (columns, data)
161
+
162
+
163
+ class EnsureShareService(command.Command):
164
+ """Run ensure shares in a back end (Admin only)."""
165
+ _description = _("Run ensure shares in a back end (Admin only).")
166
+
167
+ def get_parser(self, prog_name):
168
+ parser = super(EnsureShareService, self).get_parser(prog_name)
169
+ parser.add_argument(
170
+ 'host',
171
+ metavar='<host>',
172
+ help=_("Host to run ensure shares. "
173
+ "'example_host@example_backend'.")
174
+ )
175
+ return parser
176
+
177
+ def take_action(self, parsed_args):
178
+ share_client = self.app.client_manager.share
179
+
180
+ if share_client.api_version < api_versions.APIVersion("2.86"):
181
+ raise exceptions.CommandError(
182
+ "Ensure shares API is only available in "
183
+ "manila API version >= 2.86")
184
+
185
+ try:
186
+ share_client.services.ensure_shares(parsed_args.host)
187
+ except Exception as e:
188
+ raise exceptions.CommandError(
189
+ _("Failed to run ensure shares: %s" % e)
190
+ )
@@ -266,3 +266,61 @@ class TestShareServiceList(TestShareService):
266
266
  else:
267
267
  self.assertEqual(self.column_headers, columns)
268
268
  self.assertEqual(list(self.values), list(data))
269
+
270
+
271
+ @ddt.ddt
272
+ class TestShareServiceEnsureShares(TestShareService):
273
+
274
+ def setUp(self):
275
+ super(TestShareServiceEnsureShares, self).setUp()
276
+
277
+ self.cmd = osc_services.EnsureShareService(self.app, None)
278
+
279
+ def test_ensure_shares(self):
280
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
281
+ '2.86')
282
+ fake_host = 'fake_host@fakebackend'
283
+ arglist = [
284
+ fake_host,
285
+ ]
286
+ verifylist = [
287
+ ('host', fake_host),
288
+ ]
289
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
290
+
291
+ self.cmd.take_action(parsed_args)
292
+
293
+ self.services_mock.ensure_shares.assert_called_with(fake_host)
294
+
295
+ def test_ensure_shares_invalid_version(self):
296
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
297
+ '2.85')
298
+ fake_host = 'fake_host@fakebackend'
299
+ arglist = [
300
+ fake_host,
301
+ ]
302
+ verifylist = [
303
+ ('host', fake_host),
304
+ ]
305
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
306
+
307
+ self.assertRaises(exceptions.CommandError,
308
+ self.cmd.take_action,
309
+ parsed_args)
310
+
311
+ def test_ensure_shares_command_error(self):
312
+ self.app.client_manager.share.api_version = api_versions.APIVersion(
313
+ '2.86')
314
+ self.services_mock.ensure_shares.side_effect = Exception()
315
+ fake_host = 'fake_host@fakebackend'
316
+ arglist = [
317
+ fake_host,
318
+ ]
319
+ verifylist = [
320
+ ('host', fake_host),
321
+ ]
322
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
323
+
324
+ self.assertRaises(exceptions.CommandError,
325
+ self.cmd.take_action,
326
+ parsed_args)
@@ -13,7 +13,6 @@
13
13
  # under the License.
14
14
  #
15
15
 
16
- import argparse
17
16
  import ddt
18
17
  from unittest import mock
19
18
  import uuid
@@ -1052,7 +1051,7 @@ class TestShareList(TestShare):
1052
1051
  verifylist = [
1053
1052
  ("limit", -2),
1054
1053
  ]
1055
- self.assertRaises(argparse.ArgumentTypeError, self.check_parser,
1054
+ self.assertRaises(osc_utils.ParserException, self.check_parser,
1056
1055
  self.cmd, arglist, verifylist)
1057
1056
 
1058
1057
  def test_share_list_name_description_filter(self):
@@ -11,21 +11,17 @@
11
11
  # under the License.
12
12
  #
13
13
 
14
- import argparse
15
14
  from unittest import mock
16
15
  import uuid
17
16
 
18
17
  from osc_lib import exceptions
19
18
  from osc_lib import exceptions as osc_exceptions
20
-
21
19
  from osc_lib import utils as oscutils
22
20
 
23
- from manilaclient.osc import utils
24
-
25
21
  from manilaclient import api_versions
26
-
22
+ from manilaclient.osc import utils
27
23
  from manilaclient.osc.v2 import share_groups as osc_share_groups
28
-
24
+ from manilaclient.tests.unit.osc import osc_utils
29
25
  from manilaclient.tests.unit.osc.v2 import fakes as manila_fakes
30
26
 
31
27
 
@@ -795,7 +791,7 @@ class TestShareGroupList(TestShareGroup):
795
791
  verifylist = [
796
792
  ("limit", -2),
797
793
  ]
798
- self.assertRaises(argparse.ArgumentTypeError, self.check_parser,
794
+ self.assertRaises(osc_utils.ParserException, self.check_parser,
799
795
  self.cmd, arglist, verifylist)
800
796
 
801
797
  # TODO(archanaserver): Add test cases for share-server-id,
@@ -98,3 +98,13 @@ class ServicesTest(utils.TestCase):
98
98
  self._get_resource_path(microversion) + '/disable',
99
99
  {"host": host, "binary": binary},
100
100
  )
101
+
102
+ def test_ensure_shares(self):
103
+ microversion = '2.86'
104
+ manager = self._get_manager(microversion)
105
+ manager.api.client.post = mock.Mock(return_value='fake')
106
+ host = 'fake_host'
107
+
108
+ result = manager.ensure_shares(host)
109
+
110
+ self.assertEqual(result, 'fake')
@@ -87,6 +87,12 @@ class ServiceManager(base.Manager):
87
87
  return self._do_disable(host, binary, RESOURCE_PATH,
88
88
  disable_reason=disable_reason)
89
89
 
90
+ @api_versions.wraps("2.86")
91
+ def ensure_shares(self, host): # noqa
92
+ resource_path = f'{RESOURCE_PATH}/ensure_shares'
93
+ body = {"host": host}
94
+ return self.api.client.post(resource_path, body=body)
95
+
90
96
  def server_api_version(self, url_append=""):
91
97
  """Returns the API Version supported by the server.
92
98
 
@@ -17,6 +17,7 @@ Besjana Gjika <besa8383@gmail.com>
17
17
  Bob Callaway <bob.callaway@netapp.com>
18
18
  CaiqueMello <caiquemellosbo@gmail.com>
19
19
  Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
20
+ Carlos Eduardo <ces.eduardo98@gmail.com>
20
21
  Carlos da Silva <ces.eduardo98@gmail.com>
21
22
  ChangBo Guo(gcb) <eric.guo@easystack.cn>
22
23
  Chen <dstbtgagt@foxmail.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: python-manilaclient
3
- Version: 5.1.0
3
+ Version: 5.2.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
@@ -11,7 +11,7 @@ manilaclient/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
11
11
  manilaclient/common/_i18n.py,sha256=-ia90LTyuQwvJXncEvUZTmoFk7n3_5B3Cib28B1nev0,1131
12
12
  manilaclient/common/cliutils.py,sha256=_JnNgXbwdn-nrJXupv88yhATYFs57slr7IipJR53DVM,8172
13
13
  manilaclient/common/constants.py,sha256=cdkAnu5rq3GFWUHiFUwjOlzb8dqwSXN2fN3F4T3iej4,4098
14
- manilaclient/common/httpclient.py,sha256=G9az_rzNGFLa1JTbb3B3ueRGioKFxqOH6zC0EN9Xdxw,7277
14
+ manilaclient/common/httpclient.py,sha256=ehc_7LKjETIykwfEF06G2vDk9yGTtziemuQ8uJas37k,7217
15
15
  manilaclient/common/apiclient/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
16
  manilaclient/common/apiclient/exceptions.py,sha256=Qy3Z84h8bpbhS3OqdNjOg1FVcmy4VxF5lh-xsYr5F6c,12887
17
17
  manilaclient/common/apiclient/utils.py,sha256=gP33HSR7G-jaAMtQ32seO_yK84VolsFSqymtzSUg8jE,2781
@@ -24,7 +24,7 @@ manilaclient/osc/v2/messages.py,sha256=Z_nM0b7GWbYUFf2T-d2q8yWNT4eroYDv1c3LeJsdH
24
24
  manilaclient/osc/v2/quotas.py,sha256=bRF1U8wjjBqeaDROlB3kyi-2cTA-iElCc677l0hRo_o,14707
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
- manilaclient/osc/v2/services.py,sha256=ulQQAGxypJmDFddA694HUpDiPqKOr1grQilEiXvt-S4,5486
27
+ manilaclient/osc/v2/services.py,sha256=CNZweoQqbAdoViU2Q00PYK2PKUrt4B253JzqYeA0YbM,6629
28
28
  manilaclient/osc/v2/share.py,sha256=LQCFqBwpykk50RFGJpdD_eV8w7BE2duIxN4XLEOY0NQ,58022
29
29
  manilaclient/osc/v2/share_access_rules.py,sha256=815R8utTN3T9LPQ-eC2KPvUrI3HeVUDeh5Pqvw8OH-U,17889
30
30
  manilaclient/osc/v2/share_backups.py,sha256=17yE6Z5NrKzpUNuajSBnlaYZy3YRFQT9_ID-DAq3JL8,14055
@@ -120,14 +120,14 @@ manilaclient/tests/unit/osc/v2/test_messages.py,sha256=XiBKFNZNUEmKI9XL-X3G-tE22
120
120
  manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=T7v3_Zt1TqWWZiD089fMpdrvuIWEoDo6eYPddajaZCg,16278
121
121
  manilaclient/tests/unit/osc/v2/test_resource_locks.py,sha256=8PeAVw2PLDSOII3mXzyzxIfs55cLpUas-t4j-ySCdhQ,10236
122
122
  manilaclient/tests/unit/osc/v2/test_security_services.py,sha256=dIZGOgWfY3rAul4IyV2jAImxaewAlMQ8jr9ac1NwniQ,22375
123
- manilaclient/tests/unit/osc/v2/test_services.py,sha256=LA5KBW9z0_bID4WrCqIbFydUeutsLZWxSPuIqEW5PRA,9276
124
- manilaclient/tests/unit/osc/v2/test_share.py,sha256=hEQ3o73UTG2_vseKLOXUD0ta50Cy44nQsoRAhEzZMy0,74494
123
+ manilaclient/tests/unit/osc/v2/test_services.py,sha256=VOS29A3XPkZ_e3s-Gpl0kaWg1OO0PIyMIjXhJnwWsro,11077
124
+ manilaclient/tests/unit/osc/v2/test_share.py,sha256=_sSqCsZv4oMIHO0yQ7oStc1hpiKVbTPfjSrhpizfawk,74477
125
125
  manilaclient/tests/unit/osc/v2/test_share_access_rules.py,sha256=eDaZ9gM58b66Ea_0nstI0RHOEqE4HbR0kAkaYCLDXr0,20521
126
126
  manilaclient/tests/unit/osc/v2/test_share_backups.py,sha256=vegKOqKJ150WSQqMiGbhHw5iMuRUdx_Bt3K-Ae9DKmU,13644
127
127
  manilaclient/tests/unit/osc/v2/test_share_group_snapshots.py,sha256=zkchulCEXnzHQxgoVJmSo_LffCnPO2kEAu81sKHiL-8,21560
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
130
- manilaclient/tests/unit/osc/v2/test_share_groups.py,sha256=GryOPc_5HCpXpKbZOlOuMrejeaGk6ZJ5jMaIw1TLGzA,24594
130
+ manilaclient/tests/unit/osc/v2/test_share_groups.py,sha256=muLCp8IFUPQ0Dqgh1uwcoRKzX6Jj0Bx4z8EG6g1Oknc,24623
131
131
  manilaclient/tests/unit/osc/v2/test_share_instance_export_locations.py,sha256=F0dCdSglHRnt6hux5V_mgcaghAH1h988Y3MmBKnbLDE,5208
132
132
  manilaclient/tests/unit/osc/v2/test_share_instances.py,sha256=OCgMnmdhAM6s7aayty9XHwv6Ohq6BFTrFxUhu74LRU8,12339
133
133
  manilaclient/tests/unit/osc/v2/test_share_limits.py,sha256=BXXlPJ4fThHKlBdY9OYf7tynSLCqwPstXt1gV6xIrK0,3044
@@ -166,7 +166,7 @@ manilaclient/tests/unit/v2/test_quota_classes.py,sha256=qS_6zydG7VGVDSuWHUxJLKNx
166
166
  manilaclient/tests/unit/v2/test_quotas.py,sha256=cTTQ3Y80vMOcaSdHKLBduObiMOnsijugERZRA77lxGo,12085
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
- manilaclient/tests/unit/v2/test_services.py,sha256=WPnfwLvk6-2juksU1AKGW80p9mlwo6x4K2C23kdZ7jc,3758
169
+ manilaclient/tests/unit/v2/test_services.py,sha256=8jH2B1B2pUswxz2HVWKdEhR5kL3dQIzGBJZDhCbQcuA,4053
170
170
  manilaclient/tests/unit/v2/test_share_backups.py,sha256=ysGFNDSEwF1dG5qRQg12Yb38Kl2Oe3XUwkF7gimrzeo,3604
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
@@ -215,7 +215,7 @@ manilaclient/v2/quotas.py,sha256=JEj7AB-0TBtx0h_TlwjbdW8bT6xrUQ6OUJlosoZVCvk,110
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
- manilaclient/v2/services.py,sha256=CempsR6sd674om1NnYbQjRlNMaIWuSC4ltth64_OsEA,3717
218
+ manilaclient/v2/services.py,sha256=Ap0eAxkI2tx8bdZtc_Hshb3THkAj4hiXU_xTenuSAKc,3942
219
219
  manilaclient/v2/share_access_rules.py,sha256=XjLl-vk_TOdFRTcGLS8YqzfZAHi1wNHb8VzMJvlBuFI,2994
220
220
  manilaclient/v2/share_backups.py,sha256=QQhRWT_txSd3wdGpg4NcrtV_N-wgdmQnhx9y3eOyGtI,4832
221
221
  manilaclient/v2/share_export_locations.py,sha256=w72EE6-gQrD69-E4T8pZ4_oalz5lUEKIODCD2TQrRz8,2782
@@ -241,11 +241,11 @@ manilaclient/v2/shares.py,sha256=Aletqm1t0nO62tBcJGw0QRNPCuN6XgJjPJXCQIl0TCk,321
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.1.0.dist-info/AUTHORS,sha256=q-fDAr-CNQVRWcCeoR21txXum6B8gr4oVSJRZ5WxXDw,7546
245
- python_manilaclient-5.1.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
246
- python_manilaclient-5.1.0.dist-info/METADATA,sha256=BWq8zeWKUbeuV-lp_xgg7kfLfatt2NrRKQtwNSkaLiQ,5493
247
- python_manilaclient-5.1.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
248
- python_manilaclient-5.1.0.dist-info/entry_points.txt,sha256=z46GPnjbNkhIQIPyLxoEAdEB4mU2C3t0VM8JrCJ8qy8,11784
249
- python_manilaclient-5.1.0.dist-info/pbr.json,sha256=vGrVvZxeG4OUH1VMHpb-hrMX797RFe17PzB2tiTvK7Y,46
250
- python_manilaclient-5.1.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
251
- python_manilaclient-5.1.0.dist-info/RECORD,,
244
+ python_manilaclient-5.2.0.dist-info/AUTHORS,sha256=roa6rSbgpUcEuhPoutFEYCIa_bkk2R58a6VHogbFRqw,7587
245
+ python_manilaclient-5.2.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
246
+ python_manilaclient-5.2.0.dist-info/METADATA,sha256=iv4NLhBjvMAzluqKE2y7yesJjuQWNLpQ3KuSsh5ma6Q,5493
247
+ python_manilaclient-5.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
248
+ python_manilaclient-5.2.0.dist-info/entry_points.txt,sha256=ON9iJrTknl9orD1oK47hneAy7fS16KpNO2YLMAaDYgw,11862
249
+ python_manilaclient-5.2.0.dist-info/pbr.json,sha256=SSnqyfMESOCCsx5hqn9YRq6g6LX7tn7jWAKAgYXYFjE,46
250
+ python_manilaclient-5.2.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
251
+ python_manilaclient-5.2.0.dist-info/RECORD,,
@@ -114,6 +114,7 @@ share_server_migration_show = manilaclient.osc.v2.share_servers:ShareServerMigra
114
114
  share_server_migration_start = manilaclient.osc.v2.share_servers:ShareServerMigrationStart
115
115
  share_server_set = manilaclient.osc.v2.share_servers:SetShareServer
116
116
  share_server_show = manilaclient.osc.v2.share_servers:ShowShareServer
117
+ share_service_ensure_shares = manilaclient.osc.v2.services:EnsureShareService
117
118
  share_service_list = manilaclient.osc.v2.services:ListShareService
118
119
  share_service_set = manilaclient.osc.v2.services:SetShareService
119
120
  share_set = manilaclient.osc.v2.share:SetShare
@@ -0,0 +1 @@
1
+ {"git_version": "31e7ad9", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "8969f0e", "is_release": true}