python-manilaclient 4.9.0__py3-none-any.whl → 5.0.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.
@@ -211,6 +211,8 @@ class ShowShareNetwork(command.ShowOne):
211
211
  parsed_args.share_network)
212
212
 
213
213
  data = share_network._info
214
+ if 'share_network_subnets' not in data:
215
+ data['share_network_subnets'] = []
214
216
 
215
217
  # Special mapping for columns to make the output easier to read:
216
218
  # 'metadata' --> 'properties'
@@ -308,14 +310,19 @@ class CreateShareNetwork(command.ShowOne):
308
310
  elif parsed_args.availability_zone:
309
311
  availability_zone = parsed_args.availability_zone
310
312
 
311
- share_network = share_client.share_networks.create(
312
- name=parsed_args.name,
313
- description=parsed_args.description,
314
- neutron_net_id=parsed_args.neutron_net_id,
315
- neutron_subnet_id=parsed_args.neutron_subnet_id,
316
- availability_zone=availability_zone,
317
- )
313
+ kwargs = {
314
+ "name": parsed_args.name,
315
+ "description": parsed_args.description,
316
+ "neutron_net_id": parsed_args.neutron_net_id,
317
+ "neutron_subnet_id": parsed_args.neutron_subnet_id,
318
+ }
319
+ if availability_zone:
320
+ kwargs['availability_zone'] = availability_zone
321
+ share_network = share_client.share_networks.create(**kwargs)
322
+
318
323
  share_network_data = share_network._info
324
+ if 'share_network_subnets' not in share_network_data:
325
+ share_network_data['share_network_subnets'] = []
319
326
  share_network_data.pop('links', None)
320
327
  if parsed_args.formatter == 'table':
321
328
  share_network_data['share_network_subnets'] = (
@@ -356,6 +356,12 @@ class PromoteShareReplica(command.Command):
356
356
  help=_('Quiesce wait time in seconds. Available for '
357
357
  'microversion >= 2.75')
358
358
  )
359
+ parser.add_argument(
360
+ '--wait',
361
+ action='store_true',
362
+ default=False,
363
+ help=_('Wait for share replica promotion')
364
+ )
359
365
  return parser
360
366
 
361
367
  def take_action(self, parsed_args):
@@ -377,6 +383,15 @@ class PromoteShareReplica(command.Command):
377
383
 
378
384
  try:
379
385
  share_client.share_replicas.promote(*args)
386
+ if parsed_args.wait:
387
+ if not osc_utils.wait_for_status(
388
+ status_f=share_client.share_replicas.get,
389
+ res_id=replica.id,
390
+ success_status=['active'],
391
+ status_field='replica_state'
392
+ ):
393
+ LOG.error(_("ERROR: Share replica is in error state."))
394
+
380
395
  except Exception as e:
381
396
  raise exceptions.CommandError(_(
382
397
  "Failed to promote replica to 'active': %s" % (e)))
@@ -146,6 +146,23 @@ class ListShareServer(command.Lister):
146
146
  "Available for microversion >= 2.51 (Optional, "
147
147
  "Default=None)")
148
148
  )
149
+ parser.add_argument(
150
+ '--source-share-server-id',
151
+ metavar='<source-share-server-id>',
152
+ type=str,
153
+ default=None,
154
+ help=_("Share server ID to be used as a filter. Available for "
155
+ "microversion >= 2.57 (Optional, Default=None)")
156
+ )
157
+ parser.add_argument(
158
+ '--identifier',
159
+ metavar='<identifier>',
160
+ type=str,
161
+ default=None,
162
+ help=_("Identifier of the share server in the share back end. "
163
+ "Available for microversion >= 2.49 "
164
+ "(Optional, Default=None)")
165
+ )
149
166
  identity_common.add_project_domain_option_to_parser(parser)
150
167
  return parser
151
168
 
@@ -160,12 +177,24 @@ class ListShareServer(command.Lister):
160
177
  parsed_args.project,
161
178
  parsed_args.project_domain).id
162
179
 
180
+ if (parsed_args.identifier and
181
+ share_client.api_version < api_versions.APIVersion("2.49")):
182
+ raise exceptions.CommandError(
183
+ "Filtering by identifier is only allowed with manila API "
184
+ "version >= 2.49."
185
+ )
163
186
  if (parsed_args.share_network_subnet and
164
187
  share_client.api_version < api_versions.APIVersion("2.51")):
165
188
  raise exceptions.CommandError(
166
189
  "Share network subnet can be specified only with manila API "
167
190
  "version >= 2.51"
168
191
  )
192
+ if (parsed_args.source_share_server_id and
193
+ share_client.api_version < api_versions.APIVersion("2.57")):
194
+ raise exceptions.CommandError(
195
+ "Filtering by source_share_server_id is only allowed with "
196
+ "manila API version >= 2.57."
197
+ )
169
198
 
170
199
  columns = [
171
200
  'ID',
@@ -187,6 +216,16 @@ class ListShareServer(command.Lister):
187
216
  parsed_args.share_network).id
188
217
  search_opts['share_network'] = share_network_id
189
218
 
219
+ if parsed_args.source_share_server_id:
220
+ search_opts['source_share_server_id'] = (
221
+ parsed_args.source_share_server_id
222
+ )
223
+
224
+ if parsed_args.identifier:
225
+ search_opts['identifier'] = (
226
+ parsed_args.identifier
227
+ )
228
+
190
229
  if parsed_args.share_network_subnet:
191
230
  search_opts['share_network_subnet_id'] = (
192
231
  parsed_args.share_network_subnet)
@@ -1495,6 +1495,7 @@ class FakeShareServer(object):
1495
1495
  'share_network_name': None,
1496
1496
  'share_network_id': str(uuid.uuid4()),
1497
1497
  'share_network_subnet_id': str(uuid.uuid4()),
1498
+ 'source_share_server_id': str(uuid.uuid4()),
1498
1499
  'created_at': datetime.datetime.now().isoformat(),
1499
1500
  'is_auto_deletable': False,
1500
1501
  'identifier': str(uuid.uuid4())
@@ -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)
@@ -617,7 +617,10 @@ class TestShareReplicaPromote(TestShareReplica):
617
617
  super(TestShareReplicaPromote, self).setUp()
618
618
 
619
619
  self.share_replica = (
620
- manila_fakes.FakeShareReplica.create_one_replica()
620
+ manila_fakes.FakeShareReplica.create_one_replica(
621
+ attrs={
622
+ 'status': 'available'}
623
+ )
621
624
  )
622
625
  self.replicas_mock.get.return_value = self.share_replica
623
626
 
@@ -630,6 +633,7 @@ class TestShareReplicaPromote(TestShareReplica):
630
633
  ]
631
634
  verifylist = [
632
635
  ('replica', self.share_replica.id),
636
+ ('wait', False)
633
637
  ]
634
638
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
635
639
 
@@ -658,6 +662,28 @@ class TestShareReplicaPromote(TestShareReplica):
658
662
  wait_time)
659
663
  self.assertIsNone(result)
660
664
 
665
+ @mock.patch.object(osc_share_replicas.osc_utils, 'wait_for_status',
666
+ mock.Mock())
667
+ def test_share_replica_promote_wait(self):
668
+ arglist = [
669
+ self.share_replica.id,
670
+ '--wait'
671
+ ]
672
+ verifylist = [
673
+ ('replica', self.share_replica.id),
674
+ ('wait', True)
675
+ ]
676
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
677
+
678
+ result = self.cmd.take_action(parsed_args)
679
+
680
+ self.replicas_mock.promote.assert_called_with(
681
+ self.share_replica)
682
+ self.assertIsNone(result)
683
+ osc_share_replicas.osc_utils.wait_for_status.assert_called_once_with(
684
+ status_f=self.replicas_mock.get, res_id=self.share_replica.id,
685
+ success_status=['active'], status_field='replica_state')
686
+
661
687
  def test_share_replica_promote_exception(self):
662
688
  arglist = [
663
689
  self.share_replica.id,
@@ -219,6 +219,56 @@ class TestListShareServer(TestShareServer):
219
219
  self.assertEqual(self.columns, columns)
220
220
  self.assertEqual(list(self.values), list(data))
221
221
 
222
+ def test_share_server_list_by_source_share_server(self):
223
+ expected_source_share_server_id = (
224
+ self.servers_list[0].source_share_server_id
225
+ )
226
+ arglist = [
227
+ '--source-share-server-id', expected_source_share_server_id,
228
+ ]
229
+ verifylist = [
230
+ ('source_share_server_id', expected_source_share_server_id),
231
+ ]
232
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
233
+
234
+ columns, data = self.cmd.take_action(parsed_args)
235
+
236
+ search_opts = {
237
+ 'status': None,
238
+ 'host': None,
239
+ 'project_id': None,
240
+ 'source_share_server_id': expected_source_share_server_id,
241
+ }
242
+
243
+ self.servers_mock.list.assert_called_once_with(
244
+ search_opts=search_opts,
245
+ )
246
+
247
+ self.assertEqual(self.columns, columns)
248
+ self.assertEqual(list(self.values), list(data))
249
+
250
+ def test_share_server_list_by_identifier(self):
251
+ expected_identifier = self.servers_list[0].identifier
252
+ arglist = ['--identifier', expected_identifier,]
253
+ verifylist = [('identifier', expected_identifier),]
254
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
255
+
256
+ columns, data = self.cmd.take_action(parsed_args)
257
+
258
+ search_opts = {
259
+ 'status': None,
260
+ 'host': None,
261
+ 'project_id': None,
262
+ 'identifier': expected_identifier,
263
+ }
264
+
265
+ self.servers_mock.list.assert_called_once_with(
266
+ search_opts=search_opts,
267
+ )
268
+
269
+ self.assertEqual(self.columns, columns)
270
+ self.assertEqual(list(self.values), list(data))
271
+
222
272
 
223
273
  class TestAdoptShareServer(TestShareServer):
224
274
 
@@ -224,12 +224,15 @@ class FakeHTTPClient(fakes.FakeHTTPClient):
224
224
 
225
225
  def get_shares_detail(self, **kw):
226
226
  endpoint = "http://127.0.0.1:8786/v2"
227
- share_id = '1234'
227
+ share_id1234 = '1234'
228
+ share_id1111 = '1111'
229
+ share_id2222 = '2222'
230
+ share_id3333 = '3333'
228
231
 
229
232
  shares = {
230
233
  'shares': [
231
234
  {
232
- 'id': share_id,
235
+ 'id': share_id1234,
233
236
  'name': 'sharename',
234
237
  'status': 'fake_status',
235
238
  'size': 1,
@@ -237,9 +240,52 @@ class FakeHTTPClient(fakes.FakeHTTPClient):
237
240
  'export_location': 'fake_export_location',
238
241
  'snapshot_id': 'fake_snapshot_id',
239
242
  'links': [
240
- {"href": endpoint + "/fake_project/shares/" + share_id,
241
- "rel": "self"},
243
+ {"href": endpoint + "/fake_project/shares/"
244
+ + share_id1234, "rel": "self"},
245
+ ],
246
+ 'metadata': {}
247
+ },
248
+ {
249
+ 'id': share_id1111,
250
+ 'name': 'sharename1',
251
+ 'status': 'fake_status1',
252
+ 'size': 1,
253
+ 'host': 'fake_host',
254
+ 'export_location': 'fake_export_location',
255
+ 'snapshot_id': 'fake_snapshot_id',
256
+ 'links': [
257
+ {"href": endpoint + "/fake_project/shares/"
258
+ + share_id1111, "rel": "self"},
259
+ ],
260
+ 'metadata': {}
261
+ },
262
+ {
263
+ 'id': share_id2222,
264
+ 'name': 'sharename2',
265
+ 'status': 'fake_status2',
266
+ 'size': 1,
267
+ 'host': 'fake_host',
268
+ 'export_location': 'fake_export_location',
269
+ 'snapshot_id': 'fake_snapshot_id',
270
+ 'links': [
271
+ {"href": endpoint + "/fake_project/shares/"
272
+ + share_id2222, "rel": "self"},
273
+ ],
274
+ 'metadata': {'key1': 'value1'}
275
+ },
276
+ {
277
+ 'id': share_id3333,
278
+ 'name': 'sharename3',
279
+ 'status': 'fake_status3',
280
+ 'size': 1,
281
+ 'host': 'fake_host',
282
+ 'export_location': 'fake_export_location',
283
+ 'snapshot_id': 'fake_snapshot_id',
284
+ 'links': [
285
+ {"href": endpoint + "/fake_project/shares/"
286
+ + share_id3333, "rel": "self"},
242
287
  ],
288
+ 'metadata': {'key1': 'value1', 'key2': 'value2'}
243
289
  },
244
290
  ],
245
291
  }
@@ -139,7 +139,7 @@ class ClientTest(utils.TestCase):
139
139
 
140
140
  def _get_client_args(self, **kwargs):
141
141
  client_args = {
142
- 'auth_url': 'both',
142
+ 'auth_url': 'http://identity.example.com',
143
143
  'api_version': manilaclient.API_DEPRECATED_VERSION,
144
144
  'username': 'fake_username',
145
145
  'service_type': 'sharev2',
@@ -160,17 +160,17 @@ class ClientTest(utils.TestCase):
160
160
  return client_args
161
161
 
162
162
  @ddt.data(
163
- {'auth_url': 'only_v3', 'password': 'password_backward_compat',
164
- 'endpoint_type': 'publicURL', 'project_id': 'foo_tenant_project_id'},
163
+ {'auth_url': 'http://identity.example.com',
164
+ 'password': 'password_backward_compat',
165
+ 'endpoint_type': 'publicURL',
166
+ 'project_id': 'foo_tenant_project_id'},
165
167
  {'password': 'renamed_api_key', 'endpoint_type': 'public',
166
168
  'tenant_id': 'foo_tenant_project_id'},
167
169
  )
168
- def test_client_init_no_session_no_auth_token_v3(self, kwargs):
170
+ def test_client_init_no_session_no_auth_token(self, kwargs):
169
171
  def fake_url_for(version):
170
172
  if version == 'v3.0':
171
173
  return 'url_v3.0'
172
- elif version == 'v2.0' and self.auth_url == 'both':
173
- return 'url_v2.0'
174
174
  else:
175
175
  return None
176
176
 
@@ -232,55 +232,6 @@ class ClientTest(utils.TestCase):
232
232
  client_args['service_type'])
233
233
  mocked_ks_client.authenticate.assert_called_with()
234
234
 
235
- @ddt.data(
236
- {'auth_url': 'only_v2', 'password': 'foo', 'project_id': 'bar'},
237
- {'password': 'foo', 'tenant_id': 'bar'},
238
- )
239
- def test_client_init_no_session_no_auth_token_v2(self, kwargs):
240
- self.mock_object(client.httpclient, 'HTTPClient')
241
- self.mock_object(client.ks_client, 'Client')
242
- self.mock_object(client.session.discover, 'Discover')
243
- self.mock_object(client.session, 'Session')
244
- client_args = self._get_client_args(**kwargs)
245
- client_args['api_version'] = manilaclient.API_MIN_VERSION
246
- self.auth_url = client_args['auth_url']
247
- catalog = {
248
- 'share': [
249
- {'region': 'SecondRegion', 'publicUrl': 'http://4.4.4.4'},
250
- ],
251
- 'sharev2': [
252
- {'region': 'FirstRegion', 'publicUrl': 'http://1.1.1.1'},
253
- {'region': 'secondregion', 'publicUrl': 'http://2.2.2.2'},
254
- {'region': 'SecondRegion', 'internalUrl': 'http://3.3.3.1',
255
- 'publicUrl': 'http://3.3.3.3', 'adminUrl': 'http://3.3.3.2'},
256
- ],
257
- }
258
- client.session.discover.Discover.return_value.url_for.side_effect = (
259
- lambda v: 'url_v2.0' if v == 'v2.0' else None)
260
- client.ks_client.Client.return_value.auth_token.return_value = (
261
- 'fake_token')
262
- mocked_ks_client = client.ks_client.Client.return_value
263
- mocked_ks_client.service_catalog.get_endpoints.return_value = catalog
264
-
265
- client.Client(**client_args)
266
-
267
- client.httpclient.HTTPClient.assert_called_with(
268
- 'http://3.3.3.3', mock.ANY, 'python-manilaclient', insecure=False,
269
- cacert=None, cert=client_args['cert'], timeout=None, retries=None,
270
- http_log_debug=False, api_version=manilaclient.API_MIN_VERSION)
271
- client.ks_client.Client.assert_called_with(
272
- session=mock.ANY, version=(2, 0), auth_url='url_v2.0',
273
- username=client_args['username'],
274
- password=client_args.get('password'),
275
- tenant_id=client_args.get('tenant_id',
276
- client_args.get('project_id')),
277
- tenant_name=client_args['project_name'],
278
- region_name=client_args['region_name'], cert=client_args['cert'],
279
- use_keyring=False, force_new_token=False, stale_duration=300)
280
- mocked_ks_client.service_catalog.get_endpoints.assert_called_with(
281
- client_args['service_type'])
282
- mocked_ks_client.authenticate.assert_called_with()
283
-
284
235
  @mock.patch.object(client.ks_client, 'Client', mock.Mock())
285
236
  @mock.patch.object(client.session.discover, 'Discover', mock.Mock())
286
237
  @mock.patch.object(client.session, 'Session', mock.Mock())
@@ -421,7 +421,7 @@ class SharesTest(utils.TestCase):
421
421
  cs.assert_called(
422
422
  'GET', '/shares/detail?is_public=True&with_count=True')
423
423
  self.assertEqual(2, count)
424
- self.assertEqual(1, len(shares))
424
+ self.assertEqual(4, len(shares))
425
425
 
426
426
  def test_list_shares_detailed_with_count(self):
427
427
  cs.shares.list(detailed=True)
@@ -231,8 +231,65 @@ class ShellTest(test_utils.TestCase):
231
231
 
232
232
  def test_list_filter_by_metadata(self):
233
233
  self.run_command('list --metadata key=value')
234
+ # /shares/detail?metadata={'key': 'value'}
234
235
  self.assert_called(
235
- 'GET', '/shares/detail?metadata=%7B%27key%27%3A+%27value%27%7D')
236
+ 'GET', '/shares/detail?metadata='
237
+ '%7B%27key%27%3A+%27value%27%7D')
238
+
239
+ def test_list_filter_by_metadata_with_multiple_key_values(self):
240
+ self.run_command('list --metadata key1=value1 '
241
+ 'key2=value2 key3=value3')
242
+ # /shares/detail?metadata={'key1': 'value1',
243
+ # 'key2': 'value2', 'key3': 'value3'}
244
+ self.assert_called(
245
+ 'GET', '/shares/detail?metadata='
246
+ '%7B%27key1%27%3A+%27value1%27%2C+%27key2%27%3A+'
247
+ '%27value2%27%2C+%27key3%27%3A+%27value3%27%7D')
248
+
249
+ @mock.patch.object(cliutils, 'print_list', mock.Mock())
250
+ def test_list_filter_by_metadata_with_empty_metadata(self):
251
+ self.run_command('list --metadata \'\'')
252
+
253
+ self.assert_called(
254
+ 'GET', '/shares/detail')
255
+ cliutils.print_list.assert_called()
256
+ args, _ = cliutils.print_list.call_args
257
+ shares = args[0]
258
+ # All 4 shares irrespective of metadata values printed
259
+ self.assertEqual(len(shares), 4)
260
+
261
+ @mock.patch.object(cliutils, 'print_list', mock.Mock())
262
+ def test_list_filter_by_metadata_set_to_None(self):
263
+ self.run_command('list --metadata None')
264
+
265
+ self.assert_called(
266
+ 'GET', '/shares/detail')
267
+ cliutils.print_list.assert_called()
268
+ args, _ = cliutils.print_list.call_args
269
+ shares = args[0]
270
+ # Check that the size of shares is 2(shares with metadata={})
271
+ self.assertEqual(len(shares), 2)
272
+ for share in shares:
273
+ self.assertEqual(share.metadata, {})
274
+
275
+ def test_list_filter_by_metadata_with_one_empty_of_many_metadata(self):
276
+ self.run_command('list --metadata key=value \'\'')
277
+ # /shares/detail?metadata={'key': 'value'}
278
+ self.assert_called(
279
+ 'GET', '/shares/detail?metadata='
280
+ '%7B%27key%27%3A+%27value%27%7D')
281
+
282
+ @mock.patch.object(cliutils, 'print_list', mock.Mock())
283
+ def test_list_filter_by_metadata_with_no_metadata(self):
284
+ self.run_command('list --metadata')
285
+ # /shares/detail
286
+ self.assert_called(
287
+ 'GET', '/shares/detail')
288
+ cliutils.print_list.assert_called()
289
+ args, _ = cliutils.print_list.call_args
290
+ shares = args[0]
291
+ # All 4 shares printed
292
+ self.assertEqual(len(shares), 4)
236
293
 
