From 71d80efa433824622661d65be52a559e9c99cafb Mon Sep 17 00:00:00 2001
From: Hans Aarne Liblik <HansAarneLiblik@users.noreply.github.com>
Date: Wed, 6 Apr 2022 15:58:23 +0300
Subject: [PATCH] Update pyVmomi stubs (#7599)

* Add generic base class `DynamicData`
* Add missing `key` prop to `OptionValue`
* Fix `MethodFault` not inheriting from `Exception`
* Fix `RetrieveOptions` default `maxObjects` type and default
---
 stubs/pyvmomi/pyVmomi/vim/option.pyi     | 1 +
 stubs/pyvmomi/pyVmomi/vmodl/__init__.pyi | 8 +++++---
 stubs/pyvmomi/pyVmomi/vmodl/query.pyi    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/stubs/pyvmomi/pyVmomi/vim/option.pyi b/stubs/pyvmomi/pyVmomi/vim/option.pyi
index da6e05385..70af82670 100644
--- a/stubs/pyvmomi/pyVmomi/vim/option.pyi
+++ b/stubs/pyvmomi/pyVmomi/vim/option.pyi
@@ -7,3 +7,4 @@ class OptionManager:
 
 class OptionValue:
     value: Any
+    key: str
diff --git a/stubs/pyvmomi/pyVmomi/vmodl/__init__.pyi b/stubs/pyvmomi/pyVmomi/vmodl/__init__.pyi
index a2a737a7c..cf469c1e4 100644
--- a/stubs/pyvmomi/pyVmomi/vmodl/__init__.pyi
+++ b/stubs/pyvmomi/pyVmomi/vmodl/__init__.pyi
@@ -3,6 +3,8 @@ from typing import Any
 from .fault import *
 from .query import *
 
+class DynamicData: ...
+
 class DynamicProperty:
     def __init__(self, *, name: str = ..., val: Any = ...) -> None: ...
     name: str
@@ -10,16 +12,16 @@ class DynamicProperty:
 
 class ManagedObject: ...
 
-class KeyAnyValue:
+class KeyAnyValue(DynamicData):
     key: str
     value: Any
 
-class LocalizableMessage:
+class LocalizableMessage(DynamicData):
     key: str
     arg: list[KeyAnyValue] | None
     message: str | None
 
-class MethodFault:
+class MethodFault(DynamicData, Exception):
     msg: str | None
     faultCause: MethodFault | None
     faultMessage: list[LocalizableMessage] | None
diff --git a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi
index 251ab5ca3..8aea285fe 100644
--- a/stubs/pyvmomi/pyVmomi/vmodl/query.pyi
+++ b/stubs/pyvmomi/pyVmomi/vmodl/query.pyi
@@ -21,8 +21,8 @@ class PropertyCollector:
         def __getattr__(self, name: str) -> Any: ...  # incomplete
 
     class RetrieveOptions:
-        def __init__(self, *, maxObjects: int) -> None: ...
-        maxObjects: int
+        def __init__(self, *, maxObjects: int | None = ...) -> None: ...
+        maxObjects: int | None
 
     class ObjectSpec:
         def __init__(