Documentation and bindings update for 6.7U3 and M8 release

Signed-off-by:Kunal Singh<[email protected]>
aagrawal3 · Aug 29, 2019 · 2b14605 · 2b14605
1 parent 2d2f32b
commit 2b14605
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 __pycache__/
 .DS_Store
 .idea/*
+.gradle/*
diff --git a/README.md b/README.md
@@ -217,9 +217,10 @@ $ python samples/vsphere/vcenter/vm/list_vms.py -v
 * [vSphere 6.7.1 (latest)](https://vmware.github.io/vsphere-automation-sdk-python/vsphere/6.7.1/)
 * Previous releases:    [6.7.0](https://vmware.github.io/vsphere-automation-sdk-python/vsphere/6.7.0)    [6.6.1](https://vmware.github.io/vsphere-automation-sdk-python/vsphere/6.6.1)       [6.5](https://vmware.github.io/vsphere-automation-sdk-python/vsphere/6.5)    [6.0](https://vmware.github.io/vsphere-automation-sdk-python/vsphere/6.0) 
 
-### VMware Cloud on AWS Console API Documentation
+### VMware Cloud on AWS API Documentation
 
 * [VMware Cloud on AWS Console API](https://vmware.github.io/vsphere-automation-sdk-python/vmc/index.html)
+* [VMware Cloud on AWS Disaster Recovery as a Service (DRaaS) API](https://vmware.github.io/vsphere-automation-sdk-python/vmc-draas/index.html)
 
 ### NSX API Documentation
 
@@ -240,7 +241,7 @@ Board members are volunteers from the SDK community and VMware staff members, bo
 
 Members:
 * Tianhao He (VMware)
-* Steve Trefethen (VMware)
+* Pavan Bidkar (VMware)
 
 ## VMware Resources
 

diff --git a/lib/README.md b/lib/README.md
@@ -7,6 +7,7 @@ Name                                | Description
 vapi_runtime	                      | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol
 vapi_client_bindings                | Client stubs for vSphere Automation APIs
 vmc_client_bindings                 | Client stubs for VMware Cloud on AWS Console APIs
+vmc-draas-client-bindings           | Client stubs for DRaaS APIs for VMware Cloud on AWS
 nsx-python-sdk                      | Client stubs for VMware NSX-T APIs
 nsx-policy-python-sdk               | Client stubs for VMware NSX-T Policy APIs
 vmc-app-python-sdk                  | Client stubs for VMware NSX-T VMC app APIs (for AWS underlay management)

diff --git a/lib/vapi-client-bindings/index.html b/lib/vapi-client-bindings/index.html
@@ -1 +1 @@
-<a href='vapi_client_bindings-3.0.0-py2.py3-none-any.whl'>vapi_client_bindings-3.0.0-py2.py3-none-any.whl</a><br />
+<a href='vapi_client_bindings-3.1.0-py2.py3-none-any.whl'>vapi_client_bindings-3.1.0-py2.py3-none-any.whl</a><br />
diff --git a/...lient_bindings-3.0.0-py2.py3-none-any.whl → ...lient_bindings-3.1.0-py2.py3-none-any.whl b/...lient_bindings-3.0.0-py2.py3-none-any.whl → ...lient_bindings-3.1.0-py2.py3-none-any.whl
diff --git a/lib/vmc-draas-client-bindings/index.html b/lib/vmc-draas-client-bindings/index.html
@@ -0,0 +1 @@
+<a href='vmc_draas_client_bindings-1.0.0-py2.py3-none-any.whl'>vmc_draas_client_bindings-1.0.0-py3.py3-none-any.whl</a><br />
diff --git a/lib/vmc-draas-client-bindings/vmc_draas_client_bindings-1.0.0-py2.py3-none-any.whl b/lib/vmc-draas-client-bindings/vmc_draas_client_bindings-1.0.0-py2.py3-none-any.whl
diff --git a/requirements.txt b/requirements.txt
@@ -2,9 +2,10 @@ lxml >= 4.3.0
 pyVmomi >= 6.7
 suds ; python_version < '3'
 suds-jurko ; python_version >= '3.0'
-vapi-client-bindings == 3.0.0
+vapi-client-bindings == 3.1.0
 vmc-client-bindings
 nsx-python-sdk
 nsx-policy-python-sdk
 nsx-vmc-policy-python-sdk
 nsx-vmc-aws-integration-python-sdk
+vmc-draas-client-bindings
diff --git a/samples/vmc/helpers/sample_cli.py b/samples/vmc/helpers/sample_cli.py
@@ -35,14 +35,14 @@
         'optional arguments')
 
 required_args.add_argument(
-        '--refresh_token',
+        '--refresh-token',
         required=True,
         help='Refresh token obtained from CSP')
 required_args.add_argument(
-        '--org_id',
+        '--org-id',
         required=True,
         help='Orgization ID')
 required_args.add_argument(
-        '--sddc_id',
+        '--sddc-id',
         required=True,
         help='SDDC ID')
diff --git a/samples/vmc/networks_nsxt/l3_vpn_crud.py b/samples/vmc/networks_nsxt/l3_vpn_crud.py
@@ -39,7 +39,7 @@ class NSXPolicyL3VPN(object):
     """
 
     def __init__(self):
-        required_args.add_argument('--remote_endpoint_public_ip',
+        required_args.add_argument('--remote-endpoint-public-ip',
                             required=True,
                             help='L3 VPN Remote end point\'s public ip')
 

diff --git a/samples/vmc/networks_nsxt/security_group_create.py b/samples/vmc/networks_nsxt/security_group_create.py
@@ -36,19 +36,19 @@
 Sample Prerequisites:
     - SDDC deployed in VMware Cloud on AWS
 """
-optional_args.add_argument('--gateway_type',
+optional_args.add_argument('--gateway-type',
                     default='mgw',
                     help='Gateway type. Either mgw or cgw')
 
 required_args.add_argument('--name',
                     required=True,
                     help='Name of the security group to be created')
 
-optional_args.add_argument('--ip_address',
+optional_args.add_argument('--ip-address',
                     default='172.31.0.0/24',
                     help='IP address for the expression')
 
-optional_args.add_argument('--group_id',
+optional_args.add_argument('--group-id',
                     help='ID of the group. A random ID will be used by default')
 
 args = parser.parse_args()

diff --git a/samples/vmc/networks_nsxt/security_group_delete.py b/samples/vmc/networks_nsxt/security_group_delete.py
@@ -39,11 +39,11 @@
     - SDDC deployed in VMware Cloud on AWS
     - A NSX-T security group
 """
-optional_args.add_argument('--gateway_type',
+optional_args.add_argument('--gateway-type',
                     default='mgw',
                     help='Gateway type. Either mgw or cgw')
 
-optional_args.add_argument('--group_id',
+optional_args.add_argument('--group-id',
                     help='ID of the group to be deleted')
 
 args = parser.parse_args()

diff --git a/samples/vmc/networks_nsxt/security_group_update.py b/samples/vmc/networks_nsxt/security_group_update.py
@@ -40,11 +40,11 @@
     - SDDC deployed in VMware Cloud on AWS
     - A NSX-T security group
 """
-optional_args.add_argument('--gateway_type',
+optional_args.add_argument('--gateway-type',
                     default='mgw',
                     help='Gateway type. Either mgw or cgw')
 
-optional_args.add_argument('--group_id',
+optional_args.add_argument('--group-id',
                     help='ID of the group to be updated')
 
 required_args.add_argument('--name',

diff --git a/samples/vmc/orgs/organization_operations.py b/samples/vmc/orgs/organization_operations.py
@@ -41,7 +41,7 @@ def options(self):
         required_args = parser.add_argument_group(
             'required arguments')
         required_args.add_argument(
-            '--refresh_token',
+            '--refresh-token',
             required=True,
             help='VMware Cloud API refresh token')
 

diff --git a/samples/vmc/sddc/sddc_crud.py b/samples/vmc/sddc/sddc_crud.py
@@ -41,12 +41,12 @@ def __init__(self):
             'optional arguments')
 
         required_args.add_argument(
-            '--refresh_token',
+            '--refresh-token',
             required=True,
             help='Refresh token obtained from CSP')
 
         required_args.add_argument(
-            '--org_id',
+            '--org-id',
             required=True,
             help='Organization identifier.')
 

diff --git a/samples/vmc/tasks/cancel_task.py b/samples/vmc/tasks/cancel_task.py
@@ -32,7 +32,7 @@
         'required arguments')
 
 required_args.add_argument(
-        '--refresh_token',
+        '--refresh-token',
         required=True,
         help='Refresh token obtained from CSP')
 

diff --git a/samples/vmc/tasks/list_tasks.py b/samples/vmc/tasks/list_tasks.py
@@ -34,7 +34,7 @@
         'required arguments')
 
 required_args.add_argument(
-        '--refresh_token',
+        '--refresh-token',
         required=True,
         help='Refresh token obtained from CSP')
 required_args.add_argument(

diff --git a/samples/vmc/tasks/list_tasks_stg.py b/samples/vmc/tasks/list_tasks_stg.py
@@ -36,7 +36,7 @@
         'optional arguments')
 
 required_args.add_argument(
-        '--refresh_token',
+        '--refresh-token',
         required=True,
         help='Refresh token obtained from CSP')
 

diff --git a/setup.py b/setup.py
@@ -15,13 +15,14 @@
         'suds ; python_version < "3"',
         'suds-jurko ; python_version >= "3.0"',
         'pyVmomi >= 6.7',
-        'vapi-runtime @ file://localhost/{}/lib/vapi-runtime/vapi_runtime-2.12.0-py2.py3-none-any.whl'.format(os.getcwd()),
-        'vapi-client-bindings @ file://localhost/{}/lib/vapi-client-bindings/vapi_client_bindings-3.0.0-py2.py3-none-any.whl'.format(os.getcwd()),
-        'vapi-common-client @ file://localhost/{}/lib/vapi-common-client/vapi_common_client-2.12.0-py2.py3-none-any.whl'.format(os.getcwd()),
+	'vapi-runtime @ file://localhost/{}/lib/vapi-runtime/vapi_runtime-2.12.0-py2.py3-none-any.whl'.format(os.getcwd()),
+	'vapi-client-bindings @ file://localhost/{}/lib/vapi-client-bindings/vapi_client_bindings-3.1.0-py2.py3-none-any.whl'.format(os.getcwd()),
+	'vapi-common-client @ file://localhost/{}/lib/vapi-common-client/vapi_common_client-2.12.0-py2.py3-none-any.whl'.format(os.getcwd()),
         'vmc-client-bindings @ file://localhost/{}/lib/vmc-client-bindings/vmc_client_bindings-1.9.0-py2.py3-none-any.whl'.format(os.getcwd()),
         'nsx-python-sdk @ file://localhost/{}/lib/nsx-python-sdk/nsx_python_sdk-2.3.0.0.3.13851140-py2.py3-none-any.whl'.format(os.getcwd()),
         'nsx-policy-python-sdk @ file://localhost/{}/lib/nsx-policy-python-sdk/nsx_policy_python_sdk-2.3.0.0.3.13851140-py2.py3-none-any.whl'.format(os.getcwd()),
         'nsx-vmc-policy-python-sdk @ file://localhost/{}/lib/nsx-vmc-policy-python-sdk/nsx_vmc_policy_python_sdk-2.3.0.0.3.13851140-py2.py3-none-any.whl'.format(os.getcwd()),
         'nsx-vmc-aws-integration-python-sdk @ file://localhost/{}/lib/nsx-vmc-aws-integration-python-sdk/nsx_vmc_aws_integration_python_sdk-2.3.0.0.3.13851140-py2.py3-none-any.whl'.format(os.getcwd()),
+        'vmc-draas-client-bindings @ file://localhost/{}/lib/vmc-draas-client-bindings/vmc_draas_client_bindings-1.0.0-py2.py3-none-any.whl'.format(os.getcwd()),
       ]
       )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<a href='vapi_client_bindings-3.0.0-py2.py3-none-any.whl'>vapi_client_bindings-3.0.0-py2.py3-none-any.whl</a><br />
		<a href='vapi_client_bindings-3.1.0-py2.py3-none-any.whl'>vapi_client_bindings-3.1.0-py2.py3-none-any.whl</a><br />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<a href='vmc_draas_client_bindings-1.0.0-py2.py3-none-any.whl'>vmc_draas_client_bindings-1.0.0-py3.py3-none-any.whl</a><br />