eclcli 4.5.0.dev355__py3-none-any.whl → 4.6.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.
@@ -18,8 +18,11 @@ ROWS_FOR_SHOW = [
18
18
  'Tags',
19
19
  'Tenant ID',
20
20
  'CA Cert Status',
21
+ 'CA Cert Info',
21
22
  'SSL Cert Status',
23
+ 'SSL Cert Info',
22
24
  'SSL Key Status',
25
+ 'SSL Key Info',
23
26
  ]
24
27
 
25
28
 
@@ -77,6 +80,7 @@ class ShowCertificate(command.ShowOne):
77
80
 
78
81
  data = client.get_certificate(parsed_args.certificate)
79
82
  _set_statuses_for_display(data)
83
+ _set_infomations_for_display(data)
80
84
 
81
85
  return row_headers, (utils.get_item_properties(data, rows))
82
86
 
@@ -128,6 +132,7 @@ class CreateCertificate(command.ShowOne):
128
132
  )
129
133
 
130
134
  _set_statuses_for_display(data)
135
+ _set_infomations_for_display(data)
131
136
 
132
137
  return row_headers, utils.get_item_properties(data, rows)
133
138
 
@@ -229,6 +234,7 @@ class UpdateCertificate(command.ShowOne):
229
234
  parsed_args.certificate, **patch)
230
235
 
231
236
  _set_statuses_for_display(data)
237
+ _set_infomations_for_display(data)
232
238
 
233
239
  return row_headers, utils.get_item_properties(data, rows)
234
240
 
@@ -260,6 +266,12 @@ class UploadCertificate(command.Command):
260
266
  help=_('Content of the certificate file to be uploaded'),
261
267
  )
262
268
 
269
+ parser.add_argument(
270
+ '--passphrase',
271
+ metavar='<passphrase>',
272
+ help=_('The passphrase used to encrypt the SSL private key'),
273
+ )
274
+
263
275
  return parser
264
276
 
265
277
  def take_action(self, parsed_args):
@@ -281,6 +293,7 @@ class UploadCertificate(command.Command):
281
293
  parsed_args.certificate,
282
294
  certificate_type=parsed_args.type,
283
295
  certificate_content=certificate_content,
296
+ passphrase=parsed_args.passphrase
284
297
  )
285
298
 
286
299
 
@@ -293,3 +306,14 @@ def _set_statuses_for_display(data):
293
306
 
294
307
  ssl_key = data.ssl_key["status"]
295
308
  setattr(data, 'ssl_key_status', ssl_key)
309
+
310
+
311
+ def _set_infomations_for_display(data):
312
+ ca_cert = data.ca_cert["info"]
313
+ setattr(data, 'ca_cert_info', json.dumps(ca_cert, indent=2, ensure_ascii=False))
314
+
315
+ ssl_cert = data.ssl_cert["info"]
316
+ setattr(data, 'ssl_cert_info', json.dumps(ssl_cert, indent=2, ensure_ascii=False))
317
+
318
+ ssl_key = data.ssl_key["info"]
319
+ setattr(data, 'ssl_key_info', json.dumps(ssl_key, indent=2, ensure_ascii=False))
@@ -171,7 +171,8 @@ class CreateLoadBalancer(command.ShowOne):
171
171
  "virtual-ip: Virtual IP address of the interface within subnet, "
172
172
  "reserved-fixed-ips: IPv4 fixed address for interface. "
173
173
  "You can specify multiple ip address by using ':' "
174
- "(e.g: 1.1.1.1:2.2.2.2:...) "
174
+ "(e.g: 1.1.1.1:2.2.2.2:...), "
175
+ "If reserved-fixed-ips keywords are unspecified or less than 4 IP addresses are provided, they will be automatically assigned."
175
176
  )
176
177
  )
177
178
 
@@ -202,8 +203,10 @@ class CreateLoadBalancer(command.ShowOne):
202
203
  for if_str in parsed_args.interface:
203
204
  if_info = {}
204
205
  if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
205
- fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
206
- if_info['reserved_fixed_ips'] = fixed_ips
206
+ # reserved_fixed_ips は任意項目のため if_str に含まれない場合がある
207
+ if if_info.get('reserved_fixed_ips'):
208
+ fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
209
+ if_info['reserved_fixed_ips'] = fixed_ips
207
210
  interfaces.append(if_info)
208
211
 
209
212
  syslog_servers = []
@@ -382,7 +385,8 @@ class CreateStagedLoadBalancerConfiguration(command.ShowOne):
382
385
  "virtual-ip: Virtual IP address of the interface within subnet, "
383
386
  "reserved-fixed-ips: IPv4 fixed address for interface. "
384
387
  "You can specify multiple ip address by using ':' "