237
294
  def test_list_filter_by_extra_specs_and_its_aliases(self):
238
295
  aliases = ['--extra-specs', '--extra_specs', ]
@@ -3086,6 +3143,7 @@ class ShellTest(test_utils.TestCase):
3086
3143
  '--description my_fake_description --name fake_name fake-sg-id',
3087
3144
  )
3088
3145
  @mock.patch.object(shell_v2, '_find_share_group', mock.Mock())
3146
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3089
3147
  def test_share_group_snapshot_create(self, data):
3090
3148
  fake_sg = type('FakeShareGroup', (object,), {'id': '1234'})
3091
3149
  shell_v2._find_share_group.return_value = fake_sg
@@ -3094,6 +3152,21 @@ class ShellTest(test_utils.TestCase):
3094
3152
 
3095
3153
  shell_v2._find_share_group.assert_called_with(mock.ANY, 'fake-sg-id')
3096
3154
  self.assert_called('POST', '/share-group-snapshots')
3155
+ self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
3156
+
3157
+ @mock.patch.object(shell_v2, '_find_share_group', mock.Mock())
3158
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3159
+ def test_share_group_snapshot_create_with_wait(self):
3160
+ fake_sg = type('FakeShareGroup', (object,), {'id': '1234'})
3161
+ shell_v2._find_share_group.return_value = fake_sg
3162
+ self.run_command('share-group-snapshot-create fake-sg-id --wait')
3163
+
3164
+ shell_v2._find_share_group.assert_called_with(mock.ANY, 'fake-sg-id')
3165
+ self.assert_called('POST', '/share-group-snapshots')
3166
+ # _wait_for_resource_status should be triggered once
3167
+ shell_v2._wait_for_resource_status.assert_called_once_with(
3168
+ self.shell.cs, mock.ANY, resource_type='share_group_snapshot',
3169
+ expected_status='available')
3097
3170
 
3098
3171
  @mock.patch.object(cliutils, 'print_list', mock.Mock())
