openstack/deb-python-pyvmomi
Code Issues Proposed changes

Merge pull request #319 from tianhao64/master

Browse Source 
Doc update for 6.0
This commit is contained in:
Tianhao He 2015-11-30 14:36:09 -08:00
commit 51a54c0ca3
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.rst
View File

@ -48,11 +48,12 @@ Documentation
=============
For general language neutral documentation of vSphere Management API see:
* `vSphere WS SDK API Docs <http://pubs.vmware.com/vsphere-55/topic/com.vmware.wssdk.apiref.doc/right-pane.html>`_
* `vSphere WS SDK API Docs <http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/right-pane.html>`_
Python Support
==============
* pyVmomi 5.5.0-2014.1 and later support Python 2.6, 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
* pyVmomi 5.5.0 and below support Python 2.6 and 2.7
Compatibility Policy
@ -62,14 +63,15 @@ backward compatibility with the previous _four_ releases of *vSphere* and it's
own previous four releases. Compatibility with much older versions may continue
to work but will not be actively supported.
For example, version v5.5.0-2014.1 is most compatible with vSphere 5.5, 5.1,
5.0, and 4.1 and was the first release in 2014. Initial releases compatible with
a version of vSphere will bare a naked version number of v5.5.0 indicating that
version of pyVmomi was released simultaneously with the *GA* version of vSphere
with the same version number.
For example, version v6.0.0 is most compatible with vSphere 6.0, 5.5, 5.1 and
5.0. Initial releases compatible with a version of vSphere will bare a naked
version number of v6.0.0 indicating that version of pyVmomi was released
simultaneously with the *GA* version of vSphere with the same version number.
Releases
========
* `6.0.0 <https://github.com/vmware/pyvmomi/tree/v6.0.0>`_
release notes https://github.com/vmware/pyvmomi/releases/tag/v6.0.0
* `5.5.0-2014.1.1 <https://github.com/vmware/pyvmomi/tree/v5.5.0-2014.1.1>`_
release notes https://github.com/vmware/pyvmomi/releases/tag/v5.5.0-2014.1.1
* `5.5.0-2014.1 <https://github.com/vmware/pyvmomi/tree/v5.5.0-2014.1>`_

14
sample/getallvms.py
View File

@ -20,18 +20,12 @@ Python program for listing the vms on an ESX / vCenter host
from __future__ import print_function
import pyVmomi
from pyVmomi import vim
from pyVmomi import vmodl
from pyVim.connect import SmartConnect, Disconnect
from pyVmomi import vmodl
import argparse
import atexit
import getpass
import ssl
def GetArgs():
"""
@ -96,10 +90,14 @@ 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
si = SmartConnect(host=args.host,
user=args.user,
pwd=password,
port=int(args.port))
port=int(args.port),
sslContext=context)
if not si:
print("Could not connect to the specified host using specified "
"username and password")

6
sample/poweronvm.py
View File

@ -28,6 +28,7 @@ import argparse
import atexit
import getpass
import sys
import ssl
def GetArgs():
"""
@ -113,11 +114,14 @@ def main():
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))
port=int(args.port),
sslContext=context)
except IOError:
pass
if not si: