Skip to content

Commit 4456394

Browse files
author
Anusha Hegde
committed
moving required arguments to utility file
Signed-off-by: Anusha Hegde <[email protected]>
1 parent 3b5d957 commit 4456394

25 files changed

+112
-300
lines changed

‎samples/vmc/helpers/sample_cli.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
"""
2+
* *******************************************************
3+
* Copyright (c) VMware, Inc. 2019. All Rights Reserved.
4+
* SPDX-License-Identifier: MIT
5+
* *******************************************************
6+
*
7+
* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
8+
* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
9+
* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
10+
* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
11+
* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
12+
"""
13+
14+
__author__ = 'VMware, Inc.'
15+
__copyright__ = 'Copyright 2019 VMware, Inc. All rights reserved.'
16+
17+
import argparse
18+
19+
"""
20+
Builds a standard argument parser with required and optional argument
21+
groups
22+
23+
--refresh_token
24+
25+
"""
26+
parser = argparse.ArgumentParser(
27+
description='Standard Arguments for talking to vCenter')
28+
29+
required_args = parser.add_argument_group(
30+
'required arguments')
31+
optional_args = parser.add_argument_group(
32+
'optional arguments')
33+
34+
required_args.add_argument(
35+
'--refresh_token',
36+
required=True,
37+
help='Refresh token obtained from CSP')

‎samples/vmc/networks_nsxt/cgw_firewall_crud.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
__author__ = 'VMware, Inc.'
1717
__vcenter_version__ = '6.8.0+'
1818

19-
import argparse
2019
import requests
20+
from samples.vmc.helpers.sample_cli import parser, required_args
2121
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2222
from com.vmware.nsx_policy.model_client import IPAddressExpression
2323
from com.vmware.nsx_policy.model_client import Group
@@ -36,16 +36,6 @@ class NSXPolicyCGWFirewall(object):
3636
"""
3737

3838
def __init__(self):
39-
parser = argparse.ArgumentParser(
40-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
41-
42-
required_args = parser.add_argument_group(
43-
'required arguments')
44-
45-
required_args.add_argument('--refresh_token',
46-
required=True,
47-
help='Refresh token obtained from CSP')
48-
4939
required_args.add_argument('--org_id',
5040
required=True,
5141
help='Orgization ID')

‎samples/vmc/networks_nsxt/dfw_firewall_crud.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
__author__ = 'VMware, Inc.'
1717
__vcenter_version__ = '6.8.0+'
1818

19-
import argparse
2019
import requests
20+
from samples.vmc.helpers.sample_cli import parser, required_args
2121
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2222
from com.vmware.nsx_policy.model_client import IPAddressExpression
2323
from com.vmware.nsx_policy.model_client import Group
@@ -38,16 +38,6 @@ class NSXPolicyDFWFirewall(object):
3838
"""
3939