385
- "(e.g: 1.1.1.1:2.2.2.2:...) "
388
+ "(e.g: 1.1.1.1:2.2.2.2:...), "
389
+ "If reserved-fixed-ips keywords are unspecified or less than 4 IP addresses are provided, they will be automatically assigned."
386
390
  )
387
391
  )
388
392
 
@@ -407,8 +411,10 @@ class CreateStagedLoadBalancerConfiguration(command.ShowOne):
407
411
  for if_str in parsed_args.interface:
408
412
  if_info = {}
409
413
  if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
410
- fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
411
- if_info['reserved_fixed_ips'] = fixed_ips
414
+ # reserved_fixed_ips は任意項目のため if_str に含まれない場合がある
415
+ if if_info.get('reserved_fixed_ips'):
416
+ fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
417
+ if_info['reserved_fixed_ips'] = fixed_ips
412
418
  interfaces.append(if_info)
413
419
 
414
420
  syslog_servers = []
@@ -526,7 +532,8 @@ class UpdateStagedLoadBalancerConfiguration(command.ShowOne):
526
532
  "virtual-ip: Virtual IP address of the interface within subnet, "
527
533
  "reserved-fixed-ips: IPv4 fixed address for interface. "
528
534
  "You can specify multiple ip address by using ':' "
529
- "(e.g: 1.1.1.1:2.2.2.2:...) "
535
+ "(e.g: 1.1.1.1:2.2.2.2:...), "
536
+ "If reserved-fixed-ips keywords are unspecified or less than 4 IP addresses are provided, they will be automatically assigned."
530
537
  )
531
538
  )
532
539
 
@@ -551,8 +558,10 @@ class UpdateStagedLoadBalancerConfiguration(command.ShowOne):
551
558
  for if_str in parsed_args.interface:
552
559
  if_info = {}
553
560
  if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
554
- fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
555
- if_info['reserved_fixed_ips'] = fixed_ips
561
+ # reserved_fixed_ips は任意項目のため if_str に含まれない場合がある
562
+ if if_info.get('reserved_fixed_ips'):
563
+ fixed_ips = [{'ip_address': ip} for ip in if_info.get('reserved_fixed_ips').split(':')]
564
+ if_info['reserved_fixed_ips'] = fixed_ips
556
565
  interfaces.append(if_info)
557
566
 
558
567
  syslog_servers = []
eclcli/mlb/v1/mlb_plan.py CHANGED
@@ -30,6 +30,9 @@ class ListPlan(command.Lister):
30
30
  'Max Number of Health monitors',
31
31
  'Max Number of Listeners',
32
32
  'Max Number of Policies',
33
+ 'Max Number of Server Name Indications',
34
+ 'Max Number of Rules',
35
+ 'Max Number of Conditions',
33
36
  'Max Number of Routes',
34
37
  'Max Number of Target groups',
35
38
  'Max Number of Members',
@@ -70,6 +73,9 @@ class ShowPlan(command.ShowOne):
70
73
  'Max Number of Health monitors',
71
74
  'Max Number of Listeners',
72
75
  'Max Number of Policies',
76
+ 'Max Number of Server Name Indications',
77
+ 'Max Number of Rules',
78
+ 'Max Number of Conditions',
73
79
  'Max Number of Routes',
74
80
  'Max Number of Target groups',
75
81
  'Max Number of Members',
@@ -21,13 +21,16 @@ ROWS_FOR_SHOW = [
21
21
  'Tenant ID',
22
22
  'Algorithm',
23
23
  'Persistence',
24
+ 'Persistence timeout',
24
25
  'Idle timeout',
25
26
  'Sorry page url',
26
27
  'Source NAT',
28
+ 'Server Name Indications',
27
29
  'Certificate ID',
28
30
  'Health Monitor ID',
29
31
  'Listener ID',
30
32
  'Default Target Group ID',
33
+ 'Backup Target Group ID',
31
34
  'TLS Policy ID',
32
35
  ]
33
36
 
@@ -39,13 +42,16 @@ ROWS_FOR_CHANGES = [
39
42
  ROWS_FOR_SHOW_STAGED = [
40
43
  'Algorithm',
41
44
  'Persistence',
45
+ 'Persistence timeout',
42
46
  'Idle timeout',
43
47
  'Sorry page url',
44
48
  'Source NAT',
49
+ 'Server Name Indications',
45
50
  'Certificate ID',
46
51
  'Health Monitor ID',
47
52
  'Listener ID',
48
53
  'Default Target Group ID',
54
+ 'Backup Target Group ID',
49
55
  'TLS Policy ID',
50
56
  ]
51
57
 
@@ -70,6 +76,7 @@ class ListPolicy(command.Lister):
70
76
  'Load Balancer ID',
71
77
  'Algorithm',
72
78
  'Persistence',
79
+ 'Persistence timeout',
73
80
  'Idle timeout',
74
81
  'Sorry page url',
75
82
  'Source NAT',
@@ -77,6 +84,7 @@ class ListPolicy(command.Lister):
77
84
  'Health Monitor ID',
78
85
  'Listener ID',
79
86
  'Default Target Group ID',
87
+ 'Backup Target Group ID',
80
88
  'TLS Policy ID',
81
89
  ]