3099
3172
  def test_share_group_snapshot_list(self):
@@ -3195,6 +3268,7 @@ class ShellTest(test_utils.TestCase):
3195
3268
  self.run_command, 'share-group-snapshot-update 1234')
3196
3269
 
3197
3270
  @mock.patch.object(shell_v2, '_find_share_group_snapshot', mock.Mock())
3271
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3198
3272
  def test_share_group_snapshot_delete(self):
3199
3273
  fake_sg_snapshot = type('FakeSGSnapshot', (object,), {'id': '1234'})
3200
3274
  shell_v2._find_share_group_snapshot.return_value = fake_sg_snapshot
@@ -3202,6 +3276,22 @@ class ShellTest(test_utils.TestCase):
3202
3276
  self.run_command('share-group-snapshot-delete fake-group-snapshot')
3203
3277
 
3204
3278
  self.assert_called('DELETE', '/share-group-snapshots/1234')
3279
+ self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
3280
+
3281
+ @mock.patch.object(shell_v2, '_find_share_group_snapshot', mock.Mock())
3282
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3283
+ def test_share_group_snapshot_delete_with_wait(self):
3284
+ fake_sg_snapshot = type('FakeSGSnapshot', (object,), {'id': '1234'})
3285
+ shell_v2._find_share_group_snapshot.return_value = fake_sg_snapshot
3286
+
3287
+ self.run_command('share-group-snapshot-delete fake-group-snapshot'
3288
+ ' --wait')
3289
+
3290
+ self.assert_called('DELETE', '/share-group-snapshots/1234')
3291
+ # _wait_for_resource_status should be triggered once
3292
+ shell_v2._wait_for_resource_status.assert_called_once_with(
3293
+ self.shell.cs, mock.ANY, resource_type='share_group_snapshot',
3294
+ expected_status='deleted')
3205
3295
 
3206
3296
  @mock.patch.object(shell_v2, '_find_share_group_snapshot', mock.Mock())
3207
3297
  def test_share_group_snapshot_delete_force(self):
@@ -3420,6 +3510,7 @@ class ShellTest(test_utils.TestCase):
3420
3510
 
3421
3511
  @ddt.data(True, False)
3422
3512
  @mock.patch.object(shell_v2, '_find_share_replica', mock.Mock())
3513
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3423
3514
  def test_share_replica_delete_force(self, force):
3424
3515
 
3425
3516
  fake_replica = type('FakeShareReplica', (object,), {'id': '1234'})
@@ -3433,6 +3524,23 @@ class ShellTest(test_utils.TestCase):
3433
3524
  body={'force_delete': None})
3434
3525
  else:
3435
3526
  self.assert_called('DELETE', '/share-replicas/1234')
3527
+ self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
3528
+
3529
+ @mock.patch.object(shell_v2, '_find_share_replica', mock.Mock())
3530
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3531
+ def test_share_replica_delete_with_wait(self):
3532
+
3533
+ fake_replica = type('FakeShareReplica', (object,), {'id': '1234'})
3534
+ shell_v2._find_share_replica.return_value = fake_replica
3535
+
3536
+ self.run_command('share-replica-delete fake-replica --wait')
3537
+
3538
+ self.assert_called('DELETE', '/share-replicas/1234')
3539
+
3540
+ # _wait_for_resource_status should be triggered once
3541
+ shell_v2._wait_for_resource_status.assert_called_once_with(
3542
+ self.shell.cs, mock.ANY, resource_type='share_replica',
3543
+ expected_status='deleted')
3436
3544
 
3437
3545
  @ddt.data([1, 0], [1, 1], [2, 0], [2, 1], [2, 2])
3438
3546
  @ddt.unpack
@@ -3504,6 +3612,7 @@ class ShellTest(test_utils.TestCase):
3504
3612
  'fake-share-id --availability-zone fake-az',
3505
3613
  )
3506
3614
  @mock.patch.object(shell_v2, '_find_share', mock.Mock())
3615
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3507
3616
  def test_share_replica_create(self, data):
3508
3617
 
3509
3618
  fshare = type('FakeShare', (object,), {'id': 'fake-share-id'})
@@ -3515,6 +3624,26 @@ class ShellTest(test_utils.TestCase):
3515
3624
 
3516
3625
  shell_v2._find_share.assert_called_with(mock.ANY, fshare.id)
3517
3626
  self.assert_called('POST', '/share-replicas')
3627
+ self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
3628
+
3629
+ @mock.patch.object(shell_v2, '_find_share', mock.Mock())
3630
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3631
+ def test_share_replica_create_with_wait(self):
3632
+
3633
+ fshare = type('FakeShare', (object,), {'id': 'fake-share-id'})
3634
+ shell_v2._find_share.return_value = fshare
3635
+
3636
+ cmd = ('share-replica-create fake-share-id '
3637
+ '--availability-zone fake-az --wait')
3638
+
3639
+ self.run_command(cmd)
3640
+
3641
+ shell_v2._find_share.assert_called_with(mock.ANY, fshare.id)
3642
+ self.assert_called('POST', '/share-replicas')
3643
+ # _wait_for_resource_status should be triggered once
3644
+ shell_v2._wait_for_resource_status.assert_called_once_with(
3645
+ self.shell.cs, mock.ANY, resource_type='share_replica',
3646
+ expected_status='available')
3518
3647
 
3519
3648
  def test_share_replica_show(self):
3520
3649
 
@@ -3523,6 +3652,7 @@ class ShellTest(test_utils.TestCase):
3523
3652
  self.assert_called_anytime('GET', '/share-replicas/5678')
3524
3653
 
3525
3654
  @mock.patch.object(shell_v2, '_find_share_replica', mock.Mock())
3655
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3526
3656
  def test_share_replica_promote_quiesce_wait_time(self):
3527
3657
  fake_replica = type('FakeShareReplica', (object,), {'id': '1234'})
3528
3658
  shell_v2._find_share_replica.return_value = fake_replica
@@ -3532,6 +3662,21 @@ class ShellTest(test_utils.TestCase):
3532
3662
  self.assert_called(
3533
3663
  'POST', '/share-replicas/1234/action',
3534
3664
  body={'promote': {'quiesce_wait_time': '5'}})
3665
+ self.assertEqual(0, shell_v2._wait_for_resource_status.call_count)
3666
+
3667
+ @mock.patch.object(shell_v2, '_find_share_replica', mock.Mock())
3668
+ @mock.patch.object(shell_v2, '_wait_for_resource_status', mock.Mock())
3669
+ def test_share_replica_promote_with_wait_(self):
3670
+ fake_replica = type('FakeShareReplica', (object,), {'id': '1234'})
3671
+ shell_v2._find_share_replica.return_value = fake_replica
3672
+ cmd = ('share-replica-promote ' + fake_replica.id + ' --wait')
3673
+ self.run_command(cmd)
3674
+ self.assert_called(
3675
+ 'POST', '/share-replicas/1234/action')
3676
+ # _wait_for_resource_status should be triggered once
3677
+ shell_v2._wait_for_resource_status.assert_called_once_with(
3678
+ self.shell.cs, mock.ANY, resource_type='share_replica',
3679
+ expected_status='active', status_attr='replica_state')
3535
3680
 
3536
3681
  @ddt.data('promote', 'resync')
3537
3682
  @mock.patch.object(shell_v2, '_find_share_replica', mock.Mock())
manilaclient/v1/client.py CHANGED
@@ -49,13 +49,15 @@ class Client(object):
49
49
  Or, alternatively, you can create a client instance using the
50
50
  keystoneauth1.session API::
51
51
 
52
- >>> from keystoneclient.auth.identity import v2
52
+ >>> from keystoneclient.auth.identity import v3
53
53
  >>> from keystoneauth1 import session
