Merge pull request #1386

vmware_cbt_tool.py: pyVmomi 8.x compatibility

CHANGELOG.md

@@ -38,6 +38,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - filed: avoid reading from ephemeral buffer [PR #1373]
 - checkpoints: fix performance drop on big volume restores [PR #1345]
 - VMware Plugin: fix restore to different vmname [PR #1390]
+- vmware_cbt_tool.py: pyVmomi 8.x compatibility [PR #1386]
 
 ### Documentation
 - add explanation about binary version numbers [PR #1354]
@@ -68,6 +69,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 [PR #1374]: https://github.com/bareos/bareos/pull/1374
 [PR #1377]: https://github.com/bareos/bareos/pull/1377
 [PR #1378]: https://github.com/bareos/bareos/pull/1378
+[PR #1386]: https://github.com/bareos/bareos/pull/1386
 [PR #1387]: https://github.com/bareos/bareos/pull/1387
 [PR #1389]: https://github.com/bareos/bareos/pull/1389
 [PR #1390]: https://github.com/bareos/bareos/pull/1390

core/src/vmware/vmware_cbt_tool/vmware_cbt_tool.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # BAREOS - Backup Archiving REcovery Open Sourced
 #
-# Copyright (C) 2014-2020 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
@@ -27,7 +27,7 @@
 
 from __future__ import print_function
 
-from pyVim.connect import SmartConnect, SmartConnectNoSSL, Disconnect
+from pyVim.connect import SmartConnect, Disconnect
 from pyVmomi import vim, vmodl
 
 import argparse
@@ -149,7 +149,6 @@ def main():
         )
 
     try:
-
         si = None
         retry_no_ssl_verify = False
         try:
@@ -172,8 +171,12 @@ def main():
 
         if retry_no_ssl_verify:
             try:
-                si = SmartConnectNoSSL(
-                    host=args.host, user=args.user, pwd=password, port=int(args.port)
+                si = SmartConnect(
+                    host=args.host,
+                    user=args.user,
+                    pwd=password,
+                    port=int(args.port),
+                    disableSslCertValidation=True,
                 )
             except IOError as e:
                 print(
@@ -211,7 +214,6 @@ def main():
         vm = None
 
         for vm in get_vm_list(args, dcftree):
-
             print(
                 "INFO: VM %s CBT supported: %s"
                 % (