Commit dbad63e8 authored by Tianhao He's avatar Tianhao He

vSphere 6.5 support.

Update bindings files to support vSphere 6.5.
Add Eam binding to support vSphere EAM service.
Fixed ssl context creation in samples
parent 46f5ecae
pyVmomi
=======
Copyright (c) 2005-2015 VMware, Inc. All Rights Reserved.
Copyright (c) 2005-2016 VMware, Inc. All Rights Reserved.
This product is licensed to you under the Apache License, Version 2.0 (the
"License"). You may not use this product except in compliance with the License.
......@@ -48,10 +48,11 @@ Documentation
=============
For general language neutral documentation of vSphere Management API see:
* `vSphere WS SDK API Docs <http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/right-pane.html>`_
* `vSphere WS SDK API Docs <http://pubs.vmware.com/vsphere-65/topic/com.vmware.wssdk.apiref.doc/right-pane.html>`_
Python Support
==============
* pyVmomi 6.5 supports 2.7, 3.3, 3.4 and 3.5
* pyVmomi 6.0.0.2016.4 and later support 2.7, 3.3 and 3.4
* pyVmomi 6.0.0 and later support 2.7, 3.3 and 3.4
* pyVmomi 5.5.0-2014.1 and 5.5.0-2014.1.1 support Python 2.6, 2.7, 3.3 and 3.4
......@@ -71,6 +72,8 @@ simultaneously with the *GA* version of vSphere with the same version number.
Releases
========
* `6.5 <https://github.com/vmware/pyvmomi/tree/v6.5>`_
release notes https://github.com/vmware/pyvmomi/releases/tag/v6.5
* `6.0.0.2016.4 <https://github.com/vmware/pyvmomi/tree/v6.0.0.2016.4>`_
release notes https://github.com/vmware/pyvmomi/releases/tag/v6.0.0.2016.4
* `6.0.0 <https://github.com/vmware/pyvmomi/tree/v6.0.0>`_
......
......@@ -16,7 +16,7 @@
# ******* WARNING - AUTO GENERATED CODE - DO NOT EDIT *******
from __future__ import absolute_import
from pyVmomi.VmomiSupport import CreateDataType, CreateManagedType, CreateEnumType, AddVersion, AddVersionParent, F_LINK, F_LINKABLE, F_OPTIONAL, F_SECRET
from pyVmomi.VmomiSupport import newestVersions, currentVersions, stableVersions, matureVersions, publicVersions, oldestVersions
from pyVmomi.VmomiSupport import newestVersions, stableVersions, publicVersions, oldestVersions
AddVersion("vmodl.version.version2", "", "", 0, "vim25")
AddVersion("vmodl.version.version1", "", "", 0, "vim25")
......@@ -29,9 +29,7 @@ AddVersionParent("vmodl.version.version1", "vmodl.version.version0")
AddVersionParent("vmodl.version.version0", "vmodl.version.version0")
newestVersions.Add("vmodl.version.version2")
currentVersions.Add("vmodl.version.version2")
stableVersions.Add("vmodl.version.version2")
matureVersions.Add("vmodl.version.version2")
publicVersions.Add("vmodl.version.version2")
oldestVersions.Add("vmodl.version.version0")
......
This diff is collapsed.
This diff is collapsed.
# ******* WARNING - AUTO GENERATED CODE - DO NOT EDIT *******
from __future__ import absolute_import
from pyVmomi.VmomiSupport import CreateDataType, CreateManagedType, CreateEnumType, AddVersion, AddVersionParent, F_LINK, F_LINKABLE, F_OPTIONAL, F_SECRET
from pyVmomi.VmomiSupport import newestVersions, currentVersions, stableVersions, matureVersions, publicVersions, oldestVersions
from pyVmomi.VmomiSupport import newestVersions, stableVersions, publicVersions, oldestVersions
AddVersion("vmodl.query.version.version1", "", "", 0, "vim25")
AddVersion("vmodl.query.version.version2", "", "", 0, "vim25")
......@@ -36,9 +36,7 @@ AddVersionParent("vmodl.version.version1", "vmodl.version.version0")
AddVersionParent("vmodl.version.version0", "vmodl.version.version0")
newestVersions.Add("vmodl.query.version.version4")
currentVersions.Add("vmodl.query.version.version4")
stableVersions.Add("vmodl.query.version.version4")
matureVersions.Add("vmodl.query.version.version4")
publicVersions.Add("vmodl.query.version.version4")
oldestVersions.Add("vmodl.query.version.version1")
......
This diff is collapsed.
This diff is collapsed.
......@@ -190,6 +190,10 @@ try:
except ImportError:
pass
try:
import pyVmomi.EamObjects
except ImportError:
pass
# All data object types and fault types have DynamicData as an ancestor
# As well load it proactively.
......
......@@ -99,9 +99,9 @@ def main():
password = getpass.getpass(prompt='Enter password for host %s and '
'user %s: ' % (args.host,args.user))
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
context.verify_mode = ssl.CERT_NONE
context = None
if hasattr(ssl, '_create_unverified_context'):
context = ssl._create_unverified_context()
si = SmartConnect(host=args.host,
user=args.user,
pwd=password,
......
......@@ -113,17 +113,14 @@ def main():
print("No virtual machine specified for poweron")
sys.exit()
si = None
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
context.verify_mode = ssl.CERT_NONE
try:
si = SmartConnect(host=args.host,
user=args.user,
pwd=password,
port=int(args.port),
sslContext=context)
except IOError:
pass
context = None
if hasattr(ssl, '_create_unverified_context'):
context = ssl._create_unverified_context()
si = SmartConnect(host=args.host,
user=args.user,
pwd=password,
port=int(args.port),
sslContext=context)
if not si:
print("Cannot connect to specified host using specified username and password")
sys.exit()
......
......@@ -29,7 +29,7 @@ with open('test-requirements.txt') as f:
setup(
name='pyvmomi',
version='6.0.0.2016.4',
version='6.5',
description='VMware vSphere Python SDK',
# NOTE: pypi prefers the use of RST to render docs
long_description=read('README.rst'),
......@@ -49,9 +49,9 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: System :: Distributed Computing',
'Operating System :: Microsoft :: Windows',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment