Skip to content

Commit 86b2fa9

Browse files
anusha94anusha94
committed
moving org_id and sddc_id to sample_cli utility
Signed-off-by: Anusha Hegde <[email protected]>
1 parent 5ff436a commit 86b2fa9

25 files changed

+101
-168
lines changed

‎samples/vmc/helpers/sample_cli.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@
1717
import argparse
1818

1919
"""
20-
Builds a standard argument parser with required and optional argument
21-
groups
20+
Builds a standard argument parser with required and optional argument groups
21+
22+
Most of the VMC samples require these three standard required arguments.
23+
If any of these arguments are not required, then build your own parser
2224
2325
--refresh_token
26+
--org_id
27+
--sddc_id
2428
2529
"""
2630
parser = argparse.ArgumentParser(
@@ -35,3 +39,11 @@
3539
'--refresh_token',
3640
required=True,
3741
help='Refresh token obtained from CSP')
42+
required_args.add_argument(
43+
'--org_id',
44+
required=True,
45+
help='Orgization ID')
46+
required_args.add_argument(
47+
'--sddc_id',
48+
required=True,
49+
help='SDDC ID')

‎samples/vmc/networks_nsxt/cgw_firewall_crud.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ class NSXPolicyCGWFirewall(object):
3636
"""
3737

3838
def __init__(self):
39-
required_args.add_argument('--org_id',
40-
required=True,
41-
help='Orgization ID')
42-
43-
required_args.add_argument('--sddc_id',
44-
required=True,
45-
help='SDDC ID')
46-
4739
args = parser.parse_args()
4840

4941
self.nsx_client = create_nsx_policy_client_for_vmc(

‎samples/vmc/networks_nsxt/dfw_firewall_crud.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ class NSXPolicyDFWFirewall(object):
3838
"""
3939

4040
def __init__(self):
41-
required_args.add_argument('--org_id',
42-
required=True,
43-
help='Orgization ID')
44-
45-
required_args.add_argument('--sddc_id',
46-
required=True,
47-
help='SDDC ID')
48-
4941
args = parser.parse_args()
5042

5143
self.nsx_client = create_nsx_policy_client_for_vmc(

‎samples/vmc/networks_nsxt/hello_world.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ class AuthExample(object):
3232
"""
3333

3434
def __init__(self):
35-
required_args.add_argument('--org-id',
36-
required=True,
37-
help='Organization identifier.')
38-
39-
required_args.add_argument('--sddc-id',
40-
required=True,
41-
help='SDDC Identifier.')
42-
4335
args = parser.parse_args()
4436

4537
self.org_id = args.org_id

‎samples/vmc/networks_nsxt/l3_vpn_crud.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ class NSXPolicyL3VPN(object):
3939
"""
4040

4141
def __init__(self):
42-
required_args.add_argument('--refresh_token',
43-
required=True,
44-
help='Refresh token obtained from CSP')
45-
46-
required_args.add_argument('--org_id',
47-
required=True,
48-
help='Orgization ID')
49-
50-
required_args.add_argument('--sddc_id',
51-
required=True,
52-
help='SDDC ID')
53-
5442
required_args.add_argument('--remote_endpoint_public_ip',
5543
required=True,
5644
help='L3 VPN Remote end point\'s public ip')

‎samples/vmc/networks_nsxt/nat_crud.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ class NSXPolicyNAT(object):
3737
"""
3838

3939
def __init__(self):
40-
required_args.add_argument('--org_id',
41-
required=True,
42-
help='Orgization ID')
43-
44-
required_args.add_argument('--sddc_id',
45-
required=True,
46-
help='SDDC ID')
47-
4840
args = parser.parse_args()
4941

5042
self.nsx_client = create_nsx_policy_client_for_vmc(

‎samples/vmc/networks_nsxt/security_group_create.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@
3636
Sample Prerequisites:
3737
- SDDC deployed in VMware Cloud on AWS
3838
"""
39-
required_args.add_argument('--org_id',
40-
required=True,
41-
help='Orgization ID')
42-
43-
required_args.add_argument('--sddc_id',
44-
required=True,
45-
help='SDDC ID')
46-
4739
optional_args.add_argument('--gateway_type',
4840
default='mgw',
4941
help='Gateway type. Either mgw or cgw')

‎samples/vmc/networks_nsxt/security_group_delete.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@
3939
- SDDC deployed in VMware Cloud on AWS
4040
- A NSX-T security group
4141
"""
42-
required_args.add_argument('--org_id',
43-
required=True,
44-
help='Orgization ID')
45-
46-
required_args.add_argument('--sddc_id',
47-
required=True,
48-
help='SDDC ID')
49-
5042
optional_args.add_argument('--gateway_type',
5143
default='mgw',
5244
help='Gateway type. Either mgw or cgw')

‎samples/vmc/networks_nsxt/security_group_list.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
Sample Prerequisites:
3535
- SDDC deployed in VMware Cloud on AWS
3636
"""
37-
required_args.add_argument('--org_id',
38-
required=True,
39-
help='Orgization ID')
40-
41-
required_args.add_argument('--sddc_id',
42-
required=True,
43-
help='SDDC ID')
44-
4537
optional_args.add_argument('--gateway_type',
4638
default='mgw',
4739
help='Gateway type. Either mgw or cgw')

‎samples/vmc/networks_nsxt/security_group_update.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
- SDDC deployed in VMware Cloud on AWS
4141
- A NSX-T security group
4242
"""
43-
required_args.add_argument('--org_id',
44-
required=True,
45-
help='Orgization ID')
46-
47-
required_args.add_argument('--sddc_id',
48-
required=True,
49-
help='SDDC ID')
50-
5143
optional_args.add_argument('--gateway_type',
5244
default='mgw',
5345
help='Gateway type. Either mgw or cgw')

‎samples/vmc/networks_nsxt/segments_firewall_crud.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ class NSXPolicySegmentFirewall(object):
3333
"""
3434

3535
def __init__(self):
36-
required_args.add_argument('--org_id',
37-
required=True,
38-
help='Orgization ID')
39-
40-
required_args.add_argument('--sddc_id',
41-
required=True,
42-
help='SDDC ID')
43-
4436
args = parser.parse_args()
4537

4638
self.nsx_client = create_nsx_policy_client_for_vmc(

‎samples/vmc/networks_nsxv/dns_crud.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ class DNSCrud(object):
3030
"""
3131

3232
def __init__(self):
33-
required_args.add_argument('--org-id',
34-
required=True,
35-
help='Organization identifier.')
36-
37-
required_args.add_argument('--sddc-id',
38-
required=True,
39-
help='SDDC Identifier.')
40-
4133
optional_args.add_argument('--use-compute-gateway',
4234
action='store_true',
4335
default=False,

‎samples/vmc/networks_nsxv/expose_public_ip.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ class ExposePublicIP(object):
3636
"""
3737

3838
def __init__(self):
39-
required_args.add_argument('--org-id',
40-
required=True,
41-
help='Organization identifier.')
42-
43-
required_args.add_argument('--sddc-id',
44-
required=True,
45-
help='SDDC Identifier.')
46-
4739
optional_args.add_argument('--notes',
4840
default='Sample public IP ' + str(random.randint(0, 100)),
4941
help='Notes of the new public IP')

‎samples/vmc/networks_nsxv/firewall_rules_crud.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ class FirewallRulesCrud(object):
3131
"""
3232

3333
def __init__(self):
34-
required_args.add_argument(
35-
'--org-id', required=True, help='Organization identifier.')
36-
37-
required_args.add_argument(
38-
'--sddc-id', required=True, help='Sddc Identifier.')
39-
4034
optional_args.add_argument(
4135
'--rule-name',
4236
default='Sample Firewall Rule',

‎samples/vmc/networks_nsxv/ipsec_vpns_crud.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ class IpsecVPNsCrud(object):
2929
"""
3030

3131
def __init__(self):
32-
required_args.add_argument(
33-
'--org-id', required=True, help='Organization identifier.')
34-
35-
required_args.add_argument(
36-
'--sddc-id', required=True, help='SDDC Identifier.')
37-
3832
optional_args.add_argument(
3933
'--use-compute-gateway',
4034
action='store_true',

‎samples/vmc/networks_nsxv/logical_network_crud.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ class LogicalNetworkCrud(object):
3333
"""
3434

3535
def __init__(self):
36-
required_args.add_argument(
37-
'--org-id', required=True, help='Organization identifier.')
38-
39-
required_args.add_argument(
40-
'--sddc-id', required=True, help='Sddc Identifier.')
41-
4236
optional_args.add_argument(
4337
'--network-name',
4438
default='Sample Logical Network',

‎samples/vmc/networks_nsxv/nat_rule_crud.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ class NatRuleCrud(object):
2929
"""
3030

3131
def __init__(self):
32-
required_args.add_argument(
33-
'--org-id', required=True, help='Organization identifier.')
34-
35-
required_args.add_argument(
36-
'--sddc-id', required=True, help='SDDC Identifier.')
37-
3832
optional_args.add_argument(
3933
'--public-ip', help='Public IP range for the NAT rule')
4034

‎samples/vmc/networks_nsxv/public_ip_crud.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ class PublicIPsCrud(object):
3131
"""
3232

3333
def __init__(self):
34-
required_args.add_argument(
35-
'--org-id', required=True, help='Organization identifier.')
36-
37-
required_args.add_argument(
38-
'--sddc-id', required=True, help='Sddc Identifier.')
39-
4034
optional_args.add_argument(
4135
'--notes',
4236
default='Sample public IP',

‎samples/vmc/orgs/organization_operations.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
__author__ = 'VMware, Inc.'
1616

1717
import requests
18+
import argparse
1819
import atexit
1920

20-
from samples.vmc.helpers.sample_cli import parser
2121
from vmware.vapi.vmc.client import create_vmc_client
2222

2323

@@ -36,6 +36,15 @@ def __init__(self):
3636
self.refresh_token = None
3737

3838
def options(self):
39+
parser = argparse.ArgumentParser(
40+
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
41+
required_args = parser.add_argument_group(
42+
'required arguments')
43+
required_args.add_argument(
44+
'--refresh_token',
45+
required=True,
46+
help='VMware Cloud API refresh token')
47+
3948
self.refresh_token = parser.parse_args().refresh_token
4049

4150
def setup(self):

‎samples/vmc/sddc/add_remove_hosts.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@ def __init__(self):
4343
self.interval_sec = None
4444

4545
def options(self):
46-
required_args.add_argument('--org-id',
47-
required=True,
48-
help='Organization identifier.')
49-
50-
required_args.add_argument('--sddc-id',
51-
required=True,
52-
help='Sddc Identifier.')
53-
5446
optional_args.add_argument('--interval-sec',
5547
default=60,
5648
help='Task pulling interval in sec')

‎samples/vmc/sddc/connect_to_vsphere_with_default_sddc_password.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ class ConnectTovSphereWithDefaultCredentials(object):
3535
"""
3636

3737
def __init__(self):
38-
required_args.add_argument(
39-
'--org-id', required=True, help='Organization identifier.')
40-
41-
required_args.add_argument(
42-
'--sddc-id', required=True, help='SDDC Identifier.')
4338
args = parser.parse_args()
4439

4540
self.refresh_token = args.refresh_token

‎samples/vmc/sddc/sddc_crud.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import os
1818
from random import randrange
19+
import argparse
1920

2021
from com.vmware.vapi.std.errors_client import InvalidRequest
2122
from com.vmware.vmc.model_client import AwsSddcConfig, ErrorResponse, AccountLinkSddcConfig, SddcConfig
2223
from vmware.vapi.vmc.client import create_vmc_client
23-
from samples.vmc.helpers.sample_cli import parser, required_args, optional_args
2424
from samples.vmc.helpers.vmc_task_helper import wait_for_task
2525

2626

@@ -33,8 +33,23 @@ class CreateDeleteSDDC(object):
3333
"""
3434

3535
def __init__(self):
36+
parser = argparse.ArgumentParser(
37+
description='Standard Arguments for talking to vCenter')
38+
39+
required_args = parser.add_argument_group(
40+
'required arguments')
41+
optional_args = parser.add_argument_group(
42+
'optional arguments')
43+
44+
required_args.add_argument(
45+
'--refresh_token',
46+
required=True,
47+
help='Refresh token obtained from CSP')
48+
3649
required_args.add_argument(
37-
'--org-id', required=True, help='Organization identifier.')
50+
'--org_id',
51+
required=True,
52+
help='Organization identifier.')
3853

3954
optional_args.add_argument(
4055
'--sddc-name',

0 commit comments

Comments
 (0)