vmware · tianhao64 · Dec 6, 2017 · Dec 5, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ python:
   - "3.6"
 # command to install dependencies
 install: 
-  - pip install -r requirements.txt --extra-index-url file://$PWD/lib --upgrade --ignore-installed six
+  - pip install -r requirements.txt --extra-index-url file://$PWD/lib --upgrade  --ignore-installed six
   - pip install -r test-requirements.txt
   - pip install pycodestyle
 # command to run tests
-script: pycodestyle samples/*
+script: pycodestyle samples/*.py
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 [![Build Status](https://travis-ci.com/vmware/vsphere-automation-sdk-python.svg?token=v9mEJjcpDiQ9DrYbzyaQ&branch=master)](https://travis-ci.com/vmware/vsphere-automation-sdk-python)
 ## Table of Contents
 - [Abstract](#abstract)
+- [Supported vCenter Releases](#supported-vcenter-releases)
+- [VMware Cloud on AWS Support](#vmware-cloud-on-aws-support)
 - [Quick Start Guide](#quick-start-guide)
   - [Installing the required Python Packages](#installing-the-required-python-packages)
   - [Setting up a vSphere Test Environment](#setting-up-a-vsphere-test-environment)
@@ -29,10 +31,13 @@ vSphere Automation and vSphere APIs. To support this combined use, the vSphere A
 samples require the vSphere Management SDK packages (pyVmomi) to be installed on the client.
 The samples have been developed to work with python 2.7.x and 3.3+
 
-## Supported vCenter Releases:
+## Supported vCenter Releases
 vCenter 6.0 and 6.5. 
 Certain APIs and samples that are introduced in 6.5 release, such as vCenter, Virtual Machine and Appliance Management. Please refer to the notes in each sample for detailed compatibility information. 
 
+## VMware Cloud on AWS Support
+The VMware Cloud on AWS API and samples are currently available as a preview and are subject to change in the future.
+
 ## Quick Start Guide
 This document will walk you through getting up and running with the Python SDK Samples.
 Prior to running the samples you will need to setup a vCenter test environment and
@@ -55,11 +60,13 @@ The required packages are:
 * pyVmomi
 * suds (suds-jurko for python3+)
 * vapi-client-bindings
+* vmc-client-bindings
+* vapi-vmc-client
 
 These dependencies are listed in the requirements.txt file and installed using "pip install"; For more details on how to install python packages using pip please refer to the [pip user guide](http://pip.readthedocs.io/en/latest/user_guide/).
 
 ```cmd
-pip install -r requirements.txt --extra-index-url <file:///abs_path/to/sdk/lib/>
+pip install --upgrade --force-reinstall --no-cache -r requirements.txt --extra-index-url <file:///abs_path/to/sdk/lib/>
 ```
 
 **NOTE:** The SDK also requires OpenSSL 1.0.1+ if you want to connect to vSphere 6.5+ in order to support TLS1.1 & 1.2

diff --git a/doc/client.zip b/doc/client.zip
diff --git a/doc/vmc.zip b/doc/vmc.zip
diff --git a/lib/README.md b/lib/README.md
@@ -4,5 +4,7 @@ For python developers, client libraries are supplied for testing and development
 
 Name                                | Description
 ------------------------------------| -------------
-vapi_runtime	                    | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol
+vapi_runtime	                      | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol
+vapi_vmc_client                     | Handles VMC CSP authentication process
 vapi_client_bindings                | Client stubs for vSphere Automation APIs
+vmc_client_bindings                 | Client stubs for VMware Cloud Services APIs
diff --git a/lib/index.html b/lib/index.html
@@ -1,4 +1,10 @@
-<html><head><title>Simple Index</title><meta name='api-version' value='2' /></head><body>
-<a href='vapi-client-bindings/'>vapi-client-bindings</a><br />
-<a href='vapi-runtime/'>vapi-runtime</a><br />
-</body></html>
+<html>
+<head><title>Simple Index</title>
+    <meta name='api-version' value='2'/>
+</head>
+<body>
+<a href='vapi-client-bindings/'>vapi-client-bindings</a><br/>
+<a href='vmc-client-bindings/'>vmc-client-bindings</a><br/>
+<a href='vapi-runtime/'>vapi-runtime</a><br/>
+</body>
+</html>
diff --git a/lib/vapi-client-bindings/index.html b/lib/vapi-client-bindings/index.html
@@ -1 +1 @@
-<a href='vapi_client_bindings-2.7.0-py2.py3-none-any.whl'>vapi_client_bindings-2.7.0-py2.py3-none-any.whl</a><br />
+<a href='vapi_client_bindings-1.0.0-py2.py3-none-any.whl'>vapi_client_bindings-1.0.0-py2.py3-none-any.whl</a><br />
diff --git a/lib/vapi-client-bindings/vapi_client_bindings-1.0.0-py2.py3-none-any.whl b/lib/vapi-client-bindings/vapi_client_bindings-1.0.0-py2.py3-none-any.whl
diff --git a/lib/vapi-client-bindings/vapi_client_bindings-2.7.0-py2.py3-none-any.whl b/lib/vapi-client-bindings/vapi_client_bindings-2.7.0-py2.py3-none-any.whl
diff --git a/lib/vapi-runtime/index.html b/lib/vapi-runtime/index.html
@@ -1 +1 @@
-<a href='vapi_runtime-2.7.0-py2.py3-none-any.whl'>vapi_runtime-2.7.0-py2.py3-none-any.whl</a><br />
+<a href='vapi_runtime-2.7.1-py2.py3-none-any.whl'>vapi_runtime-2.7.1-py2.py3-none-any.whl</a><br />
diff --git a/lib/vapi-runtime/vapi_runtime-2.7.0-py2.py3-none-any.whl b/lib/vapi-runtime/vapi_runtime-2.7.0-py2.py3-none-any.whl
diff --git a/lib/vapi-runtime/vapi_runtime-2.7.1-py2.py3-none-any.whl b/lib/vapi-runtime/vapi_runtime-2.7.1-py2.py3-none-any.whl
diff --git a/lib/vapi-vmc-client/index.html b/lib/vapi-vmc-client/index.html
@@ -0,0 +1 @@
+<a href='vapi_vmc_client-2.7.1-py2.py3-none-any.whl'>vapi_vmc_client-2.7.1-py2.py3-none-any.whl</a><br />
diff --git a/lib/vapi-vmc-client/vapi_vmc_client-2.7.1-py2.py3-none-any.whl b/lib/vapi-vmc-client/vapi_vmc_client-2.7.1-py2.py3-none-any.whl
diff --git a/lib/vapi_client_bindings-2.5.0.zip b/lib/vapi_client_bindings-2.5.0.zip
diff --git a/lib/vapi_common_client-2.5.0.zip b/lib/vapi_common_client-2.5.0.zip
diff --git a/lib/vapi_runtime-2.5.0.zip b/lib/vapi_runtime-2.5.0.zip
diff --git a/lib/vmc-client-bindings/index.html b/lib/vmc-client-bindings/index.html
@@ -0,0 +1 @@
+<a href='vmc_client_bindings-1.0.0-py2.py3-none-any.whl'>vmc_client_bindings-1.0.0-py2.py3-none-any.whl</a><br />
diff --git a/lib/vmc-client-bindings/vmc_client_bindings-1.0.0-py2.py3-none-any.whl b/lib/vmc-client-bindings/vmc_client_bindings-1.0.0-py2.py3-none-any.whl
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,7 @@
 pyVmomi >= 6.5
 suds ; python_version < '3'
 suds-jurko ; python_version >= '3.0'
-vapi-client-bindings
+tabulate
+vapi-client-bindings == 1.0.0
+vmc-client-bindings
+vapi-vmc-client
diff --git a/samples/README.md b/samples/README.md
@@ -0,0 +1,4 @@
+Directory       | Description
+----------------| -------------
+vSphere         | Samples for vSphere APIs
+vmc             | Samples for VMware Cloud on AWS Services (currently in preview)
diff --git a/samples/vmc/README.md b/samples/vmc/README.md
@@ -0,0 +1,9 @@
+# Samples for VMware Cloud on AWS APIs (currently in preview)
+
+The following table shows the sample sub-directories and their contents.
+
+Directory       | Description
+----------------| -------------
+orgs            | Samples for operations on organizations
+sddc            | Samples for operations on SDDCs
+helpers         | Helper methods used by VMware Cloud on AWS API samples
diff --git a/samples/vmc/__init__.py b/samples/vmc/__init__.py
@@ -0,0 +1,25 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vmc/helpers/__init__.py b/samples/vmc/helpers/__init__.py
@@ -0,0 +1,25 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vmc/helpers/vmc_task_helper.py b/samples/vmc/helpers/vmc_task_helper.py
@@ -0,0 +1,64 @@
+"""
+* *******************************************************
+* Copyright (c) VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+from time import sleep
+from tabulate import tabulate
+
+from com.vmware.vmc.model_client import Task
+
+
+def wait_for_task(task_client, org_id, task_id, interval_sec=60):
+    """
+    Helper method to wait for a task to finish
+    :param task_client: task client to query the task object
+    :param org_id: organization id
+    :param task_id: task id
+    :param interval_sec: task pulling interval_sec in sec
+    :return: True if task finished successfully, False otherwise.
+    """
+    print('Wait for task {} to finish'.format(task_id))
+    print('Checking task status every {} seconds'.format(interval_sec))
+
+    while True:
+        task = task_client.get(org_id, task_id)
+
+        if task.status == Task.STATUS_FINISHED:
+            print('\nTask {} finished successfully'.format(task_id))
+            return True
+        elif task.status == Task.STATUS_FAILED:
+            print('\nTask {} failed'.format(task_id))
+            return False
+        elif task.status == Task.STATUS_CANCELED:
+            print('\nTask {} cancelled'.format(task_id))
+            return False
+        else:
+            print("Estimated time remaining: {} minutes".
+                  format(task.estimated_remaining_minutes))
+            sleep(interval_sec)
+
+
+def list_all_tasks(task_client, org_id):
+    """
+    List all tasks in a given org
+    :param task_client: task client to query the task object
+    :param org_id: organization id
+    """
+    tasks = task_client.list(org_id)
+    headers = ['ID', 'Status', 'Progress', 'Started', 'User']
+    table = []
+    for task in tasks:
+        table.append([task.id, task.status, task.progress_percent,
+                      task.start_time, task.user_name])
+    print(tabulate(table, headers))
diff --git a/samples/vmc/orgs/README.md b/samples/vmc/orgs/README.md
@@ -0,0 +1,9 @@
+This directory contains samples for VMC organization APIs:
+
+Running the samples
+
+    $ python organization_operations.py <refresh_token>
+
+* Testbed Requirement:
+   - At least one org associated with the calling user.
+
diff --git a/samples/vmc/orgs/__init__.py b/samples/vmc/orgs/__init__.py
@@ -0,0 +1,25 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
diff --git a/samples/vmc/orgs/organization_operations.py b/samples/vmc/orgs/organization_operations.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+
+"""
+* *******************************************************
+* Copyright (c) VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+import requests
+import argparse
+import atexit
+from tabulate import tabulate
+
+from vmware.vapi.vmc.client import create_vmc_client
+
+
+class OperationsOnOrganizations(object):
+    """
+    Demonstrates operations on organizations and features
+
+    Sample Prerequisites:
+        - At least one org associated with the calling user.
+    """
+
+    def __init__(self):
+        self.org = None
+        self.feature = None
+        self.vmc_client = None
+        self.refresh_token = None
+
+    def options(self):
+        parser = argparse.ArgumentParser(
+            formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+        parser.add_argument('refresh_token',
+                            help='VMware Cloud API refresh token')
+        self.refresh_token = parser.parse_args().refresh_token
+
+    def setup(self):
+        # Login to VMware Cloud on AWS
+        session = requests.Session()
+        self.vmc_client = create_vmc_client(self.refresh_token, session)
+        atexit.register(session.close)
+
+    def list_orgs(self):
+        orgs = self.vmc_client.Orgs.list()
+        if not orgs:
+            raise ValueError('The sample requires at least one org associated'
+                             'with the calling user')
+        print("\n# Example: List organizations")
+        table = []
+        for org in orgs:
+            table.append([org.id, org.display_name])
+        print(tabulate(table, ['ID', 'Display Name']))
+
+        self.org = orgs[0]
+
+    def get_org_detail(self):
+        org = self.org
+        print('\n# Example: List details of the first organization {}:'.
+              format(org.id))
+
+        headers = ['ID', 'Display Name', 'Name', 'Created', 'Updated',
+                   'Project State', 'SLA']
+        data = [org.id, org.display_name, org.name,
+                org.created.strftime('%m/%d/%Y'),
+                org.updated.strftime('%m/%d/%Y'),
+                org.project_state, org.sla]
+        print(tabulate([data], headers))
+
+
+def main():
+    org_operations = OperationsOnOrganizations()
+    org_operations.options()
+    org_operations.setup()
+    org_operations.list_orgs()
+    org_operations.get_org_detail()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/samples/vmc/sddc/README.md b/samples/vmc/sddc/README.md
@@ -0,0 +1,14 @@
+This directory contains samples for VMC SDDC APIs:
+
+Use -h to check the required parameter for each sample:
+
+    $ python add_remove_hosts.py -h
+
+To run the sample:
+
+    $ python add_remove_hosts.py <refresh_token> <org_id> <sddc_id>
+
+* Testbed Requirement:     
+    - An organization associated with the calling user.
+    - A SDDC in the organization
+
diff --git a/samples/vmc/sddc/__init__.py b/samples/vmc/sddc/__init__.py
@@ -0,0 +1,25 @@
+"""
+* *******************************************************
+* Copyright VMware, Inc. 2017. All Rights Reserved.
+* SPDX-License-Identifier: MIT
+* *******************************************************
+*
+* DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+* EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+* WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+* NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+"""
+
+__author__ = 'VMware, Inc.'
+
+# Required to distribute different parts of this
+# package as multiple distribution
+try:
+    import pkg_resources
+
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+
+    __path__ = extend_path(__path__, __name__)  # @ReservedAssignment
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<a href='vapi_client_bindings-2.7.0-py2.py3-none-any.whl'>vapi_client_bindings-2.7.0-py2.py3-none-any.whl</a><br />
		<a href='vapi_client_bindings-1.0.0-py2.py3-none-any.whl'>vapi_client_bindings-1.0.0-py2.py3-none-any.whl</a><br />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<a href='vapi_runtime-2.7.0-py2.py3-none-any.whl'>vapi_runtime-2.7.0-py2.py3-none-any.whl</a><br />
		<a href='vapi_runtime-2.7.1-py2.py3-none-any.whl'>vapi_runtime-2.7.1-py2.py3-none-any.whl</a><br />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<a href='vapi_vmc_client-2.7.1-py2.py3-none-any.whl'>vapi_vmc_client-2.7.1-py2.py3-none-any.whl</a><br />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<a href='vmc_client_bindings-1.0.0-py2.py3-none-any.whl'>vmc_client_bindings-1.0.0-py2.py3-none-any.whl</a><br />