Merge pull request #34 from tianhao64/master

tianhao64 · web-flow · commit 755a79f5603a · 2017-08-29T15:30:56.000-07:00
Updated bindings for vSphere 6.6.1 release
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - "3.6"
 # command to install dependencies
 install: 
-  - pip install -r requirements.txt --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
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Python may be outdated and/or not be intended for development and we recommended
 The required packages 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
+pip install -r requirements.txt --extra-index-url <file:///abs_path/to/sdk/lib/>
 ```
 
 ### Setting up a vSphere Test Environment
diff --git a/doc/client.zip b/doc/client.zip
diff --git a/lib/README.md b/lib/README.md
@@ -4,6 +4,5 @@ For python developers, client libraries are supplied for testing and development
 
 Name                                | Description
 ------------------------------------| -------------
-vapi_runtime-\<version>.zip	        | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol
-vapi_common_client-\<version>.zip   | vAPI common client code
-vapi_client_bindings-\<version>.zip | client stubs for vSphere Automation APIs
+vapi_runtime	                    | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol
+vapi_client_bindings                | Client stubs for vSphere Automation APIs
diff --git a/lib/index.html b/lib/index.html
@@ -0,0 +1,4 @@
+<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>
diff --git a/lib/vapi-client-bindings/index.html b/lib/vapi-client-bindings/index.html
@@ -0,0 +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 />
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
@@ -0,0 +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 />
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/requirements.txt b/requirements.txt
@@ -1,8 +1,4 @@
-pyOpenSSL >= 0.14
 pyVmomi >= 6.5
-lxml
 suds ; python_version < '3'
 suds-jurko ; python_version >= '3.0'
-lib/vapi_runtime-2.5.0.zip
-lib/vapi_common_client-2.5.0.zip
-lib/vapi_client_bindings-2.5.0.zip
+vapi-client-bindings
diff --git a/samples/vsphere/vcenter/setup/testbed.py b/samples/vsphere/vcenter/setup/testbed.py
@@ -15,9 +15,9 @@
 __copyright__ = 'Copyright 2016 VMware, Inc. All rights reserved.'
 
 config = {}
-config["SERVER"] = "10.192.248.66"
+config["SERVER"] = ""
 config["USERNAME"] = "administrator@vsphere.local"
-config["PASSWORD"] = "Admin!23"
+config["PASSWORD"] = "VMware1!"
 
 config["ESX_HOST1"] = ""
 config["ESX_HOST2"] = ""
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,2 +1 @@
 testtools>=0.9.34
-vcrpy

Original file line number	Diff line number	Diff line change
`@@ -0,0 +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 />`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +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 />`