diff --git a/.travis.yml b/.travis.yml index 72b09a0b..237fb909 100644 --- 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 index 07b5056a..10e7851c 100644 --- 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 ``` ### Setting up a vSphere Test Environment diff --git a/doc/client.zip b/doc/client.zip index c68efe32..03ae935d 100644 Binary files a/doc/client.zip and b/doc/client.zip differ diff --git a/lib/README.md b/lib/README.md index 6d79598a..8d4bc719 100644 --- 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-\.zip | vAPI runtime responsible for serialization/de-serialization of objects and wire protocol -vapi_common_client-\.zip | vAPI common client code -vapi_client_bindings-\.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 new file mode 100644 index 00000000..65ea5ae4 --- /dev/null +++ b/lib/index.html @@ -0,0 +1,4 @@ +Simple Index +vapi-client-bindings
+vapi-runtime
+ diff --git a/lib/vapi-client-bindings/index.html b/lib/vapi-client-bindings/index.html new file mode 100644 index 00000000..22f2119f --- /dev/null +++ b/lib/vapi-client-bindings/index.html @@ -0,0 +1 @@ +vapi_client_bindings-2.7.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 new file mode 100644 index 00000000..0972146a Binary files /dev/null and b/lib/vapi-client-bindings/vapi_client_bindings-2.7.0-py2.py3-none-any.whl differ diff --git a/lib/vapi-runtime/index.html b/lib/vapi-runtime/index.html new file mode 100644 index 00000000..139298c5 --- /dev/null +++ b/lib/vapi-runtime/index.html @@ -0,0 +1 @@ +vapi_runtime-2.7.0-py2.py3-none-any.whl
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 new file mode 100644 index 00000000..5be57fde Binary files /dev/null and b/lib/vapi-runtime/vapi_runtime-2.7.0-py2.py3-none-any.whl differ diff --git a/requirements.txt b/requirements.txt index fdb964fd..fa853683 100644 --- 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 index dd8ea2fb..81a2dc7e 100644 --- a/samples/vsphere/vcenter/setup/testbed.py +++ b/samples/vsphere/vcenter/setup/testbed.py @@ -15,9 +15,9 @@ __author__ = 'VMware, Inc.' __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 index 40c8478e..5c55ed98 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1 @@ testtools>=0.9.34 -vcrpy