54
54
  >>> from manilaclient import client
55
- >>> auth = v2.Password(auth_url=AUTH_URL,
55
+ >>> auth = v3.Password(auth_url=AUTH_URL,
56
56
  username=USERNAME,
57
+ user_domain_name=USER_DOMAIN_NAME,
57
58
  password=PASSWORD,
58
- project_name=PROJECT_ID)
59
+ project_name=PROJECT_ID,
60
+ project_domain_name=PROJECT_DOMAIN_NAME)
59
61
  >>> sess = session.Session(auth=auth)
60
62
  >>> manila = client.Client(VERSION, session=sess)
61
63
 
@@ -211,43 +213,26 @@ class Client(object):
211
213
  # Discover the supported keystone versions using the given url
212
214
  ks_discover = session.discover.Discover(ks_session, self.auth_url)
213
215
 
214
- # Inspect the auth_url to see the supported version. If both v3 and v2
215
- # are supported, then use the highest version if possible.
216
- v2_auth_url = ks_discover.url_for('v2.0')
217
- v3_auth_url = ks_discover.url_for('v3.0')
218
-
219
- if v3_auth_url:
220
- keystone_client = ks_client.Client(
221
- session=ks_session,
222
- version=(3, 0),
223
- auth_url=v3_auth_url,
224
- username=self.username,
225
- password=self.password,
226
- user_id=self.user_id,
227
- user_domain_name=self.user_domain_name,
228
- user_domain_id=self.user_domain_id,
229
- project_id=self.project_id or self.tenant_id,
230
- project_name=self.project_name,
231
- project_domain_name=self.project_domain_name,
232
- project_domain_id=self.project_domain_id,
233
- region_name=self.region_name)
234
- elif v2_auth_url:
235
- keystone_client = ks_client.Client(
236
- session=ks_session,
237
- version=(2, 0),
238
- auth_url=v2_auth_url,
239
- username=self.username,
240
- password=self.password,
241
- tenant_id=self.tenant_id,
242
- tenant_name=self.tenant_name,
243
- region_name=self.region_name,
244
- cert=self.cert,
245
- use_keyring=self.use_keyring,
246
- force_new_token=self.force_new_token,
247
- stale_duration=self.cached_token_lifetime)
248
- else:
216
+ auth_url = ks_discover.url_for('v3.0')
217
+ if not auth_url:
249
218
  raise exceptions.CommandError(
250
219
  'Unable to determine the Keystone version to authenticate '
251
220
  'with using the given auth_url.')
221
+
222
+ keystone_client = ks_client.Client(
223
+ session=ks_session,
224
+ version=(3, 0),
225
+ auth_url=auth_url,
226
+ username=self.username,
227
+ password=self.password,
228
+ user_id=self.user_id,
229
+ user_domain_name=self.user_domain_name,
230
+ user_domain_id=self.user_domain_id,
231
+ project_id=self.project_id or self.tenant_id,
232
+ project_name=self.project_name,
233
+ project_domain_name=self.project_domain_name,
234
+ project_domain_id=self.project_domain_id,
235
+ region_name=self.region_name)
236
+
252
237
  keystone_client.authenticate()
253
238
  return keystone_client
manilaclient/v2/client.py CHANGED
@@ -64,13 +64,15 @@ class Client(object):
64
64
  Or, alternatively, you can create a client instance using the
65
65
  keystoneauth1.session API::
66
66
 
67
- >>> from keystoneclient.auth.identity import v2
67
+ >>> from keystoneclient.auth.identity import v3
68
68
  >>> from keystoneauth1 import session
69
69
  >>> from manilaclient import client
70
- >>> auth = v2.Password(auth_url=AUTH_URL,
70
+ >>> auth = v3.Password(auth_url=AUTH_URL,
71
71
  username=USERNAME,
72
+ user_domain_name=USER_DOMAIN_NAME,
72
73
  password=PASSWORD,
73
- tenant_name=PROJECT_ID)
74
+ project_name=PROJECT_ID,
75
+ project_domain_name=PROJECT_DOMAIN_NAME)
74
76
  >>> sess = session.Session(auth=auth)
75
77
  >>> manila = client.Client(VERSION, session=sess)
76
78
 
@@ -261,43 +263,26 @@ class Client(object):
261
263
  # Discover the supported keystone versions using the given url
262
264
  ks_discover = session.discover.Discover(ks_session, self.auth_url)
263
265
 
264
- # Inspect the auth_url to see the supported version. If both v3 and v2
265
- # are supported, then use the highest version if possible.
266
- v2_auth_url = ks_discover.url_for('v2.0')
267
- v3_auth_url = ks_discover.url_for('v3.0')
268
-
269
- if v3_auth_url:
270
- keystone_client = ks_client.Client(
271
- session=ks_session,
272
- version=(3, 0),
273
- auth_url=v3_auth_url,
274
- username=self.username,
275
- password=self.password,
276
- user_id=self.user_id,
277
- user_domain_name=self.user_domain_name,
278
- user_domain_id=self.user_domain_id,
279
- project_id=self.project_id or self.tenant_id,
280
- project_name=self.project_name,
281
- project_domain_name=self.project_domain_name,
282
- project_domain_id=self.project_domain_id,
283
- region_name=self.region_name)
284
- elif v2_auth_url:
285
- keystone_client = ks_client.Client(
286
- session=ks_session,
287
- version=(2, 0),
288
- auth_url=v2_auth_url,
289
- username=self.username,
290
- password=self.password,
291
- tenant_id=self.tenant_id,
292
- tenant_name=self.tenant_name,
293
- region_name=self.region_name,
294
- cert=self.cert,
295
- use_keyring=self.use_keyring,
296
- force_new_token=self.force_new_token,
297
- stale_duration=self.cached_token_lifetime)
298
- else:
266
+ auth_url = ks_discover.url_for('v3.0')
267
+ if not auth_url:
299
268
  raise exceptions.CommandError(
300
269
  'Unable to determine the Keystone version to authenticate '
301
270
  'with using the given auth_url.')
271
+
272
+ keystone_client = ks_client.Client(
273
+ session=ks_session,
274
+ version=(3, 0),
275
+ auth_url=auth_url,
276
+ username=self.username,
277
+ password=self.password,
278
+ user_id=self.user_id,
279
+ user_domain_name=self.user_domain_name,
280
+ user_domain_id=self.user_domain_id,
281
+ project_id=self.project_id or self.tenant_id,
282
+ project_name=self.project_name,
283
+ project_domain_name=self.project_domain_name,
284
+ project_domain_id=self.project_domain_id,
285
+ region_name=self.region_name)
286
+
302
287
  keystone_client.authenticate()
303
288
  return keystone_client
manilaclient/v2/shell.py CHANGED
@@ -396,8 +396,8 @@ def _translate_keys(collection, convert):
396
396
  setattr(item, to_key, item._info[from_key])
397
397
 
398
398
 
399
- def _extract_metadata(args):
400
- return _extract_key_value_options(args, 'metadata')
399
+ def _extract_metadata(args, allow_empty_key=True):
400
+ return _extract_key_value_options(args, 'metadata', allow_empty_key)
401
401
 
402
402
 
403
403
  def _extract_extra_specs(args):
@@ -408,7 +408,7 @@ def _extract_group_specs(args):
408
408
  return _extract_key_value_options(args, 'group_specs')
409
409
 
410
410
 
411
- def _extract_key_value_options(args, option_name):
411
+ def _extract_key_value_options(args, option_name, allow_empty_key=True):
412
412
  result_dict = {}
413
413
  duplicate_options = []
414
414
 
@@ -419,10 +419,12 @@ def _extract_key_value_options(args, option_name):
419
419
  # unset doesn't require a val, so we have the if/else
420
420
  if '=' in option:
421
421
  (key, value) = option.split('=', 1)
422
- else:
422
+ elif allow_empty_key:
423
423
  key = option
424
424
  value = None
425
-
425
+ else:
426
+ # disallow empty key
427
+ continue
426
428
  if key not in result_dict:
427
429
  result_dict[key] = value
428
430
  else:
@@ -2502,7 +2504,7 @@ def do_list(cs, args):
2502
2504
  'share_network_id': share_network.id,
2503
2505
  'snapshot_id': snapshot.id,
2504
2506
  'share_type_id': share_type.id,
2505
- 'metadata': _extract_metadata(args),
2507
+ 'metadata': _extract_metadata(args, allow_empty_key=False),
2506
2508
  'extra_specs': _extract_extra_specs(args),
2507
2509
  'share_server_id': args.share_server_id,
2508
2510
  'project_id': args.project_id,
@@ -2558,6 +2560,10 @@ def do_list(cs, args):
2558
2560
  search_opts=search_opts, sort_key=args.sort_key,
2559
2561
  sort_dir=args.sort_dir
2560
2562
  )
2563
+ # When shell input is "--metadata None", filter metadata={}
2564
+ if shares and args.metadata:
2565
+ if "None" in args.metadata:
2566
+ shares = [share for share in shares if share.metadata == {}]
2561
2567
  # NOTE(vponomaryov): usage of 'export_location' and
2562
2568
  # 'export_locations' columns may cause scaling issue using API 2.9+ and
2563
2569
  # when lots of shares are returned.
@@ -6036,12 +6042,21 @@ def do_share_group_reset_state(cs, args):
6036
6042
  metavar='<description>',
6037
6043
  help='Optional share group snapshot description. (Default=None)',
6038
6044
  default=None)
6045
+ @cliutils.arg(
6046
+ '--wait',
6047
+ action='store_true',
6048
+ default=False,
6049
+ help='Wait for share group snapshot to be created')
6039
6050
  @cliutils.service_type('sharev2')
6040
6051
  def do_share_group_snapshot_create(cs, args):
6041
6052
  """Creates a new share group snapshot."""
6042
6053
  kwargs = {'name': args.name, 'description': args.description}
6043
6054
  share_group = _find_share_group(cs, args.share_group)
6044
6055
  sg_snapshot = cs.share_group_snapshots.create(share_group.id, **kwargs)
6056
+ if args.wait:
6057
+ _wait_for_resource_status(
6058
+ cs, sg_snapshot, resource_type='share_group_snapshot',
6059
+ expected_status='available')
6045
6060
  _print_share_group_snapshot(cs, sg_snapshot)
6046
6061
 
6047
6062
 
@@ -6242,6 +6257,11 @@ def do_share_group_snapshot_update(cs, args):
6242
6257
  default=False,
6243
6258
  help='Attempt to force delete the share group snapshot(s) (Default=False)'
6244
6259
  ' (Admin only).')
6260
+ @cliutils.arg(
6261
+ '--wait',
6262
+ action='store_true',
6263
+ default=False,
6264
+ help='Wait for share group snapshot to be deleted')
6245
6265
  @cliutils.service_type('sharev2')
6246
6266
  def do_share_group_snapshot_delete(cs, args):
6247
6267
  """Remove one or more share group snapshots."""
@@ -6254,6 +6274,10 @@ def do_share_group_snapshot_delete(cs, args):
6254
6274
  try:
6255
6275
  sg_snapshot_ref = _find_share_group_snapshot(cs, sg_snapshot)
6256
6276
  cs.share_group_snapshots.delete(sg_snapshot_ref, **kwargs)
6277
+ if args.wait:
6278
+ _wait_for_resource_status(
6279
+ cs, sg_snapshot, resource_type='share_group_snapshot',
6280
+ expected_status='deleted')
6257
6281
  except Exception as e:
6258
6282
  failure_count += 1
6259
6283
  print("Delete for share group snapshot %s failed: %s" % (
@@ -6413,6 +6437,11 @@ def do_share_replica_create(cs, args): # noqa
6413
6437
  action='single_alias',
6414
6438
  help='Optional network info ID or name. '
6415
6439
  'Available only for microversion >= 2.72')
6440
+ @cliutils.arg(
6441
+ '--wait',
6442
+ action='store_true',
6443
+ default=False,
6444
+ help='Wait for share replica to be created')
6416
6445
  def do_share_replica_create(cs, args): # noqa
6417
6446
  """Create a share replica."""
6418
6447
  share = _find_share(cs, args.share)
@@ -6441,6 +6470,10 @@ def do_share_replica_create(cs, args): # noqa
6441
6470
  body['share_network'] = share_network
6442
6471
 
6443
6472
  replica = cs.share_replicas.create(**body)
6473
+ if args.wait:
6474
+ _wait_for_resource_status(
6475
+ cs, replica, resource_type='share_replica',
6476
+ expected_status='available')
6444
6477
  _print_share_replica(cs, replica)
6445
6478
 
6446
6479
 
@@ -6482,6 +6515,11 @@ def do_share_replica_show(cs, args): # noqa
6482
6515
  help='Attempt to force deletion of a replica on its backend. Using '
6483
6516
  'this option will purge the replica from Manila even if it '
6484
6517
  'is not cleaned up on the backend. Defaults to False.')
6518
+ @cliutils.arg(
6519
+ '--wait',
6520
+ action='store_true',
6521
+ default=False,
6522
+ help='Wait for share replica to be deleted')
6485
6523
  @api_versions.wraps("2.11")
6486
6524
  def do_share_replica_delete(cs, args):
6487
6525
  """Remove one or more share replicas."""
@@ -6494,6 +6532,10 @@ def do_share_replica_delete(cs, args):
6494
6532
  try:
6495
6533
  replica_ref = _find_share_replica(cs, replica)
6496
6534
  cs.share_replicas.delete(replica_ref, **kwargs)
6535
+ if args.wait:
6536
+ _wait_for_resource_status(
6537
+ cs, replica_ref, resource_type='share_replica',
6538
+ expected_status='deleted')
6497
6539
  except Exception as e:
6498
6540
  failure_count += 1
6499
6541
  print("Delete for share replica %s failed: %s" % (replica, e),
@@ -6525,6 +6567,11 @@ def do_share_replica_promote(cs, args):
6525
6567
  default=None,
6526
6568
  help='Quiesce wait time in seconds. Available for '
6527
6569
  'microversion >= 2.75')
6570
+ @cliutils.arg(
6571
+ '--wait',
6572
+ action='store_true',
6573
+ default=False,
6574
+ help='Wait for share replica to be promoted')
6528
6575
  @api_versions.wraps("2.75") # noqa
6529
6576
  def do_share_replica_promote(cs, args): # noqa
6530
6577
  """Promote specified replica to 'active' replica_state."""
@@ -6534,6 +6581,12 @@ def do_share_replica_promote(cs, args): # noqa
6534
6581
  if args.quiesce_wait_time:
6535
6582
  quiesce_wait_time = args.quiesce_wait_time
6536
6583
  cs.share_replicas.promote(replica, quiesce_wait_time)
6584
+ if args.wait:
6585
+ _wait_for_resource_status(
6586
+ cs, replica,
6587
+ resource_type='share_replica',
6588
+ expected_status='active',
6589
+ status_attr='replica_state')
6537
6590
 
6538
6591
 
6539
6592
  @api_versions.wraps("2.47")
@@ -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 da Silva <ces.eduardo98@gmail.com>
20
21
  ChangBo Guo(gcb) <eric.guo@easystack.cn>
21
22
  Chen <dstbtgagt@foxmail.com>
22
23
  Chris MacNaughton <chris.macnaughton@canonical.com>