82
90
  column_headers = copy.deepcopy(columns)
@@ -116,6 +124,7 @@ class ShowPolicy(command.ShowOne):
116
124
  row_headers = rows
117
125
 
118
126
  data = client.get_policy(parsed_args.policy, changes)
127
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
119
128
 
120
129
  if changes:
121
130
  setattr(data, 'current', json.dumps(data.current, indent=2))
@@ -169,6 +178,13 @@ class CreatePolicy(command.ShowOne):
169
178
  help=_('Persistence setting of the policy'),
170
179
  )
171
180
 
181
+ parser.add_argument(
182
+ '--persistence-timeout',
183
+ metavar='<persistence-timeout>',
184
+ type=int,
185
+ help=_('Persistence timeout (minutes) Setting of the Policy'),
186
+ )
187
+
172
188
  parser.add_argument(
173
189
  '--idle-timeout',
174
190
  metavar='<idle-timeout>',
@@ -191,6 +207,22 @@ class CreatePolicy(command.ShowOne):
191
207
  help=_('Source NAT setting of the policy'),
192
208
  )
193
209
 
210
+ parser.add_argument(
211
+ '--server-name-indications',
212
+ metavar="<server-name=server-name,"
213
+ "input-type=input-type,"
214
+ "priority=priority,"
215
+ "certificate-id=certificate-id>",
216
+ action='store',
217
+ nargs='+',
218
+ help=_("The list of Server Name Indications (SNIs) for the policy."
219
+ "server-name: The server name of Server Name Indication (SNI),"
220
+ "input-type: The input type of the server name,"
221
+ "priority: Priority of Server Name Indication (SNI),"
222
+ "certificate-id: Certificate ID that assigned to Server Name Indication (SNI)."
223
+ )
224
+ )
225
+
194
226
  parser.add_argument(
195
227
  '--certificate-id',
196
228
  metavar='<certificate-id>',
@@ -218,6 +250,12 @@ class CreatePolicy(command.ShowOne):
218
250
  help=_('ID of the default target group that assigned to the policy'),
219
251
  )
220
252
 
253
+ parser.add_argument(
254
+ '--backup-target-group-id',
255
+ metavar='<backup-target-group-id>',
256
+ help=_('ID of the backup target group that assigned to the policy'),
257
+ )
258
+
221
259
  parser.add_argument(
222
260
  '--tls-policy-id',
223
261
  metavar='<tls-policy-id>',
@@ -246,22 +284,48 @@ class CreatePolicy(command.ShowOne):
246
284
  msg = _("You must specify JSON object format to tags")
247
285
  raise exceptions.CommandError(msg)
248
286
 
287
+ server_name_indications = []
288
+ if parsed_args.server_name_indications:
289
+ if len(parsed_args.server_name_indications) > 51:
290
+ msg = _("You can specify up to 50 server-name-indications")
291
+ raise exceptions.CommandError(msg)
292
+
293
+ valid_keys = ['server-name', 'input-type', 'priority', 'certificate-id']
294
+ key_map = {'server-name': 'server_name',
295
+ 'input-type': 'input_type',
296
+ 'priority': 'priority',
297
+ 'certificate-id': 'certificate_id'}
298
+ for if_str in parsed_args.server_name_indications:
299
+ if_info = {}
300
+ if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
301
+ try:
302
+ if_info["priority"] = int(if_info["priority"])
303
+ except ValueError:
304
+ msg = _("You must specify integer to priority")
305
+ raise exceptions.CommandError(msg)
306
+ server_name_indications.append(if_info)
307
+
249
308
  data = client.create_policy(
250
309
  name=parsed_args.name,
251
310
  description=parsed_args.description,
252
311
  tags=tags,
253
312
  algorithm=parsed_args.algorithm,
254
313
  persistence=parsed_args.persistence,
314
+ persistence_timeout=parsed_args.persistence_timeout,
255
315
  idle_timeout=parsed_args.idle_timeout,
256
316
  sorry_page_url=parsed_args.sorry_page_url,
257
317
  certificate_id=parsed_args.certificate_id,
258
318
  source_nat=parsed_args.source_nat,
319
+ server_name_indications=server_name_indications,
259
320
  health_monitor_id=parsed_args.health_monitor_id,
260
321
  listener_id=parsed_args.listener_id,
261
322
  default_target_group_id=parsed_args.default_target_group_id,
323
+ backup_target_group_id=parsed_args.backup_target_group_id,
262
324
  tls_policy_id=parsed_args.tls_policy_id,
263
325
  load_balancer_id=parsed_args.load_balancer_id,
264
326
  )
327
+ if data.server_name_indications:
328
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
265
329
 
266
330
  return row_headers, utils.get_item_properties(data, rows)
267
331
 
@@ -362,6 +426,9 @@ class UpdatePolicy(command.ShowOne):
362
426
  data = client.update_policy(
363
427
  parsed_args.policy, **patch)
364
428
 
429
+ if data.server_name_indications:
430
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
431
+
365
432
  return row_headers, utils.get_item_properties(data, rows)
366
433
 
367
434
 
@@ -397,6 +464,13 @@ class CreateStagedPolicyConfiguration(command.ShowOne):
397
464
  help=_('Persistence setting of the policy'),
398
465
  )
