Bindings updates for vSphere 7.0 support (#888)

Updated Python deprecation link format

Removed an API

Co-authored-by: Pavan Bidkar <pbidkar@pbidkar-a01.vmware.com>

README.rst

@@ -14,7 +14,6 @@ Getting Started
 To get started, see the `getting started guide <http://vmware.github.io/pyvmomi-community-samples/#getting-started>`_. You'll need `Python <https://www.python.org/downloads/>`_, `pip <https://pip.pypa.io/en/latest/installing.html#using-package-managers>`_, and the `samples project <https://github.com/vmware/pyvmomi-community-samples/tarball/master>`_.
 
 * http://vmware.github.io/pyvmomi-community-samples/
-* Pydoc https://www.pydoc.io/pypi/pyvmomi-6.7.0/index.html
 * community discussion on IRC freenode.net channels `#pyvmomi and #pyvmomi-dev <http://webchat.freenode.net/?channels=#pyvmomi,#pyvmomi-dev>`_
 * community email is on `nabble <http://pyvmomi.2338814.n4.nabble.com>`_
 
@@ -51,12 +50,14 @@ Documentation
 =============
 For general language neutral documentation of vSphere Management API see: 
 
-* `vSphere WS SDK API Docs <https://vdc-download.vmware.com/vmwb-repository/dcr-public/6b586ed2-655c-49d9-9029-bc416323cb22/fa0b429a-a695-4c11-b7d2-2cbc284049dc/doc/index.html>`_
+* `vSphere WS SDK API Docs <https://code.vmware.com/apis/968/vsphere>`_
 
 Python Support
 ==============
 * pyVmomi supports 2.7.x and 3.3+
 
+Note: python2 is deprecated from 01/2020 https://www.python.org/doc/sunset-python-2/. Please switch to Python3 
+
 Compatibility Policy
 ====================
 pyVmomi versions are marked vSphere_version-release . Pyvmomi maintains minimum 
@@ -71,7 +72,7 @@ simultaneously with the *GA* version of vSphere with the same version number.
 
 Related Projects
 ================
-* VMware vSphere Automation SDK for Python: https://developercenter.vmware.com/web/sdk/65/vsphere-automation-python
+* VMware vSphere Automation SDK for Python: https://github.com/vmware/vsphere-automation-sdk-python
 * Samples Project: https://github.com/vmware/pyvmomi-community-samples
 * Feature Incubator: pyvmomi-tools https://github.com/vmware/pyvmomi-tools
 

pyVmomi/CoreTypes.py

@@ -1,5 +1,5 @@
 # VMware vSphere Python SDK
-# Copyright (c) 2008-2018 VMware, Inc. All Rights Reserved.
+# Copyright (c) 2008-2020 VMware, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@
 from pyVmomi.VmomiSupport import CreateDataType, CreateManagedType, CreateEnumType, AddVersion, AddVersionParent, F_LINK, F_LINKABLE, F_OPTIONAL, F_SECRET
 from pyVmomi.VmomiSupport import newestVersions, stableVersions, publicVersions, oldestVersions
 
-AddVersion("vmodl.version.version2", "", "", 0, "vim25")
-AddVersion("vmodl.version.version1", "", "", 0, "vim25")
 AddVersion("vmodl.version.version0", "", "", 0, "vim25")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version2")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version1")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version0")
-AddVersionParent("vmodl.version.version1", "vmodl.version.version1")
-AddVersionParent("vmodl.version.version1", "vmodl.version.version0")
+AddVersion("vmodl.version.version1", "", "", 0, "vim25")
+AddVersion("vmodl.version.version2", "", "", 0, "vim25")
 AddVersionParent("vmodl.version.version0", "vmodl.version.version0")
+AddVersionParent("vmodl.version.version1", "vmodl.version.version0")
+AddVersionParent("vmodl.version.version1", "vmodl.version.version1")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version0")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version1")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version2")
 
 newestVersions.Add("vmodl.version.version2")
 stableVersions.Add("vmodl.version.version2")

pyVmomi/QueryTypes.py