@@ -164,6 +165,7 @@ maaoyu <maaoyu@inspur.com>
164
165
  mark.sturdevant <mark.sturdevant@hpe.com>
165
166
  melakualehegn <melakualehegn34@gmail.com>
166
167
  melissaml <ma.lei@99cloud.net>
168
+ morozovalekseywot <morozovalekseywot@gmail.com>
167
169
  namrata <namrata.sitlani@citynetwork.eu>
168
170
  nidhimittalhada <nidhimittal19@gmail.com>
169
171
  paulali <paulali@protonmail.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: python-manilaclient
3
- Version: 4.9.0
3
+ Version: 5.0.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
@@ -22,18 +22,17 @@ Classifier: Programming Language :: Python :: 3.9
22
22
  Classifier: Programming Language :: Python :: 3.10
23
23
  Classifier: Programming Language :: Python :: 3.11
24
24
  Requires-Python: >=3.8
25
- Requires-Dist: Babel (!=2.4.0,>=2.3.4)
25
+ Requires-Dist: Babel (>=2.5.0)
26
26
  Requires-Dist: PrettyTable (>=0.7.1)
27
27
  Requires-Dist: debtcollector (>=1.2.0)
28
28
  Requires-Dist: osc-lib (>=1.10.0)
29
29
  Requires-Dist: oslo.config (>=5.2.0)
30
30
  Requires-Dist: oslo.log (>=3.36.0)
31
- Requires-Dist: oslo.serialization (!=2.19.1,>=2.18.0)
31
+ Requires-Dist: oslo.serialization (>=2.20.0)
32
32
  Requires-Dist: oslo.utils (>=3.33.0)
33
- Requires-Dist: pbr (!=2.1.0,>=2.0.0)
33
+ Requires-Dist: pbr (>=3.0.0)
34
34
  Requires-Dist: python-keystoneclient (>=3.8.0)
35
35
  Requires-Dist: requests (>=2.14.2)
36
- Requires-Dist: simplejson (>=3.5.1)
37
36
 
38
37
  ========================
39
38
  Team and repository tags
@@ -36,11 +36,11 @@ manilaclient/osc/v2/share_instance_export_locations.py,sha256=i5ulZz6PCDbZd_KXoE
36
36
  manilaclient/osc/v2/share_instances.py,sha256=1DlW2ldo6VjzBMgovozgDh2g6HDkHMLANS43ZecGhtQ,7645
37
37
  manilaclient/osc/v2/share_limits.py,sha256=3TtNFRYKd6VsUDjrFL_OZXq92dVO2luMGVHAelu08g8,2202
38
38
  manilaclient/osc/v2/share_network_subnets.py,sha256=VPWCfRkDZ5YZusxIMpcU2I7ioqlg1IDvg3qEhGPXbBY,13540
39
- manilaclient/osc/v2/share_networks.py,sha256=9iRXepC192lYDKu0NIcHXEGTRZwlUWeV68C4HHarv6Q,27777
39
+ manilaclient/osc/v2/share_networks.py,sha256=-mmms_53sHM2FtDHn_x_vOo8bxvxOVUEF40J3Iho0lc,28077
40
40
  manilaclient/osc/v2/share_pools.py,sha256=4TjomBQby4D0fL43FFCfrfau0TTsv1i-MswZNFEPt9g,3636
41
41
  manilaclient/osc/v2/share_replica_export_locations.py,sha256=FYUpNjb1jEzfCwmLh6-Kiczx_TKeVnOaQDCBoZZPn1s,2831
42
- manilaclient/osc/v2/share_replicas.py,sha256=pc97Y2WPWKXkeZF2Oahxz2PfEyxQ3coUmy2eC3hj3vM,14367
43
- manilaclient/osc/v2/share_servers.py,sha256=Weya_QNhpjsQbn9-TLkdV2eFvCQsMiB4C92e81tKmbo,23898
42
+ manilaclient/osc/v2/share_replicas.py,sha256=EIoiW13xxan28Tye-os5aHCCvtS4KxZQOJSzOeYNVaE,14935
43
+ manilaclient/osc/v2/share_servers.py,sha256=2SQgyGDqKWutzCt1yZ3PHuJMqsyuB7MAvx2DpfpCz3I,25436
44
44
  manilaclient/osc/v2/share_snapshot_instance_export_locations.py,sha256=ytZfnswxdcGXeYmFQ2tOtjc2zxFYHoiGIROwGrQpSEg,3244
45
45
  manilaclient/osc/v2/share_snapshot_instances.py,sha256=TYSKVJxwfuwQsj_QTnCUa4IfsLyqo_vHTdaYKVcy4Fo,5018
46
46
  manilaclient/osc/v2/share_snapshots.py,sha256=3UbodoxVkPI0zdfMsSr2Sh3ojsAiVGVt1EkLnCElx9g,30280
@@ -114,7 +114,7 @@ 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=z-m9G3CR_1h0qUvbDuzmsC0DZE2tat6wrU0vRDel0wc,51679
117
+ manilaclient/tests/unit/osc/v2/fakes.py,sha256=JZVVzHpZG4CLJdvcIuJXTCASn2JiDzXw96Yw65Dm0Bg,51736
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
120
  manilaclient/tests/unit/osc/v2/test_quotas.py,sha256=T7v3_Zt1TqWWZiD089fMpdrvuIWEoDo6eYPddajaZCg,16278
@@ -132,11 +132,11 @@ manilaclient/tests/unit/osc/v2/test_share_instance_export_locations.py,sha256=F0
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
134
134
  manilaclient/tests/unit/osc/v2/test_share_network_subnets.py,sha256=HNlYaF93wVVf0DlUG3Ejx8qio5hQYPlrMtyWUwhZoDs,16353
135
- manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=BO9ncD-cGAq92HFg3MD28olVhD25r8YvnX4ZUSOd0_w,27426
135
+ manilaclient/tests/unit/osc/v2/test_share_networks.py,sha256=21w-WJe58ltDdbSsNY1x08Us4nESmnO5O0PfjLqzl98,27390
136
136
  manilaclient/tests/unit/osc/v2/test_share_pools.py,sha256=URIdUtT3eQqtLWCHRKGu4t6cmI45qItQg3JXWBvC-z0,5395
137
137
  manilaclient/tests/unit/osc/v2/test_share_replica_export_locations.py,sha256=vdRF8FJxdoHT6XWuRpHgBK-va9q6td9ES2Hask3lfJY,3996
138
- manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=cdmUNK96olSe0TgOUMD8fVxsoX0hVJFkCHThcxxeUmc,22544
139
- manilaclient/tests/unit/osc/v2/test_share_servers.py,sha256=Vfe6lgf22Nxp0hK-HQ6tfK4N_tCDE4CVvv8cP08E4O0,24995
138
+ manilaclient/tests/unit/osc/v2/test_share_replicas.py,sha256=s6JTbanTp8NycsE7CH-9LeR8H6CksFLcYK3K1Mh63FU,23469
139
+ manilaclient/tests/unit/osc/v2/test_share_servers.py,sha256=74AkabmxN8TJzVhAlUyHKb_CXqIv73fDhP4rXpsTUgc,26646
140
140
  manilaclient/tests/unit/osc/v2/test_share_snapshot_instance_export_locations.py,sha256=rgcHxO2GM_AxhmBnLJFVeCsS1U457JlNg-hRXx9qwgc,5687
141
141
  manilaclient/tests/unit/osc/v2/test_share_snapshot_instances.py,sha256=2P_nVSNgfTDX4NjpKDqbGiWXOO3IZGcSFVAEKZh47EA,8248
142
142
  manilaclient/tests/unit/osc/v2/test_share_snapshots.py,sha256=jAot-YJX7bjoolsuzzV3UlNQkjjtfd06dPzrHe8kGRE,44426