399
466
 
467
+ parser.add_argument(
468
+ '--persistence-timeout',
469
+ metavar='<persistence-timeout>',
470
+ type=int,
471
+ help=_('Persistence timeout (minutes) Setting of the Policy'),
472
+ )
473
+
400
474
  parser.add_argument(
401
475
  '--idle-timeout',
402
476
  metavar='<idle-timeout>',
@@ -419,6 +493,22 @@ class CreateStagedPolicyConfiguration(command.ShowOne):
419
493
  help=_('Source NAT setting of the policy'),
420
494
  )
421
495
 
496
+ parser.add_argument(
497
+ '--server-name-indications',
498
+ metavar="<server-name=server-name,"
499
+ "input-type=input-type,"
500
+ "priority=priority,"
501
+ "certificate-id=certificate-id>",
502
+ action='store',
503
+ nargs='+',
504
+ help=_("The list of Server Name Indications (SNIs) for the policy."
505
+ "server-name: The server name of Server Name Indication (SNI),"
506
+ "input-type: The input type of the server name,"
507
+ "priority: Priority of Server Name Indication (SNI),"
508
+ "certificate-id: Certificate ID that assigned to Server Name Indication (SNI)."
509
+ )
510
+ )
511
+
422
512
  parser.add_argument(
423
513
  '--certificate-id',
424
514
  metavar='<certificate-id>',
@@ -443,6 +533,12 @@ class CreateStagedPolicyConfiguration(command.ShowOne):
443
533
  help=_('ID of the default target group that assigned to the policy'),
444
534
  )
445
535
 
536
+ parser.add_argument(
537
+ '--backup-target-group-id',
538
+ metavar='<backup-target-group-id>',
539
+ help=_('ID of the backup target group that assigned to the policy'),
540
+ )
541
+
446
542
  parser.add_argument(
447
543
  '--tls-policy-id',
448
544
  metavar='<tls-policy-id>',
@@ -457,19 +553,45 @@ class CreateStagedPolicyConfiguration(command.ShowOne):
457
553
  rows = ROWS_FOR_SHOW_STAGED
458
554
  row_headers = rows
459
555
 
556
+ server_name_indications = []
557
+ if parsed_args.server_name_indications:
558
+ if len(parsed_args.server_name_indications) > 51:
559
+ msg = _("You can specify up to 50 server-name-indications")
560
+ raise exceptions.CommandError(msg)
561
+
562
+ valid_keys = ['server-name', 'input-type', 'priority', 'certificate-id']
563
+ key_map = {'server-name': 'server_name',
564
+ 'input-type': 'input_type',
565
+ 'priority': 'priority',
566
+ 'certificate-id': 'certificate_id'}
567
+ for if_str in parsed_args.server_name_indications:
568
+ if_info = {}
569
+ if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
570
+ try:
571
+ if_info["priority"] = int(if_info["priority"])
572
+ except ValueError:
573
+ msg = _("You must specify integer to priority")
574
+ raise exceptions.CommandError(msg)
575
+ server_name_indications.append(if_info)
576
+
460
577
  data = client.create_staged_policy_configuration(
461
578
  parsed_args.policy,
462
579
  algorithm=parsed_args.algorithm,
463
580
  persistence=parsed_args.persistence,
581
+ persistence_timeout=parsed_args.persistence_timeout,
464
582
  idle_timeout=parsed_args.idle_timeout,
465
583
  sorry_page_url=parsed_args.sorry_page_url,
466
584
  certificate_id=parsed_args.certificate_id,
467
585
  source_nat=parsed_args.source_nat,
586
+ server_name_indications=server_name_indications,
468
587
  health_monitor_id=parsed_args.health_monitor_id,
469
588
  listener_id=parsed_args.listener_id,
470
589
  default_target_group_id=parsed_args.default_target_group_id,
590
+ backup_target_group_id=parsed_args.backup_target_group_id,
471
591
  tls_policy_id=parsed_args.tls_policy_id,
472
592
  )
593
+ if data.server_name_indications:
594
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
473
595
 
474
596
  return row_headers, utils.get_item_properties(data, rows)
475
597
 
@@ -512,6 +634,8 @@ class ShowStagedPolicyConfiguration(command.ShowOne):
512
634
  row_headers = rows
513
635
 
514
636
  data = client.get_staged_policy_configuration(parsed_args.policy)
637
+ if data.server_name_indications:
638
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
515
639
 
516
640
  return row_headers, (utils.get_item_properties(data, rows))
517
641
 
@@ -548,6 +672,13 @@ class UpdateStagedPolicyConfiguration(command.ShowOne):
548
672
  help=_('Persistence setting of the policy'),
549
673
  )
