Merge pull request #1352

VMware Plugin: introduce pyVmomi 8.x compatibility
bareos · Jan 19, 2023 · fea1021 · fea1021
2 parents 8a2cbc3 + 314e91e
commit fea1021
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 ## [Unreleased]
 
 ### Changed
+- VMware Plugin: introduce pyVmomi 8.x compatibility [PR #1352]
 
 ### Removed
 - remove no longer used pkglists [PR #1335]
@@ -21,4 +22,5 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 [PR #1343]: https://github.com/bareos/bareos/pull/1343
 [PR #1346]: https://github.com/bareos/bareos/pull/1346
 [PR #1351]: https://github.com/bareos/bareos/pull/1351
+[PR #1352]: https://github.com/bareos/bareos/pull/1352
 [unreleased]: https://github.com/bareos/bareos/tree/master
diff --git a/core/src/plugins/filed/python/vmware/BareosFdPluginVMware.py b/core/src/plugins/filed/python/vmware/BareosFdPluginVMware.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # BAREOS - Backup Archiving REcovery Open Sourced
 #
-# Copyright (C) 2014-2022 Bareos GmbH & Co. KG
+# Copyright (C) 2014-2023 Bareos GmbH & Co. KG
 #
 # This program is Free Software; you can redistribute it and/or
 # modify it under the terms of version three of the GNU Affero General Public
@@ -48,7 +48,7 @@
 except ImportError:
     from six.moves import configparser
 
-from pyVim.connect import SmartConnect, SmartConnectNoSSL, Disconnect
+from pyVim.connect import SmartConnect, Disconnect
 from pyVmomi import vim
 from pyVmomi import vmodl
 from pyVim.task import WaitForTask
@@ -979,11 +979,12 @@ def connect_vmware(self):
 
         if retry_no_ssl:
             try:
-                self.si = SmartConnectNoSSL(
+                self.si = SmartConnect(
                     host=self.options["vcserver"],
                     user=self.options["vcuser"],
                     pwd=self.options["vcpass"],
                     port=443,
+                    disableSslCertValidation=True,
                 )
 
             except IOError as ioerror:

diff --git a/docs/manuals/source/TasksAndConcepts/Plugins/FileDaemonPlugins/VMwarePlugin.rst.inc b/docs/manuals/source/TasksAndConcepts/Plugins/FileDaemonPlugins/VMwarePlugin.rst.inc
@@ -47,7 +47,7 @@ As the Plugin is based on the |vsphere| Storage APIs for Data Protection, which
 
 Since Bareos :sinceVersion:`22.0.0: VMware Plugin: VDDK 8.0.0` the plugin is using the Virtual Disk Development Kit (VDDK) 8.0.0, as of the VDDK 8.0 release notes, it should be compatible with vSphere 8 and the next major release (except new features) and backward compatible with vSphere 6.7 and 7, see VDDK release notes at https://developer.vmware.com/web/sdk/8.0/vddk for details.
 
-This plugin requires the pyVmomi module. Since Bareos :sinceVersion:`21.0.0: VMware Plugin: pyVmomi` the package **bareos-vmware-plugin** no longer includes a dependency on a pyVmomi package, because some Linux distributions don't provide current versions. Consequently, pyVmomi must be either installed by using :command:`pip install pyvmomi` or by manually installing a distribution provided pyVmomi package.
+This plugin requires the pyVmomi module version 7.0.2 or greater. Since Bareos :sinceVersion:`21.0.0: VMware Plugin: pyVmomi` the package **bareos-vmware-plugin** no longer includes a dependency on a pyVmomi package, because some Linux distributions don't provide current versions. Consequently, pyVmomi must be either installed by using :command:`pip install pyvmomi` or by manually installing a distribution provided pyVmomi package.
 
 Installation
 ^^^^^^^^^^^^