@@ -157,9 +157,9 @@ manilaclient/tests/unit/v1/test_share_types.py,sha256=-ZUqSPQ6kydh9EZtyIVfBKRYqc
157
157
  manilaclient/tests/unit/v1/test_shares.py,sha256=pkDKFJXmrIQU3SR9x9eciAZtlR_9b8Ie6BfOpc_RmFE,1155
158
158
  manilaclient/tests/unit/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
159
159
  manilaclient/tests/unit/v2/fake_clients.py,sha256=Znrr1EGp41zvIQfo1TWsOIYujbcnPHUEeiGPoGLzU1I,6889
160
- manilaclient/tests/unit/v2/fakes.py,sha256=1bbERhjTHzZa2Yxdb74kh_E26TEI3Y_VoYIhwJVJHPY,47329
160
+ manilaclient/tests/unit/v2/fakes.py,sha256=jatBVJ-UfUnA2GPycbmFFsab3OcSCm7R689WtmmYXBg,49223
161
161
  manilaclient/tests/unit/v2/test_availability_zones.py,sha256=hwCT9WseG3ajJD1EnD34wBxmEnWYjhlbv0adYgZRoEc,2129
162
- manilaclient/tests/unit/v2/test_client.py,sha256=_f1kKaTrbNbNsVoaRFuh8zJ5FS1-d2xoChbqMJF-3aU,13669
162
+ manilaclient/tests/unit/v2/test_client.py,sha256=NEeMXA_roMVYTt3Dtf3Lc9WhFTdLyT_DYOWjKy_Aw6k,11113
163
163
  manilaclient/tests/unit/v2/test_limits.py,sha256=cZcEedCdtv0SngEAiidwo2xzHLDhrSC4vuX_acJmppU,5458
164
164
  manilaclient/tests/unit/v2/test_messages.py,sha256=NSAmhgCGolkJOKe_uyLPj7mSthcUZzqXxti-shGJ5xo,4375
165
165
  manilaclient/tests/unit/v2/test_quota_classes.py,sha256=qS_6zydG7VGVDSuWHUxJLKNxgqs1KgencM80Gi_PxmQ,2780
@@ -185,12 +185,12 @@ 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=kVr-dxRH71TqyUV0osyneYUdc39MXSjSqPwBpmG_Bzs,31247
189
- manilaclient/tests/unit/v2/test_shell.py,sha256=Uu4v0rDgWvoUo-nimbzp4K2Q8t0j_HJOMnYaRfQ1gbc,163788
188
+ manilaclient/tests/unit/v2/test_shares.py,sha256=Q2E32ncw2Ovk9C6UH-ZpI5-wvASR7_HYXSas_cyvLsM,31247
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
192
192
  manilaclient/v1/__init__.py,sha256=FbNJHP1bcH2FE4-eUvyLcrqnWW4DvPtul15zcdFJDPQ,917
193
- manilaclient/v1/client.py,sha256=0FQ9oLRPTsYOvEpH5bX2p1Yi_sTR19vF3PXjEJ5QXCI,10490
193
+ manilaclient/v1/client.py,sha256=0W7rEw5XCwa5c4wKrom5knWbAWYwlJw8-H9BHH_QtXY,9773
194
194
  manilaclient/v1/limits.py,sha256=eT78UhRVQ4sOXvKUAGJqPOJVRxSULYnjPw-uM0hfv3M,1225
195
195
  manilaclient/v1/quota_classes.py,sha256=LVBo0PlFpmm4wLb2udK_a0MuFDDhknoILAbmnLXlP28,1260
196
196
  manilaclient/v1/quotas.py,sha256=KU2vDNkgQxgAVc3X6SQjYYDGrzoKDZ-bAPLy2Fj6SwM,1225
@@ -207,7 +207,7 @@ manilaclient/v1/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
207
207
  manilaclient/v1/contrib/list_extensions.py,sha256=QGCsFKA6lsjMZD5OqKlmn7gwGD_eksBZgYCmPm_Ir8o,1253
208
208
  manilaclient/v2/__init__.py,sha256=3QPj4N4cp-vBco2wTnOqZZ19J3X-EVmEMzXnX1J9SQc,681
209
209
  manilaclient/v2/availability_zones.py,sha256=54aL1DT-zAHjGn4QjXvQnU9BxJ5oGPDYQPd6C6KEdnI,1313
210
- manilaclient/v2/client.py,sha256=dnD9FY7SueEA0YOKWb6JaQVB0CyofTjUkW5_5a6iGVo,13178
210
+ manilaclient/v2/client.py,sha256=Xv5BvKTfS9DkJ3i5DFcreTkbJBz-Jo9WLkJSjipU1JI,12462
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
@@ -238,14 +238,14 @@ manilaclient/v2/share_transfers.py,sha256=blgj20xF3BEj3mRoXjsf_QuRCXaYjVPf24En8E
238
238
  manilaclient/v2/share_type_access.py,sha256=kK-dHI4eDnJWaQsU670IG2A2rE1kmegiIT7Rtiy4Afs,2373
239
239
  manilaclient/v2/share_types.py,sha256=wKhwZcxh-SUytrUtPtV1hyBYw8ZHbjLqhKUR92dyo3g,10307
240
240
  manilaclient/v2/shares.py,sha256=Aletqm1t0nO62tBcJGw0QRNPCuN6XgJjPJXCQIl0TCk,32139
241
- manilaclient/v2/shell.py,sha256=AouOcMAH9752wTmNOX4ueg6Yd6xGsM1JvTl8xvGGJko,226091
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-4.9.0.dist-info/AUTHORS,sha256=SfhPcM8Oqz6fp6QScQCAMYKOgvU5-UWUitRqJjBWgMA,7426
245
- python_manilaclient-4.9.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
246
- python_manilaclient-4.9.0.dist-info/METADATA,sha256=mT-l0MzhODFGz-8nFamw9-fV7wGpcLEZY3tumHHWT7o,5553
247
- python_manilaclient-4.9.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
248
- python_manilaclient-4.9.0.dist-info/entry_points.txt,sha256=-vfysXuwIYFL-CeP5OT0UH10KLPzH2dW5h7fTI16jL4,11626
249
- python_manilaclient-4.9.0.dist-info/pbr.json,sha256=f1JhttQAg5lZlhZXOg1oX_MJ0FRnR1cC30vmql-Sb6E,46
250
- python_manilaclient-4.9.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
251
- python_manilaclient-4.9.0.dist-info/RECORD,,
244
+ python_manilaclient-5.0.0.dist-info/AUTHORS,sha256=oizDiWU_y7fRINDQhDXdd9_8y1UsYFAX4QMwz4Cijvg,7516
245
+ python_manilaclient-5.0.0.dist-info/LICENSE,sha256=0vWIdNcdtTV9HZ7UlIezDadLSry5oS_2BzPolooTi4Y,11837
246
+ python_manilaclient-5.0.0.dist-info/METADATA,sha256=WvY6h3WoCH8emRgKJZ08MBVMstojpP6zgol6_sy8wRI,5492
247
+ python_manilaclient-5.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
248
+ python_manilaclient-5.0.0.dist-info/entry_points.txt,sha256=-vfysXuwIYFL-CeP5OT0UH10KLPzH2dW5h7fTI16jL4,11626
249
+ python_manilaclient-5.0.0.dist-info/pbr.json,sha256=YDXPH-XRt-HYJn5HItT8lJZSJmWZcis8Lc7k6FKQOMM,46
250
+ python_manilaclient-5.0.0.dist-info/top_level.txt,sha256=qaZZFY6QOsBxs6dp1YW7M0XnIHyctWinAWIOOrnA0pQ,13
251
+ python_manilaclient-5.0.0.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "87f7249", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "56ba694", "is_release": true}