550
674
 
675
+ parser.add_argument(
676
+ '--persistence-timeout',
677
+ metavar='<persistence-timeout>',
678
+ type=int,
679
+ help=_('Persistence timeout (minutes) Setting of the Policy'),
680
+ )
681
+
551
682
  parser.add_argument(
552
683
  '--idle-timeout',
553
684
  metavar='<idle-timeout>',
@@ -570,6 +701,22 @@ class UpdateStagedPolicyConfiguration(command.ShowOne):
570
701
  help=_('Source NAT setting of the policy'),
571
702
  )
572
703
 
704
+ parser.add_argument(
705
+ '--server-name-indications',
706
+ metavar="<server-name=server-name,"
707
+ "input-type=input-type,"
708
+ "priority=priority,"
709
+ "certificate-id=certificate-id>",
710
+ action='store',
711
+ nargs='+',
712
+ help=_("The list of Server Name Indications (SNIs) for the policy."
713
+ "server-name: The server name of Server Name Indication (SNI),"
714
+ "input-type: The input type of the server name,"
715
+ "priority: Priority of Server Name Indication (SNI),"
716
+ "certificate-id: Certificate ID that assigned to Server Name Indication (SNI)."
717
+ )
718
+ )
719
+
573
720
  parser.add_argument(
574
721
  '--certificate-id',
575
722
  metavar='<certificate-id>',
@@ -594,6 +741,12 @@ class UpdateStagedPolicyConfiguration(command.ShowOne):
594
741
  help=_('ID of the default target group that assigned to the policy'),
595
742
  )
596
743
 
744
+ parser.add_argument(
745
+ '--backup-target-group-id',
746
+ metavar='<backup-target-group-id>',
747
+ help=_('ID of the backup target group that assigned to the policy'),
748
+ )
749
+
597
750
  parser.add_argument(
598
751
  '--tls-policy-id',
599
752
  metavar='<tls-policy-id>',
@@ -608,18 +761,44 @@ class UpdateStagedPolicyConfiguration(command.ShowOne):
608
761
  rows = ROWS_FOR_SHOW_STAGED
609
762
  row_headers = rows
610
763
 
764
+ server_name_indications = []
765
+ if parsed_args.server_name_indications:
766
+ if len(parsed_args.server_name_indications) > 51:
767
+ msg = _("You can specify up to 50 server-name-indications")
768
+ raise exceptions.CommandError(msg)
769
+
770
+ valid_keys = ['server-name', 'input-type', 'priority', 'certificate-id']
771
+ key_map = {'server-name': 'server_name',
772
+ 'input-type': 'input_type',
773
+ 'priority': 'priority',
774
+ 'certificate-id': 'certificate_id'}
775
+ for if_str in parsed_args.server_name_indications:
776
+ if_info = {}
777
+ if_info.update(utils.parse_mlb_params(if_str, valid_keys, key_map))
778
+ try:
779
+ if_info["priority"] = int(if_info["priority"])
780
+ except ValueError:
781
+ msg = _("You must specify integer to priority")
782
+ raise exceptions.CommandError(msg)
783
+ server_name_indications.append(if_info)
784
+
611
785
  data = client.update_staged_policy_configuration(
612
786
  parsed_args.policy,
613
787
  algorithm=parsed_args.algorithm,
614
788
  persistence=parsed_args.persistence,
789
+ persistence_timeout=parsed_args.persistence_timeout,
615
790
  idle_timeout=parsed_args.idle_timeout,
616
791
  sorry_page_url=parsed_args.sorry_page_url,
617
792
  certificate_id=parsed_args.certificate_id,
618
793
  source_nat=parsed_args.source_nat,
794
+ server_name_indications=server_name_indications,
619
795
  health_monitor_id=parsed_args.health_monitor_id,
620
796
  listener_id=parsed_args.listener_id,
621
797
  default_target_group_id=parsed_args.default_target_group_id,
798
+ backup_target_group_id=parsed_args.backup_target_group_id,
622
799
  tls_policy_id=parsed_args.tls_policy_id,
623
800
  )
801
+ if data.server_name_indications:
802
+ setattr(data, 'server_name_indications', json.dumps(data.server_name_indications, indent=2))
624
803
 
625
804
  return row_headers, utils.get_item_properties(data, rows)
eclcli/mlb/v1/mlb_rule.py CHANGED
@@ -22,6 +22,7 @@ ROWS_FOR_SHOW = [
22
22
  'Tenant ID',
23
23
  'Priority',
24
24
  'Target Group ID',
25
+ 'Backup Target Group ID',
25
26
  'Conditions',
26
27
  ]
27
28
 
@@ -33,6 +34,7 @@ ROWS_FOR_CHANGES = [
33
34
  ROWS_FOR_SHOW_STAGED = [
34
35
  'Priority',
35
36
  'Target Group ID',
37
+ 'Backup Target Group ID',
36
38
  'Conditions',
37
39
  ]
38
40
 
@@ -58,6 +60,7 @@ class ListRule(command.Lister):
58
60
  'Load Balancer ID',
59
61
  'Priority',
60
62
  'Target Group ID',
63
+ 'Backup Target Group ID',
61
64
  ]
62
65
  column_headers = copy.deepcopy(columns)
63
66
 
@@ -145,6 +148,12 @@ class CreateRule(command.ShowOne):
145
148
  help=_('ID of the target group that assigned to the rule'),
146
149
  )
