Merge pull request bareos#2341

VMware Plugin: Adapt to pyVmomi 9

Author: BareosBot

CHANGELOG.md

@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - stored: add new volume status 'Unlabeled' [PR #2207]
 - doc: add views & functions to developer catalog service chapter [PR #2328]
 - systemtests: add config-default test [PR #2332]
+- VMware Plugin: Adapt to pyVmomi 9 [PR #2341]
 
 ### Documentation
 - docs: fix grpc-fd plugin call [PR #2068]
@@ -193,4 +194,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [PR #2321]: https://github.com/bareos/bareos/pull/2321
 [PR #2328]: https://github.com/bareos/bareos/pull/2328
 [PR #2332]: https://github.com/bareos/bareos/pull/2332
+[PR #2341]: https://github.com/bareos/bareos/pull/2341
 [unreleased]: https://github.com/bareos/bareos/tree/master

core/src/plugins/filed/python/vmware/bareos-fd-vmware.py

@@ -51,7 +51,12 @@
 from pyVmomi import vim
 from pyVmomi import vmodl
 import pyVim.task
-from pyVmomi.VmomiSupport import VmomiJSONEncoder
+
+# Try import pyVmomi 9.x first and fallback to old method
+try:
+    from pyVmomi.VmomiJSONEncoder import VmomiJSONEncoder
+except ImportError:
+    from pyVmomi.VmomiSupport import VmomiJSONEncoder
 
 # if OrderedDict is not available from collection (eg. SLES11),
 # the additional package python-ordereddict must be used