@@ -4,37 +4,37 @@
 from pyVmomi.VmomiSupport import F_OPTIONAL
 from pyVmomi.VmomiSupport import newestVersions, stableVersions, publicVersions, oldestVersions
 
-AddVersion("vmodl.query.version.version1", "", "", 0, "vim25")
-AddVersion("vmodl.query.version.version2", "", "", 0, "vim25")
-AddVersion("vmodl.query.version.version3", "", "", 0, "vim25")
+AddVersion("vmodl.version.version0", "", "", 0, "vim25")
 AddVersion("vmodl.query.version.version4", "", "", 0, "vim25")
-AddVersion("vmodl.version.version2", "", "", 0, "vim25")
 AddVersion("vmodl.version.version1", "", "", 0, "vim25")
-AddVersion("vmodl.version.version0", "", "", 0, "vim25")
-AddVersionParent("vmodl.query.version.version1", "vmodl.query.version.version1")
-AddVersionParent("vmodl.query.version.version1", "vmodl.version.version0")
-AddVersionParent("vmodl.query.version.version2", "vmodl.query.version.version1")
-AddVersionParent("vmodl.query.version.version2", "vmodl.query.version.version2")
-AddVersionParent("vmodl.query.version.version2", "vmodl.version.version1")
-AddVersionParent("vmodl.query.version.version2", "vmodl.version.version0")
-AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version1")
-AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version2")
-AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version3")
-AddVersionParent("vmodl.query.version.version3", "vmodl.version.version1")
-AddVersionParent("vmodl.query.version.version3", "vmodl.version.version0")
-AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version1")
-AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version2")
-AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version3")
+AddVersion("vmodl.query.version.version3", "", "", 0, "vim25")
+AddVersion("vmodl.version.version2", "", "", 0, "vim25")
+AddVersion("vmodl.query.version.version2", "", "", 0, "vim25")
+AddVersion("vmodl.query.version.version1", "", "", 0, "vim25")
+AddVersionParent("vmodl.version.version0", "vmodl.version.version0")
+AddVersionParent("vmodl.query.version.version4", "vmodl.version.version0")
 AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version4")
-AddVersionParent("vmodl.query.version.version4", "vmodl.version.version2")
 AddVersionParent("vmodl.query.version.version4", "vmodl.version.version1")
-AddVersionParent("vmodl.query.version.version4", "vmodl.version.version0")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version2")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version1")
-AddVersionParent("vmodl.version.version2", "vmodl.version.version0")
-AddVersionParent("vmodl.version.version1", "vmodl.version.version1")
+AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version3")
+AddVersionParent("vmodl.query.version.version4", "vmodl.version.version2")
+AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version2")
+AddVersionParent("vmodl.query.version.version4", "vmodl.query.version.version1")
 AddVersionParent("vmodl.version.version1", "vmodl.version.version0")
-AddVersionParent("vmodl.version.version0", "vmodl.version.version0")
+AddVersionParent("vmodl.version.version1", "vmodl.version.version1")
+AddVersionParent("vmodl.query.version.version3", "vmodl.version.version0")
+AddVersionParent("vmodl.query.version.version3", "vmodl.version.version1")
+AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version3")
+AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version2")
+AddVersionParent("vmodl.query.version.version3", "vmodl.query.version.version1")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version0")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version1")
+AddVersionParent("vmodl.version.version2", "vmodl.version.version2")
+AddVersionParent("vmodl.query.version.version2", "vmodl.version.version0")
+AddVersionParent("vmodl.query.version.version2", "vmodl.version.version1")
+AddVersionParent("vmodl.query.version.version2", "vmodl.query.version.version2")
+AddVersionParent("vmodl.query.version.version2", "vmodl.query.version.version1")
+AddVersionParent("vmodl.query.version.version1", "vmodl.version.version0")
+AddVersionParent("vmodl.query.version.version1", "vmodl.query.version.version1")
 
 newestVersions.Add("vmodl.query.version.version4")
 stableVersions.Add("vmodl.query.version.version4")