147
150
 
151
+ parser.add_argument(
152
+ '--backup-target-group-id',
153
+ metavar='<backup-target-group-id>',
154
+ help=_('ID of the backup target group that assigned to the rule'),
155
+ )
156
+
148
157
  parser.add_argument(
149
158
  '--policy-id',
150
159
  metavar='<policy-id>',
@@ -188,6 +197,7 @@ class CreateRule(command.ShowOne):
188
197
  tags=tags,
189
198
  priority=parsed_args.priority,
190
199
  target_group_id=parsed_args.target_group_id,
200
+ backup_target_group_id=parsed_args.backup_target_group_id,
191
201
  policy_id=parsed_args.policy_id,
192
202
  conditions=conditions,
193
203
  )
@@ -323,6 +333,12 @@ class CreateStagedRuleConfiguration(command.ShowOne):
323
333
  help=_('ID of the target group that assigned to the rule'),
324
334
  )
325
335
 
336
+ parser.add_argument(
337
+ '--backup-target-group-id',
338
+ metavar='<backup-target-group-id>',
339
+ help=_('ID of the backup target group that assigned to the rule'),
340
+ )
341
+
326
342
  parser.add_argument(
327
343
  '--conditions',
328
344
  metavar='<conditions>',
@@ -349,6 +365,7 @@ class CreateStagedRuleConfiguration(command.ShowOne):
349
365
  parsed_args.rule,
350
366
  priority=parsed_args.priority,
351
367
  target_group_id=parsed_args.target_group_id,
368
+ backup_target_group_id=parsed_args.backup_target_group_id,
352
369
  conditions=conditions,
353
370
  )
354
371
 
@@ -426,6 +443,12 @@ class UpdateStagedRuleConfiguration(command.ShowOne):
426
443
  help=_('ID of the target group that assigned to the rule'),
427
444
  )
428
445
 
446
+ parser.add_argument(
447
+ '--backup-target-group-id',
448
+ metavar='<backup-target-group-id>',
449
+ help=_('ID of the backup target group that assigned to the rule'),
450
+ )
451
+
429
452
  parser.add_argument(
430
453
  '--conditions',
431
454
  metavar='<conditions>',
@@ -452,6 +475,7 @@ class UpdateStagedRuleConfiguration(command.ShowOne):
452
475
  parsed_args.rule,
453
476
  priority=parsed_args.priority,
454
477
  target_group_id=parsed_args.target_group_id,
478
+ backup_target_group_id=parsed_args.backup_target_group_id,
455
479
  conditions=conditions,
456
480
  )
457
481
 
@@ -19,7 +19,7 @@ a-oi-xon <91597807+a-oi-xon@users.noreply.github.com>
19
19
  akaishizawa-n <135296314+akaishizawa-n@users.noreply.github.com>
20
20
  anythingrandom <shreyas.shinde@ntt.com>
21
21
  endoshi <42924605+endoshi@users.noreply.github.com>
22
- guy555 <junya.katagai@ntt.com>
22
+ guy555 <64056657+guy555@users.noreply.github.com>
23
23
  htysh <h.ohta@ntt.com>
24
24
  htysh <htysh@users.noreply.github.com>
25
25
  ikegami-shota <102566991+ikegami-shota@users.noreply.github.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: eclcli
3
- Version: 4.5.0.dev355
3
+ Version: 4.6.0
4
4
  Summary: CLI for Enterprise Cloud 2.0
5
5
  Home-page: https://ecl.ntt.com
6
6
  Author: NTT Communications
@@ -17,28 +17,28 @@ Classifier: Programming Language :: Python :: 3.8
17
17
  Classifier: Programming Language :: Python :: 3.9
18
18
  License-File: LICENSE
19
19
  License-File: AUTHORS
20
- Requires-Dist: pbr (>=1.6)
21
- Requires-Dist: six (>=1.9.0)
22
- Requires-Dist: Babel (!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,!=2.4.0,>=1.3)
23
- Requires-Dist: cliff (!=1.16.0,!=1.17.0,<3.7.0,>=1.15.0)
24
- Requires-Dist: cryptography (>=2.9.2)
25
- Requires-Dist: eclsdk (>=1.6.0)
26
- Requires-Dist: future (>=0.17.1)
27
- Requires-Dist: keystoneauth1 (<=3.4.0,>=2.1.0)
28
- Requires-Dist: openstacksdk (<=0.13.0)
29
- Requires-Dist: os-client-config (>=1.13.1)
30
- Requires-Dist: oslo.config (>=3.7.0)
31
- Requires-Dist: oslo.i18n (>=2.1.0)
32
- Requires-Dist: oslo.utils (>=3.5.0)
33
- Requires-Dist: pyparsing (<3.0.0)
34
- Requires-Dist: python-glanceclient (<=2.11.0,>=2.0.0)
35
- Requires-Dist: python-keystoneclient (!=1.8.0,!=2.1.0,>=1.6.0)
36
- Requires-Dist: python-novaclient (!=2.33.0,<=9.1.0,>=2.29.0)
37
- Requires-Dist: python-cinderclient (<=4.3.0,>=1.3.1)
38
- Requires-Dist: requests (>=2.20.0)
39
- Requires-Dist: stevedore (>=1.5.0)
40
- Requires-Dist: json-merge-patch (>=0.2)
41
- Requires-Dist: cmd2 (<0.9.0,>0.8.3)
20
+ Requires-Dist: pbr>=1.6
21
+ Requires-Dist: six>=1.9.0
22
+ Requires-Dist: Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,!=2.4.0,>=1.3
23
+ Requires-Dist: cliff!=1.16.0,!=1.17.0,<3.7.0,>=1.15.0
24
+ Requires-Dist: cryptography>=2.9.2
25
+ Requires-Dist: eclsdk>=1.7.0
26
+ Requires-Dist: future>=0.17.1
27
+ Requires-Dist: keystoneauth1<=3.4.0,>=2.1.0
28
+ Requires-Dist: openstacksdk<=0.13.0
29
+ Requires-Dist: os-client-config>=1.13.1
30
+ Requires-Dist: oslo.config>=3.7.0
31
+ Requires-Dist: oslo.i18n>=2.1.0
32
+ Requires-Dist: oslo.utils>=3.5.0
33
+ Requires-Dist: pyparsing<3.0.0
34
+ Requires-Dist: python-glanceclient<=2.11.0,>=2.0.0
35
+ Requires-Dist: python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0
36
+ Requires-Dist: python-novaclient!=2.33.0,<=9.1.0,>=2.29.0
37
+ Requires-Dist: python-cinderclient<=4.3.0,>=1.3.1
38
+ Requires-Dist: requests>=2.20.0
39
+ Requires-Dist: stevedore>=1.5.0
40
+ Requires-Dist: json-merge-patch>=0.2
41
+ Requires-Dist: cmd2<0.9.0,>0.8.3
42
42
 
43
43
  Enterprise Cloud CLI
44
44
  ======================
@@ -179,15 +179,15 @@ eclcli/image/v2/image.py,sha256=fUVCT28gCNIP0yBAAm-ntFZJajdbuAQOrIq_Q-4LNaQ,3426
179
179
  eclcli/mlb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
180
180
  eclcli/mlb/client.py,sha256=AmrS6iBusepOr13hoy3vHHNyj5Vmwg1rU30QHEBqRZM,188
181
181
  eclcli/mlb/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
182
- eclcli/mlb/v1/mlb_certificate.py,sha256=lMokq-GBv32W5901NTCxUbz6ztVpMLpq70kffX47wAM,8564
182
+ eclcli/mlb/v1/mlb_certificate.py,sha256=YGTpCZ5w8mZsI0AABvu5MKcMm9lleRdo7ADyR-ubrvs,9386
183
183
  eclcli/mlb/v1/mlb_health_monitor.py,sha256=rhs6zWn2yH3z_NXdUNRzEVUfLh7F5_ZKkTvvp4uLgnM,15610
184
184
  eclcli/mlb/v1/mlb_listener.py,sha256=fOgI8sE8SLawPEbXyuzQg8qIt_CvuQ6k07tBJQIMriY,12341
185
- eclcli/mlb/v1/mlb_load_balancer.py,sha256=Nk_d879EToPMynGabVF5wcTwDGaf2M6C4Z-zBhPDKmA,22793
185
+ eclcli/mlb/v1/mlb_load_balancer.py,sha256=PiXRLXbLuwpyRJpKh56QuIaCzIahMaK1kPbSnPvOtLU,23724
186
186
  eclcli/mlb/v1/mlb_operation.py,sha256=1Woy0nKtIquOkdZMKalbi9C-Q74pezYI1NyN1lb_F6k,2656