4040
def __init__(self):
41-
parser = argparse.ArgumentParser(
42-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
43-
44-
required_args = parser.add_argument_group(
45-
'required arguments')
46-
47-
required_args.add_argument('--refresh_token',
48-
required=True,
49-
help='Refresh token obtained from CSP')
50-
5141
required_args.add_argument('--org_id',
5242
required=True,
5343
help='Orgization ID')

‎samples/vmc/networks_nsxt/hello_world.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515

1616
__author__ = 'VMware, Inc.'
1717

18-
import argparse
1918
import pprint
20-
19+
from samples.vmc.helpers.sample_cli import parser, required_args
2120
from com.vmware.nsx_policy_client_for_vmc import (
2221
create_nsx_policy_client_for_vmc)
2322

@@ -33,20 +32,11 @@ class AuthExample(object):
3332
"""
3433

3534
def __init__(self):
36-
parser = argparse.ArgumentParser(
37-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
38-
39-
required_args = parser.add_argument_group(
40-
'required arguments')
41-
required_args.add_argument('-r', '--refresh-token',
42-
required=True,
43-
help='VMware Cloud API refresh token')
44-
45-
required_args.add_argument('-o', '--org-id',
35+
required_args.add_argument('--org-id',
4636
required=True,
4737
help='Organization identifier.')
4838

49-
required_args.add_argument('-s', '--sddc-id',
39+
required_args.add_argument('--sddc-id',
5040
required=True,
5141
help='SDDC Identifier.')
5242

‎samples/vmc/networks_nsxt/l3_vpn_crud.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
__author__ = 'VMware, Inc.'
1717

18-
import argparse
18+
from samples.vmc.helpers.sample_cli import parser, required_args
1919
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2020
from vmware.vapi.bindings.struct import PrettyPrinter as NsxPrettyPrinter
2121
from com.vmware.nsx_policy.model_client import ApiError
@@ -39,11 +39,6 @@ class NSXPolicyL3VPN(object):
3939
"""
4040

4141
def __init__(self):
42-
parser = argparse.ArgumentParser(
43-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
44-
45-
required_args = parser.add_argument_group(
46-
'required arguments')
4742
required_args.add_argument('--refresh_token',
4843
required=True,
4944
help='Refresh token obtained from CSP')

‎samples/vmc/networks_nsxt/nat_crud.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
__author__ = 'VMware, Inc.'
1717
__vcenter_version__ = '6.8.1+'
1818

19-
import argparse
2019
import requests
20+
21+
from samples.vmc.helpers.sample_cli import parser, required_args
2122
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2223
from com.vmware.nsx_vmc_app_client_for_vmc import create_nsx_vmc_app_client_for_vmc
2324
from com.vmware.nsx_vmc_app.model_client import PublicIp
@@ -36,15 +37,6 @@ class NSXPolicyNAT(object):
3637
"""
3738

3839
def __init__(self):
39-
parser = argparse.ArgumentParser(
40-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
41-
42-
required_args = parser.add_argument_group(
43-
'required arguments')
44-
required_args.add_argument('--refresh_token',
45-
required=True,
46-
help='Refresh token obtained from CSP')
47-
4840
required_args.add_argument('--org_id',
4941
required=True,
5042
help='Orgization ID')

‎samples/vmc/networks_nsxt/security_group_create.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
__author__ = 'VMware, Inc'
1616
__vcenter_version__ = 'VMware Cloud on AWS'
1717

18-
import argparse
1918
import random
2019

2120
import requests
21+
22+
from samples.vmc.helpers.sample_cli import parser, required_args, optional_args
2223
from com.vmware.nsx_policy.infra_client import Domains
2324
from com.vmware.nsx_policy.model_client import (Expression, Group,
2425
IPAddressExpression)
@@ -35,36 +36,27 @@
3536
Sample Prerequisites:
3637
- SDDC deployed in VMware Cloud on AWS
3738
"""
38-
parser = argparse.ArgumentParser(
39-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
40-
41-
required_args = parser.add_argument_group(
42-
'required arguments')
43-
required_args.add_argument('--refresh_token',
44-
required=True,
45-
help='Refresh token obtained from CSP')
46-
4739
required_args.add_argument('--org_id',
4840
required=True,
4941
help='Orgization ID')
5042

5143
required_args.add_argument('--sddc_id',
5244
required=True,
53-
help='Sddc ID')
45+
help='SDDC ID')
5446

55-
parser.add_argument('--gateway_type',
47+
optional_args.add_argument('--gateway_type',
5648
default='mgw',
5749
help='Gateway type. Either mgw or cgw')
5850

5951
required_args.add_argument('--name',
6052
required=True,
6153
help='Name of the security group to be created')
6254

63-
parser.add_argument('--ip_address',
55+
optional_args.add_argument('--ip_address',
6456
default='172.31.0.0/24',
6557
help='IP address for the expression')
6658

67-
parser.add_argument('--group_id',
59+
optional_args.add_argument('--group_id',
6860
help='ID of the group. A random ID will be used by default')
6961

7062
args = parser.parse_args()

‎samples/vmc/networks_nsxt/security_group_delete.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
__author__ = 'VMware, Inc'
1717
__vcenter_version__ = 'VMware Cloud on AWS'
1818

19-
import argparse
2019
import random
2120

2221
import requests
22+
from samples.vmc.helpers.sample_cli import parser, required_args, optional_args
2323
from com.vmware.nsx_policy.infra_client import Domains
2424
from com.vmware.nsx_policy.model_client import (Expression, Group,
2525
IPAddressExpression)
@@ -39,15 +39,6 @@
3939
- SDDC deployed in VMware Cloud on AWS
4040
- A NSX-T security group
4141
"""
42-
parser = argparse.ArgumentParser(
43-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
44-
45-
required_args = parser.add_argument_group(
46-
'required arguments')
47-
required_args.add_argument('--refresh_token',
48-
required=True,
49-
help='Refresh token obtained from CSP')
50-
5142
required_args.add_argument('--org_id',
5243
required=True,
5344
help='Orgization ID')
@@ -56,11 +47,11 @@
5647
required=True,
5748
help='SDDC ID')
5849

59-
parser.add_argument('--gateway_type',
50+
optional_args.add_argument('--gateway_type',
6051
default='mgw',
6152
help='Gateway type. Either mgw or cgw')
6253

63-
parser.add_argument('--group_id',
54+
optional_args.add_argument('--group_id',
6455
help='ID of the group to be deleted')
6556

6657
args = parser.parse_args()

‎samples/vmc/networks_nsxt/security_group_list.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
__vcenter_version__ = 'VMware Cloud on AWS'
1818

1919
import requests
20-
import argparse
2120

21+
from samples.vmc.helpers.sample_cli import parser, required_args, optional_args
2222
from com.vmware.nsx_policy.infra_client import Domains
2323
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2424
from vmware.vapi.bindings.struct import PrettyPrinter
@@ -34,15 +34,6 @@
3434
Sample Prerequisites:
3535
- SDDC deployed in VMware Cloud on AWS
3636
"""
37-
parser = argparse.ArgumentParser(
38-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
39-
40-
required_args = parser.add_argument_group(
41-
'required arguments')
42-
required_args.add_argument('--refresh_token',
43-
required=True,
44-
help='Refresh token obtained from CSP')
45-
4637
required_args.add_argument('--org_id',
4738
required=True,
4839
help='Orgization ID')
@@ -51,7 +42,7 @@
5142
required=True,
5243
help='SDDC ID')
5344

54-
parser.add_argument('--gateway_type',
45+
optional_args.add_argument('--gateway_type',
5546
default='mgw',
5647
help='Gateway type. Either mgw or cgw')
5748

‎samples/vmc/networks_nsxt/security_group_update.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
__author__ = 'VMware, Inc'
1717
__vcenter_version__ = 'VMware Cloud on AWS'
1818

19-
import argparse
2019
import random
2120

2221
import requests
22+
from samples.vmc.helpers.sample_cli import parser, required_args, optional_args
2323
from com.vmware.nsx_policy.infra_client import Domains
2424
from com.vmware.nsx_policy.model_client import (Expression, Group,
2525
IPAddressExpression)
@@ -40,15 +40,6 @@
4040
- SDDC deployed in VMware Cloud on AWS
4141
- A NSX-T security group
4242
"""
43-
parser = argparse.ArgumentParser(
44-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
45-
46-
required_args = parser.add_argument_group(
47-
'required arguments')
48-
required_args.add_argument('--refresh_token',
49-
required=True,
50-
help='Refresh token obtained from CSP')
51-
5243
required_args.add_argument('--org_id',
5344
required=True,
5445
help='Orgization ID')
@@ -57,11 +48,11 @@
5748
required=True,
5849
help='SDDC ID')
5950

60-
parser.add_argument('--gateway_type',
51+
optional_args.add_argument('--gateway_type',
6152
default='mgw',
6253
help='Gateway type. Either mgw or cgw')
6354

64-
parser.add_argument('--group_id',
55+
optional_args.add_argument('--group_id',
6556
help='ID of the group to be updated')
6657

6758
required_args.add_argument('--name',

‎samples/vmc/networks_nsxt/segments_firewall_crud.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515

1616
__author__ = 'VMware, Inc.'
1717

18-
19-
import argparse
2018
import requests
19+
from samples.vmc.helpers.sample_cli import parser, required_args
2120
from com.vmware.nsx_policy_client_for_vmc import create_nsx_policy_client_for_vmc
2221
from com.vmware.nsx_policy.model_client import Rule
2322
from vmware.vapi.bindings.struct import PrettyPrinter as NsxPrettyPrinter
@@ -34,15 +33,6 @@ class NSXPolicySegmentFirewall(object):
3433
"""
3534

3635
def __init__(self):
37-
parser = argparse.ArgumentParser(
38-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
39-
40-
required_args = parser.add_argument_group(
41-
'required arguments')
42-
required_args.add_argument('--refresh_token',
43-
required=True,
44-
help='Refresh token obtained from CSP')
45-
4636
required_args.add_argument('--org_id',
4737
required=True,
4838
help='Orgization ID')

0 commit comments

Comments
 (0)