187
- eclcli/mlb/v1/mlb_plan.py,sha256=DvWuYMNamONO2cr05XUYXUREmhs8934L0CQoK40f_F0,2214
188
- eclcli/mlb/v1/mlb_policy.py,sha256=vRUuCBXjCa0xucyGNR3PjgVbcy1GcBNmmhdLjy9Ppbg,19255
187
+ eclcli/mlb/v1/mlb_plan.py,sha256=JJMwAv9EiOglr3F6mndzpbjMVG092MBcYNKp3q0krLQ,2470
188
+ eclcli/mlb/v1/mlb_policy.py,sha256=IV-u3mumoM039AWXLZJZrbVVvVfByvvLThZoUtWmlAY,27563
189
189
  eclcli/mlb/v1/mlb_route.py,sha256=qkpa02AtsDHY2ZB8qEQYyPNhG89FG_FniOt5v6F__3M,11042
190
- eclcli/mlb/v1/mlb_rule.py,sha256=eGuxeirYDsUfeeD4eEUu_sMeWWpFEIk8Xz3ReVwg08Q,13748
190
+ eclcli/mlb/v1/mlb_rule.py,sha256=g2vf4G9bl_KUofy8QZbdXwvOQyeLzenqOLAPduytkJ0,14680
191
191
  eclcli/mlb/v1/mlb_system_update.py,sha256=C66d-LA3mB7tG7ZddogCiqfB5mMDftjmFLIIcvpkgUU,1939
192
192
  eclcli/mlb/v1/mlb_target_group.py,sha256=dr2-tkdTw4EbYCggtQo7M2lMxpjvgR7ZTC02FHQePP8,15284
193
193
  eclcli/mlb/v1/mlb_tls_policy.py,sha256=lD6Y4CmWu8YybiU-WQfmsfUmpeksjWVKrYo9qXm0akg,2005
@@ -393,10 +393,11 @@ eclcli/volume/v2/qos_specs.py,sha256=Iav_8gTYtKW70h_bmiG3RgN1wn9ijsIHHSSZF1QqN90
393
393
  eclcli/volume/v2/snapshot.py,sha256=zyVcTz25U5Lofra4t_j7XnGCWdmFhENv7HL8slgM5zw,8474
394
394
  eclcli/volume/v2/volume.py,sha256=84-zkIqC7W3kwQ1F8xIS1X8Y2_ODC1jgqfT4qxqE_zc,13520
395
395
  eclcli/volume/v2/volume_type.py,sha256=ynqzu8EBciGHgWiJJVDAlkXvgbd_mx-0238wlekj0jk,7677
396
- eclcli-4.5.0.dev355.dist-info/AUTHORS,sha256=cdu7OD2OtjGsLiPcqLJn6AnhqPtneiI-NQCkH1sGb3w,2021
397
- eclcli-4.5.0.dev355.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
398
- eclcli-4.5.0.dev355.dist-info/METADATA,sha256=Lgw7s5y9IPCWXAyqX5nOnUG_7ubXJSYTn9pSREDFrmY,4577
399
- eclcli-4.5.0.dev355.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
400
- eclcli-4.5.0.dev355.dist-info/entry_points.txt,sha256=vTVMac07Iy3XrdHzSiyA_4EVjbPivj070sKzqRCi3bY,29843
401
- eclcli-4.5.0.dev355.dist-info/top_level.txt,sha256=qlWRxE3Bx0n2jNA1dKFpeHMVsM-xGaM1rJ_TDutMlkA,7
402
- eclcli-4.5.0.dev355.dist-info/RECORD,,
396
+ eclcli-4.6.0.dist-info/AUTHORS,sha256=naxoYCgqPLbAYncLIEPCmKLcxMLJh1SBG7pQLxJsXJA,2040
397
+ eclcli-4.6.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
398
+ eclcli-4.6.0.dist-info/METADATA,sha256=-junHTeEtZpDj8fsdstI93WxUB-YmHPk8wlEhE2U0vw,4504
399
+ eclcli-4.6.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
400
+ eclcli-4.6.0.dist-info/entry_points.txt,sha256=vTVMac07Iy3XrdHzSiyA_4EVjbPivj070sKzqRCi3bY,29843
401
+ eclcli-4.6.0.dist-info/pbr.json,sha256=ST-ur-YVecMQtw7urbqHxdN6mY92LNC-Z-VxMpM4fB0,46
402
+ eclcli-4.6.0.dist-info/top_level.txt,sha256=qlWRxE3Bx0n2jNA1dKFpeHMVsM-xGaM1rJ_TDutMlkA,7
403
+ eclcli-4.6.0.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: bdist_wheel (0.37.1)
2
+ Generator: bdist_wheel (0.45.1)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5
 
@@ -0,0 +1 @@
1
+ {"git_version": "a3d3f02", "is_release": true}