oslo.versionedobjects 3.10.0__tar.gz → 3.10.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/ChangeLog +14 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/PKG-INFO +1 -1
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/PKG-INFO +1 -1
- oslo_versionedobjects-3.10.2/oslo.versionedobjects.egg-info/pbr.json +1 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/base.py +21 -12
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/mypy.py +114 -48
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/test_mypy.py +333 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/test_objects.py +31 -5
- oslo_versionedobjects-3.10.0/oslo.versionedobjects.egg-info/pbr.json +0 -1
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/.coveragerc +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/.mailmap +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/.pre-commit-config.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/.stestr.conf +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/.zuul.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/AUTHORS +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/CONTRIBUTING.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/HACKING.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/LICENSE +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/README.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/bindep.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/requirements.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/conf.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/configuration/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/contributor/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/install/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/base.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/exception.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/fields.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/fixture.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/user/examples.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/user/history.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/user/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/user/typing.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/user/usage.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/SOURCES.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/dependency_links.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/entry_points.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/not-zip-safe +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/requires.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo.versionedobjects.egg-info/top_level.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/__init__.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_i18n.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_options.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_utils.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/examples/__init__.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/examples/iot_bulb.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/exception.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/fields.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/fixture.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/locale/en_GB/LC_MESSAGES/oslo_versionedobjects.po +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/py.typed +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/test.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/__init__.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/obj_fixtures.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/test_exception.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/test_fields.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/tests/test_fixture.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/pyproject.toml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/add-reno-996dd44974d53238.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/deprecate-remotable_classmethod-3c7d0f658af39fb6.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/drop-python27-support-b3e377b0dcfa4f5c.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/remove-field-staticmethods-62f5a62b2544b603.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/remove-py38-f4e8c7ce18a5914b.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/remove-py39-a35bc15c07073b80.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/remove-test-helpers-032475d5bc2ec8ca.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/notes/update_md5_for_fips-e5a8f8f438ac81fb.yaml +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2023.1.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2023.2.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2024.1.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2024.2.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2025.1.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2025.2.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2026.1.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/_static/.placeholder +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/_templates/.placeholder +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/conf.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/index.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/ocata.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/pike.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/queens.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/rocky.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/stein.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/train.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/unreleased.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/ussuri.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/victoria.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/wallaby.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/xena.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/yoga.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/zed.rst +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/requirements.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/setup.cfg +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/setup.py +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/test-requirements.txt +0 -0
- {oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/tox.ini +0 -0
|
@@ -1,6 +1,20 @@
|
|
|
1
1
|
CHANGES
|
|
2
2
|
=======
|
|
3
3
|
|
|
4
|
+
3.10.2
|
|
5
|
+
------
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
3.10.1
|
|
9
|
+
------
|
|
10
|
+
|
|
11
|
+
* Remove abstractmethod from deprecated object\_backport method
|
|
12
|
+
* Accept context passed by kwarg
|
|
13
|
+
* typing: Resolve ObjectField and ListOfObjectsField to concrete types
|
|
14
|
+
* Rename args -> kwargs
|
|
15
|
+
* Remove unecessary try-except login in mypy plugin
|
|
16
|
+
* Remove some duplication in the mypy plugin
|
|
17
|
+
|
|
4
18
|
3.10.0
|
|
5
19
|
------
|
|
6
20
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"git_version": "7a9a37a", "is_release": true}
|
|
@@ -238,9 +238,14 @@ def remotable(fn: Callable[..., R]) -> Callable[..., R]:
|
|
|
238
238
|
"""Decorator for remotable object methods."""
|
|
239
239
|
|
|
240
240
|
def _wrapper_classmethod(cls: type[_VO], *args: Any, **kwargs: Any) -> R:
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
241
|
+
if args:
|
|
242
|
+
context = args[0]
|
|
243
|
+
remaining_args = args[1:]
|
|
244
|
+
remaining_kwargs: dict[str, object] = kwargs
|
|
245
|
+
else:
|
|
246
|
+
remaining_args = ()
|
|
247
|
+
remaining_kwargs = kwargs.copy()
|
|
248
|
+
context = remaining_kwargs.pop('context')
|
|
244
249
|
if cls.indirection_api:
|
|
245
250
|
version_manifest = obj_tree_get_versions(cls.obj_name())
|
|
246
251
|
try:
|
|
@@ -250,7 +255,7 @@ def remotable(fn: Callable[..., R]) -> Callable[..., R]:
|
|
|
250
255
|
fn.__name__,
|
|
251
256
|
version_manifest,
|
|
252
257
|
remaining_args,
|
|
253
|
-
|
|
258
|
+
remaining_kwargs,
|
|
254
259
|
)
|
|
255
260
|
except NotImplementedError:
|
|
256
261
|
result = cls.indirection_api.object_class_action(
|
|
@@ -259,7 +264,7 @@ def remotable(fn: Callable[..., R]) -> Callable[..., R]:
|
|
|
259
264
|
fn.__name__,
|
|
260
265
|
cls.VERSION,
|
|
261
266
|
remaining_args,
|
|
262
|
-
|
|
267
|
+
remaining_kwargs,
|
|
263
268
|
)
|
|
264
269
|
return cast(R, result)
|
|
265
270
|
|
|
@@ -339,9 +344,14 @@ def remotable_classmethod(
|
|
|
339
344
|
)
|
|
340
345
|
|
|
341
346
|
def wrapper(cls: type[_VO], /, *args: P.args, **kwargs: P.kwargs) -> R:
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
347
|
+
if args:
|
|
348
|
+
context = args[0]
|
|
349
|
+
remaining_args = args[1:]
|
|
350
|
+
remaining_kwargs: dict[str, object] = kwargs
|
|
351
|
+
else:
|
|
352
|
+
remaining_args = ()
|
|
353
|
+
remaining_kwargs = kwargs.copy()
|
|
354
|
+
context = remaining_kwargs.pop('context')
|
|
345
355
|
if cls.indirection_api:
|
|
346
356
|
version_manifest = obj_tree_get_versions(cls.obj_name())
|
|
347
357
|
try:
|
|
@@ -351,7 +361,7 @@ def remotable_classmethod(
|
|
|
351
361
|
fn.__name__,
|
|
352
362
|
version_manifest,
|
|
353
363
|
remaining_args,
|
|
354
|
-
|
|
364
|
+
remaining_kwargs,
|
|
355
365
|
)
|
|
356
366
|
except NotImplementedError:
|
|
357
367
|
# FIXME(danms): Maybe start to warn here about deprecation?
|
|
@@ -361,7 +371,7 @@ def remotable_classmethod(
|
|
|
361
371
|
fn.__name__,
|
|
362
372
|
cls.VERSION,
|
|
363
373
|
remaining_args,
|
|
364
|
-
|
|
374
|
+
remaining_kwargs,
|
|
365
375
|
)
|
|
366
376
|
return cast(R, result)
|
|
367
377
|
|
|
@@ -1361,7 +1371,6 @@ class VersionedObjectIndirectionAPI(metaclass=abc.ABCMeta):
|
|
|
1361
1371
|
)
|
|
1362
1372
|
raise NotImplementedError('Multi-version class action not supported')
|
|
1363
1373
|
|
|
1364
|
-
@abc.abstractmethod
|
|
1365
1374
|
def object_backport(
|
|
1366
1375
|
self, context: Any, objinst: VersionedObject, target_version: str
|
|
1367
1376
|
) -> VersionedObject:
|
|
@@ -1391,7 +1400,7 @@ class VersionedObjectIndirectionAPI(metaclass=abc.ABCMeta):
|
|
|
1391
1400
|
that is understood by the requesting host.
|
|
1392
1401
|
:returns: The downgraded instance of objinst
|
|
1393
1402
|
"""
|
|
1394
|
-
|
|
1403
|
+
raise NotImplementedError('Backport not supported')
|
|
1395
1404
|
|
|
1396
1405
|
def object_backport_versions(
|
|
1397
1406
|
self,
|
|
@@ -19,6 +19,21 @@ from mypy import plugin as _plugin
|
|
|
19
19
|
from mypy import types
|
|
20
20
|
|
|
21
21
|
|
|
22
|
+
def _fields_dict_from_body(
|
|
23
|
+
body: list[nodes.Statement],
|
|
24
|
+
) -> nodes.DictExpr | None:
|
|
25
|
+
"""Return the first ``fields = {...}`` DictExpr found in a class body."""
|
|
26
|
+
for statement in body:
|
|
27
|
+
if (
|
|
28
|
+
isinstance(statement, nodes.AssignmentStmt)
|
|
29
|
+
and isinstance(statement.lvalues[0], nodes.NameExpr)
|
|
30
|
+
and statement.lvalues[0].name == "fields"
|
|
31
|
+
and isinstance(statement.rvalue, nodes.DictExpr)
|
|
32
|
+
):
|
|
33
|
+
return statement.rvalue
|
|
34
|
+
return None
|
|
35
|
+
|
|
36
|
+
|
|
22
37
|
class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
23
38
|
"""A mypy plugin for Oslo VersionedObjects
|
|
24
39
|
|
|
@@ -72,15 +87,9 @@ class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
|
72
87
|
|
|
73
88
|
def _cache_fields(self, ctx: _plugin.ClassDefContext) -> None:
|
|
74
89
|
"""Cache the fields dict from this class's body while it is intact."""
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
and isinstance(statement.lvalues[0], nodes.NameExpr)
|
|
79
|
-
and statement.lvalues[0].name == "fields"
|
|
80
|
-
and isinstance(statement.rvalue, nodes.DictExpr)
|
|
81
|
-
):
|
|
82
|
-
self._fields_cache[ctx.cls.info.fullname] = statement.rvalue
|
|
83
|
-
return
|
|
90
|
+
fields = _fields_dict_from_body(ctx.cls.defs.body)
|
|
91
|
+
if fields is not None:
|
|
92
|
+
self._fields_cache[ctx.cls.info.fullname] = fields
|
|
84
93
|
|
|
85
94
|
def _get_fields_dict_from_type_info(
|
|
86
95
|
self, type_info: nodes.TypeInfo
|
|
@@ -93,18 +102,7 @@ class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
|
93
102
|
"""
|
|
94
103
|
if type_info.fullname in self._fields_cache:
|
|
95
104
|
return self._fields_cache[type_info.fullname]
|
|
96
|
-
|
|
97
|
-
# Fallback: read directly from the body (works for the current class)
|
|
98
|
-
for statement in type_info.defn.defs.body:
|
|
99
|
-
if (
|
|
100
|
-
isinstance(statement, nodes.AssignmentStmt)
|
|
101
|
-
and isinstance(statement.lvalues[0], nodes.NameExpr)
|
|
102
|
-
and statement.lvalues[0].name == "fields"
|
|
103
|
-
and isinstance(statement.rvalue, nodes.DictExpr)
|
|
104
|
-
):
|
|
105
|
-
return statement.rvalue
|
|
106
|
-
|
|
107
|
-
return None
|
|
105
|
+
return _fields_dict_from_body(type_info.defn.defs.body)
|
|
108
106
|
|
|
109
107
|
def _add_member_to_class(
|
|
110
108
|
self, member_name: str, member_type: types.Type, clazz: nodes.TypeInfo
|
|
@@ -125,40 +123,102 @@ class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
|
125
123
|
f"{member_type}"
|
|
126
124
|
)
|
|
127
125
|
|
|
128
|
-
def
|
|
126
|
+
def _apply_nullable(
|
|
129
127
|
self,
|
|
128
|
+
field_type: types.Type,
|
|
130
129
|
ctx: _plugin.ClassDefContext,
|
|
131
|
-
|
|
132
|
-
args: dict[str, nodes.Expression],
|
|
130
|
+
kwargs: dict[str, nodes.Expression],
|
|
133
131
|
) -> types.Type:
|
|
132
|
+
if "nullable" in kwargs and ctx.api.parse_bool(kwargs["nullable"]):
|
|
133
|
+
return types.UnionType([field_type, types.NoneType()])
|
|
134
|
+
return field_type
|
|
134
135
|
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
assert isinstance(field_symbol.node, nodes.TypeInfo)
|
|
142
|
-
assert "MYPY_TYPE" in field_symbol.node.names
|
|
143
|
-
assert field_symbol.node.names["MYPY_TYPE"] is not None
|
|
144
|
-
assert isinstance(
|
|
145
|
-
field_symbol.node.names["MYPY_TYPE"].node, nodes.Var
|
|
146
|
-
)
|
|
147
|
-
assert field_symbol.node.names["MYPY_TYPE"].node.type is not None
|
|
136
|
+
def _resolve_ovo_class_type(
|
|
137
|
+
self,
|
|
138
|
+
ctx: _plugin.ClassDefContext,
|
|
139
|
+
class_name: str,
|
|
140
|
+
) -> types.Type | None:
|
|
141
|
+
"""Look up a versioned object class by name and return its mypy Type.
|
|
148
142
|
|
|
149
|
-
|
|
143
|
+
Tries the current module scope first, then falls back to searching all
|
|
144
|
+
loaded modules.
|
|
145
|
+
"""
|
|
146
|
+
sym = ctx.api.lookup_qualified(
|
|
147
|
+
class_name, ctx.cls, suppress_errors=True
|
|
148
|
+
)
|
|
149
|
+
if sym is not None and isinstance(sym.node, nodes.TypeInfo):
|
|
150
|
+
return types.Instance(sym.node, [])
|
|
150
151
|
|
|
151
|
-
|
|
152
|
-
|
|
152
|
+
for module in ctx.api.modules.values():
|
|
153
|
+
node = module.names.get(class_name)
|
|
154
|
+
if node is not None and isinstance(node.node, nodes.TypeInfo):
|
|
155
|
+
return types.Instance(node.node, [])
|
|
156
|
+
|
|
157
|
+
return None
|
|
153
158
|
|
|
154
|
-
|
|
155
|
-
|
|
159
|
+
def _get_python_type_from_ovo_field_type(
|
|
160
|
+
self,
|
|
161
|
+
ctx: _plugin.ClassDefContext,
|
|
162
|
+
ovo_field_type_name: str,
|
|
163
|
+
args: list[nodes.Expression],
|
|
164
|
+
kwargs: dict[str, nodes.Expression],
|
|
165
|
+
) -> types.Type:
|
|
166
|
+
# lookup_fully_qualified_or_none requires a dotted name (bare names
|
|
167
|
+
# like a local callable would raise ValueError inside mypy)
|
|
168
|
+
if '.' not in ovo_field_type_name:
|
|
169
|
+
self.log(f"Unqualified field type name: {ovo_field_type_name}")
|
|
170
|
+
return types.AnyType(types.TypeOfAny.implementation_artifact)
|
|
171
|
+
|
|
172
|
+
field_symbol = ctx.api.lookup_fully_qualified_or_none(
|
|
173
|
+
ovo_field_type_name
|
|
174
|
+
)
|
|
175
|
+
if field_symbol is None or not isinstance(
|
|
176
|
+
field_symbol.node, nodes.TypeInfo
|
|
177
|
+
):
|
|
178
|
+
self.log(f"Could not find field type {ovo_field_type_name}")
|
|
179
|
+
return types.AnyType(types.TypeOfAny.implementation_artifact)
|
|
180
|
+
|
|
181
|
+
field_fullname = field_symbol.node.fullname
|
|
182
|
+
|
|
183
|
+
# ObjectField and ListOfObjectsField take the target class name as a
|
|
184
|
+
# positional string arg rather than exposing a static MYPY_TYPE.
|
|
185
|
+
if field_fullname == 'oslo_versionedobjects.fields.ListOfObjectsField':
|
|
186
|
+
base_type: types.Type | None = None
|
|
187
|
+
if args and isinstance(args[0], nodes.StrExpr):
|
|
188
|
+
resolved = self._resolve_ovo_class_type(ctx, args[0].value)
|
|
189
|
+
if resolved is not None:
|
|
190
|
+
list_sym = ctx.api.lookup_fully_qualified_or_none(
|
|
191
|
+
'builtins.list'
|
|
192
|
+
)
|
|
193
|
+
if list_sym and isinstance(list_sym.node, nodes.TypeInfo):
|
|
194
|
+
base_type = types.Instance(list_sym.node, [resolved])
|
|
195
|
+
if base_type is None:
|
|
196
|
+
self.log(
|
|
197
|
+
f"Could not resolve object type for {ovo_field_type_name}"
|
|
198
|
+
)
|
|
199
|
+
return types.AnyType(types.TypeOfAny.implementation_artifact)
|
|
200
|
+
return self._apply_nullable(base_type, ctx, kwargs)
|
|
201
|
+
|
|
202
|
+
if field_fullname == 'oslo_versionedobjects.fields.ObjectField':
|
|
203
|
+
if args and isinstance(args[0], nodes.StrExpr):
|
|
204
|
+
resolved = self._resolve_ovo_class_type(ctx, args[0].value)
|
|
205
|
+
if resolved is not None:
|
|
206
|
+
return self._apply_nullable(resolved, ctx, kwargs)
|
|
156
207
|
self.log(
|
|
157
|
-
f"
|
|
208
|
+
f"Could not resolve object type for {ovo_field_type_name}"
|
|
158
209
|
)
|
|
210
|
+
return types.AnyType(types.TypeOfAny.implementation_artifact)
|
|
159
211
|
|
|
160
|
-
|
|
161
|
-
|
|
212
|
+
mypy_type_node = field_symbol.node.names.get("MYPY_TYPE")
|
|
213
|
+
if (
|
|
214
|
+
mypy_type_node is None
|
|
215
|
+
or not isinstance(mypy_type_node.node, nodes.Var)
|
|
216
|
+
or mypy_type_node.node.type is None
|
|
217
|
+
):
|
|
218
|
+
self.log(f"No MYPY_TYPE defined on {ovo_field_type_name}")
|
|
219
|
+
return types.AnyType(types.TypeOfAny.implementation_artifact)
|
|
220
|
+
|
|
221
|
+
return self._apply_nullable(mypy_type_node.node.type, ctx, kwargs)
|
|
162
222
|
|
|
163
223
|
def _add_ovo_members_to_class(
|
|
164
224
|
self,
|
|
@@ -184,6 +244,7 @@ class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
|
184
244
|
# Skip fields already defined by a more derived class in the MRO
|
|
185
245
|
if field_name in processed_fields:
|
|
186
246
|
continue
|
|
247
|
+
|
|
187
248
|
processed_fields.add(field_name)
|
|
188
249
|
|
|
189
250
|
if (
|
|
@@ -198,14 +259,19 @@ class OsloVersionedObjectPlugin(_plugin.Plugin):
|
|
|
198
259
|
types.TypeOfAny.implementation_artifact
|
|
199
260
|
)
|
|
200
261
|
else:
|
|
201
|
-
args =
|
|
262
|
+
args = [
|
|
263
|
+
arg
|
|
264
|
+
for arg, arg_name in zip(v.args, v.arg_names)
|
|
265
|
+
if arg_name is None
|
|
266
|
+
]
|
|
267
|
+
kwargs = {
|
|
202
268
|
arg_name: arg
|
|
203
269
|
for arg, arg_name in zip(v.args, v.arg_names)
|
|
204
|
-
if arg_name is not None
|
|
270
|
+
if arg_name is not None
|
|
205
271
|
}
|
|
206
272
|
|
|
207
273
|
field_type = self._get_python_type_from_ovo_field_type(
|
|
208
|
-
ctx, v.callee.fullname, args
|
|
274
|
+
ctx, v.callee.fullname, args, kwargs
|
|
209
275
|
)
|
|
210
276
|
|
|
211
277
|
self._add_member_to_class(field_name, field_type, ctx.cls.info)
|
|
@@ -53,6 +53,29 @@ def _make_fields_assignment(*field_names_and_fullnames):
|
|
|
53
53
|
return nodes.AssignmentStmt([lvalue], nodes.DictExpr(items))
|
|
54
54
|
|
|
55
55
|
|
|
56
|
+
def _make_object_field_assignment(
|
|
57
|
+
field_name: str,
|
|
58
|
+
field_type_fullname: str,
|
|
59
|
+
objtype_name: str,
|
|
60
|
+
) -> nodes.AssignmentStmt:
|
|
61
|
+
"""Create an AST for ``fields = {field_name: ObjectField(objtype_name)}``.
|
|
62
|
+
|
|
63
|
+
The ``objtype_name`` is inserted as a positional argument, matching the
|
|
64
|
+
runtime signature of ``ObjectField`` and ``ListOfObjectsField``.
|
|
65
|
+
"""
|
|
66
|
+
key = nodes.StrExpr(field_name)
|
|
67
|
+
callee = nodes.NameExpr(field_type_fullname.split('.')[-1])
|
|
68
|
+
callee.fullname = field_type_fullname
|
|
69
|
+
call = nodes.CallExpr(
|
|
70
|
+
callee,
|
|
71
|
+
[nodes.StrExpr(objtype_name)],
|
|
72
|
+
[nodes.ARG_POS],
|
|
73
|
+
[None],
|
|
74
|
+
)
|
|
75
|
+
lvalue = nodes.NameExpr('fields')
|
|
76
|
+
return nodes.AssignmentStmt([lvalue], nodes.DictExpr([(key, call)]))
|
|
77
|
+
|
|
78
|
+
|
|
56
79
|
def _make_ctx(name, statements, module_name='mymodule'):
|
|
57
80
|
"""Create a mock ClassDefContext with the given class body statements."""
|
|
58
81
|
type_info = _make_class_info(name, module_name)
|
|
@@ -327,6 +350,7 @@ class TestGetPythonTypeFromOvoFieldType(test.TestCase):
|
|
|
327
350
|
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
328
351
|
ctx,
|
|
329
352
|
'oslo_versionedobjects.fields.IntegerField',
|
|
353
|
+
[],
|
|
330
354
|
{},
|
|
331
355
|
)
|
|
332
356
|
self.assertEqual(expected, result)
|
|
@@ -337,6 +361,7 @@ class TestGetPythonTypeFromOvoFieldType(test.TestCase):
|
|
|
337
361
|
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
338
362
|
ctx,
|
|
339
363
|
'oslo_versionedobjects.fields.UnknownField',
|
|
364
|
+
[],
|
|
340
365
|
{},
|
|
341
366
|
)
|
|
342
367
|
self.assertIsInstance(result, types.AnyType)
|
|
@@ -348,6 +373,7 @@ class TestGetPythonTypeFromOvoFieldType(test.TestCase):
|
|
|
348
373
|
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
349
374
|
ctx,
|
|
350
375
|
'oslo_versionedobjects.fields.IntegerField',
|
|
376
|
+
[],
|
|
351
377
|
{'nullable': nodes.NameExpr('True')},
|
|
352
378
|
)
|
|
353
379
|
self.assertIsInstance(result, types.UnionType)
|
|
@@ -362,6 +388,7 @@ class TestGetPythonTypeFromOvoFieldType(test.TestCase):
|
|
|
362
388
|
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
363
389
|
ctx,
|
|
364
390
|
'oslo_versionedobjects.fields.IntegerField',
|
|
391
|
+
[],
|
|
365
392
|
{'nullable': nodes.NameExpr('False')},
|
|
366
393
|
)
|
|
367
394
|
self.assertNotIsInstance(result, types.UnionType)
|
|
@@ -421,6 +448,312 @@ class TestAddOvoMembersToClass(test.TestCase):
|
|
|
421
448
|
ctx.api.fail.assert_called_once()
|
|
422
449
|
|
|
423
450
|
|
|
451
|
+
class TestResolveOvoClassType(test.TestCase):
|
|
452
|
+
def setUp(self):
|
|
453
|
+
super().setUp()
|
|
454
|
+
self.plugin = _make_plugin()
|
|
455
|
+
|
|
456
|
+
def _make_ctx_with_qualified_lookup(self, type_info):
|
|
457
|
+
ctx = mock.MagicMock()
|
|
458
|
+
ctx.cls = mock.MagicMock()
|
|
459
|
+
if type_info is not None:
|
|
460
|
+
sym = nodes.SymbolTableNode(nodes.GDEF, type_info)
|
|
461
|
+
ctx.api.lookup_qualified.return_value = sym
|
|
462
|
+
else:
|
|
463
|
+
ctx.api.lookup_qualified.return_value = None
|
|
464
|
+
ctx.api.modules = {}
|
|
465
|
+
return ctx
|
|
466
|
+
|
|
467
|
+
def test_resolves_class_via_lookup_qualified(self):
|
|
468
|
+
target_type_info = _make_class_info('HostVIFInfo', 'mymodule')
|
|
469
|
+
ctx = self._make_ctx_with_qualified_lookup(target_type_info)
|
|
470
|
+
result = self.plugin._resolve_ovo_class_type(ctx, 'HostVIFInfo')
|
|
471
|
+
self.assertIsNotNone(result)
|
|
472
|
+
self.assertIsInstance(result, types.Instance)
|
|
473
|
+
self.assertIs(result.type, target_type_info)
|
|
474
|
+
|
|
475
|
+
def test_falls_back_to_modules_when_lookup_qualified_fails(self):
|
|
476
|
+
target_type_info = _make_class_info('HostVIFInfo', 'mymodule')
|
|
477
|
+
ctx = mock.MagicMock()
|
|
478
|
+
ctx.cls = mock.MagicMock()
|
|
479
|
+
ctx.api.lookup_qualified.return_value = None
|
|
480
|
+
sym = nodes.SymbolTableNode(nodes.GDEF, target_type_info)
|
|
481
|
+
module = mock.MagicMock()
|
|
482
|
+
module.names = {'HostVIFInfo': sym}
|
|
483
|
+
ctx.api.modules = {'mymodule': module}
|
|
484
|
+
result = self.plugin._resolve_ovo_class_type(ctx, 'HostVIFInfo')
|
|
485
|
+
self.assertIsNotNone(result)
|
|
486
|
+
self.assertIsInstance(result, types.Instance)
|
|
487
|
+
|
|
488
|
+
def test_returns_none_when_not_found(self):
|
|
489
|
+
ctx = mock.MagicMock()
|
|
490
|
+
ctx.cls = mock.MagicMock()
|
|
491
|
+
ctx.api.lookup_qualified.return_value = None
|
|
492
|
+
ctx.api.modules = {}
|
|
493
|
+
result = self.plugin._resolve_ovo_class_type(ctx, 'NotAClass')
|
|
494
|
+
self.assertIsNone(result)
|
|
495
|
+
|
|
496
|
+
def test_ignores_non_typeinfo_symbols(self):
|
|
497
|
+
var = nodes.Var('HostVIFInfo')
|
|
498
|
+
sym = nodes.SymbolTableNode(nodes.GDEF, var)
|
|
499
|
+
ctx = mock.MagicMock()
|
|
500
|
+
ctx.cls = mock.MagicMock()
|
|
501
|
+
ctx.api.lookup_qualified.return_value = sym
|
|
502
|
+
ctx.api.modules = {}
|
|
503
|
+
result = self.plugin._resolve_ovo_class_type(ctx, 'HostVIFInfo')
|
|
504
|
+
self.assertIsNone(result)
|
|
505
|
+
|
|
506
|
+
|
|
507
|
+
class TestGetPythonTypeObjectFields(test.TestCase):
|
|
508
|
+
"""Tests for ObjectField / ListOfObjectsField handling."""
|
|
509
|
+
|
|
510
|
+
def setUp(self):
|
|
511
|
+
super().setUp()
|
|
512
|
+
self.plugin = _make_plugin()
|
|
513
|
+
|
|
514
|
+
def _make_field_sym(self, field_fullname):
|
|
515
|
+
"""Return a SymbolTableNode for a field class."""
|
|
516
|
+
cls_name = field_fullname.split('.')[-1]
|
|
517
|
+
module = '.'.join(field_fullname.split('.')[:-1])
|
|
518
|
+
type_info = _make_class_info(cls_name, module)
|
|
519
|
+
return nodes.SymbolTableNode(nodes.GDEF, type_info)
|
|
520
|
+
|
|
521
|
+
def _make_ctx_resolving(self, field_fullname, target_type_info):
|
|
522
|
+
"""Return a ctx resolving the field class and target object class."""
|
|
523
|
+
field_sym = self._make_field_sym(field_fullname)
|
|
524
|
+
target_sym = nodes.SymbolTableNode(nodes.GDEF, target_type_info)
|
|
525
|
+
|
|
526
|
+
# Build a TypeInfo for builtins.list so Instance(list, [...]) works.
|
|
527
|
+
list_sym_table = nodes.SymbolTable()
|
|
528
|
+
list_block = nodes.Block([])
|
|
529
|
+
list_cls_def = nodes.ClassDef('list', list_block)
|
|
530
|
+
list_type_info = nodes.TypeInfo(
|
|
531
|
+
list_sym_table, list_cls_def, 'builtins'
|
|
532
|
+
)
|
|
533
|
+
list_type_info._fullname = 'builtins.list'
|
|
534
|
+
list_cls_def.info = list_type_info
|
|
535
|
+
list_sym = nodes.SymbolTableNode(nodes.GDEF, list_type_info)
|
|
536
|
+
|
|
537
|
+
ctx = mock.MagicMock()
|
|
538
|
+
ctx.cls = mock.MagicMock()
|
|
539
|
+
ctx.api.lookup_qualified.return_value = target_sym
|
|
540
|
+
ctx.api.modules = {}
|
|
541
|
+
ctx.api.parse_bool.return_value = False
|
|
542
|
+
|
|
543
|
+
def _lookup_fqn(name):
|
|
544
|
+
if name == field_fullname:
|
|
545
|
+
return field_sym
|
|
546
|
+
if name == 'builtins.list':
|
|
547
|
+
return list_sym
|
|
548
|
+
return None
|
|
549
|
+
|
|
550
|
+
ctx.api.lookup_fully_qualified_or_none.side_effect = _lookup_fqn
|
|
551
|
+
return ctx
|
|
552
|
+
|
|
553
|
+
def _make_ctx_field_only(self, field_fullname):
|
|
554
|
+
"""Return a ctx where the field is found but target lookup fails."""
|
|
555
|
+
field_sym = self._make_field_sym(field_fullname)
|
|
556
|
+
|
|
557
|
+
ctx = mock.MagicMock()
|
|
558
|
+
ctx.cls = mock.MagicMock()
|
|
559
|
+
ctx.api.lookup_qualified.return_value = None
|
|
560
|
+
ctx.api.modules = {}
|
|
561
|
+
|
|
562
|
+
def _lookup_fqn(name):
|
|
563
|
+
if name == field_fullname:
|
|
564
|
+
return field_sym
|
|
565
|
+
return None
|
|
566
|
+
|
|
567
|
+
ctx.api.lookup_fully_qualified_or_none.side_effect = _lookup_fqn
|
|
568
|
+
return ctx
|
|
569
|
+
|
|
570
|
+
def test_object_field_returns_resolved_type(self):
|
|
571
|
+
target = _make_class_info('HostVIFInfo', 'mymodule')
|
|
572
|
+
ctx = self._make_ctx_resolving(
|
|
573
|
+
'oslo_versionedobjects.fields.ObjectField', target
|
|
574
|
+
)
|
|
575
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
576
|
+
ctx,
|
|
577
|
+
'oslo_versionedobjects.fields.ObjectField',
|
|
578
|
+
[nodes.StrExpr('HostVIFInfo')],
|
|
579
|
+
{},
|
|
580
|
+
)
|
|
581
|
+
self.assertIsInstance(result, types.Instance)
|
|
582
|
+
self.assertIs(result.type, target)
|
|
583
|
+
|
|
584
|
+
def test_list_of_objects_field_returns_list_of_resolved_type(self):
|
|
585
|
+
target = _make_class_info('HostVIFInfo', 'mymodule')
|
|
586
|
+
ctx = self._make_ctx_resolving(
|
|
587
|
+
'oslo_versionedobjects.fields.ListOfObjectsField', target
|
|
588
|
+
)
|
|
589
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
590
|
+
ctx,
|
|
591
|
+
'oslo_versionedobjects.fields.ListOfObjectsField',
|
|
592
|
+
[nodes.StrExpr('HostVIFInfo')],
|
|
593
|
+
{},
|
|
594
|
+
)
|
|
595
|
+
self.assertIsInstance(result, types.Instance)
|
|
596
|
+
self.assertEqual('builtins.list', result.type.fullname)
|
|
597
|
+
self.assertEqual(1, len(result.args))
|
|
598
|
+
self.assertIsInstance(result.args[0], types.Instance)
|
|
599
|
+
self.assertIs(result.args[0].type, target)
|
|
600
|
+
|
|
601
|
+
def test_object_field_nullable_returns_union_with_none(self):
|
|
602
|
+
target = _make_class_info('HostVIFInfo', 'mymodule')
|
|
603
|
+
ctx = self._make_ctx_resolving(
|
|
604
|
+
'oslo_versionedobjects.fields.ObjectField', target
|
|
605
|
+
)
|
|
606
|
+
ctx.api.parse_bool.return_value = True
|
|
607
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
608
|
+
ctx,
|
|
609
|
+
'oslo_versionedobjects.fields.ObjectField',
|
|
610
|
+
[nodes.StrExpr('HostVIFInfo')],
|
|
611
|
+
{'nullable': nodes.NameExpr('True')},
|
|
612
|
+
)
|
|
613
|
+
self.assertIsInstance(result, types.UnionType)
|
|
614
|
+
self.assertTrue(
|
|
615
|
+
any(isinstance(t, types.NoneType) for t in result.items)
|
|
616
|
+
)
|
|
617
|
+
|
|
618
|
+
def test_list_of_objects_field_nullable_returns_union_with_none(self):
|
|
619
|
+
target = _make_class_info('HostVIFInfo', 'mymodule')
|
|
620
|
+
ctx = self._make_ctx_resolving(
|
|
621
|
+
'oslo_versionedobjects.fields.ListOfObjectsField', target
|
|
622
|
+
)
|
|
623
|
+
ctx.api.parse_bool.return_value = True
|
|
624
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
625
|
+
ctx,
|
|
626
|
+
'oslo_versionedobjects.fields.ListOfObjectsField',
|
|
627
|
+
[nodes.StrExpr('HostVIFInfo')],
|
|
628
|
+
{'nullable': nodes.NameExpr('True')},
|
|
629
|
+
)
|
|
630
|
+
self.assertIsInstance(result, types.UnionType)
|
|
631
|
+
self.assertTrue(
|
|
632
|
+
any(isinstance(t, types.NoneType) for t in result.items)
|
|
633
|
+
)
|
|
634
|
+
# The non-None item should be list[HostVIFInfo], not list[X | None]
|
|
635
|
+
non_none = [
|
|
636
|
+
t for t in result.items if not isinstance(t, types.NoneType)
|
|
637
|
+
]
|
|
638
|
+
self.assertEqual(1, len(non_none))
|
|
639
|
+
self.assertIsInstance(non_none[0], types.Instance)
|
|
640
|
+
self.assertEqual('builtins.list', non_none[0].type.fullname)
|
|
641
|
+
|
|
642
|
+
def test_object_field_unresolvable_class_returns_any(self):
|
|
643
|
+
ctx = self._make_ctx_field_only(
|
|
644
|
+
'oslo_versionedobjects.fields.ObjectField'
|
|
645
|
+
)
|
|
646
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
647
|
+
ctx,
|
|
648
|
+
'oslo_versionedobjects.fields.ObjectField',
|
|
649
|
+
[nodes.StrExpr('NoSuchClass')],
|
|
650
|
+
{},
|
|
651
|
+
)
|
|
652
|
+
self.assertIsInstance(result, types.AnyType)
|
|
653
|
+
|
|
654
|
+
def test_object_field_non_string_arg_returns_any(self):
|
|
655
|
+
ctx = self._make_ctx_field_only(
|
|
656
|
+
'oslo_versionedobjects.fields.ObjectField'
|
|
657
|
+
)
|
|
658
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
659
|
+
ctx,
|
|
660
|
+
'oslo_versionedobjects.fields.ObjectField',
|
|
661
|
+
[nodes.NameExpr('some_var')],
|
|
662
|
+
{},
|
|
663
|
+
)
|
|
664
|
+
self.assertIsInstance(result, types.AnyType)
|
|
665
|
+
|
|
666
|
+
def test_object_field_no_positional_args_falls_through_to_any(self):
|
|
667
|
+
ctx = self._make_ctx_field_only(
|
|
668
|
+
'oslo_versionedobjects.fields.ObjectField'
|
|
669
|
+
)
|
|
670
|
+
result = self.plugin._get_python_type_from_ovo_field_type(
|
|
671
|
+
ctx,
|
|
672
|
+
'oslo_versionedobjects.fields.ObjectField',
|
|
673
|
+
[],
|
|
674
|
+
{},
|
|
675
|
+
)
|
|
676
|
+
self.assertIsInstance(result, types.AnyType)
|
|
677
|
+
|
|
678
|
+
|
|
679
|
+
class TestAddOvoMembersObjectField(test.TestCase):
|
|
680
|
+
"""Integration tests: _add_ovo_members_to_class with ObjectField."""
|
|
681
|
+
|
|
682
|
+
def setUp(self):
|
|
683
|
+
super().setUp()
|
|
684
|
+
self.plugin = _make_plugin()
|
|
685
|
+
|
|
686
|
+
def _make_ctx_with_object_resolution(
|
|
687
|
+
self, field_fullname, target_type_info
|
|
688
|
+
):
|
|
689
|
+
cls_name = field_fullname.split('.')[-1]
|
|
690
|
+
module = '.'.join(field_fullname.split('.')[:-1])
|
|
691
|
+
field_type_info = _make_class_info(cls_name, module)
|
|
692
|
+
field_sym = nodes.SymbolTableNode(nodes.GDEF, field_type_info)
|
|
693
|
+
|
|
694
|
+
target_sym = nodes.SymbolTableNode(nodes.GDEF, target_type_info)
|
|
695
|
+
list_sym_table = nodes.SymbolTable()
|
|
696
|
+
list_block = nodes.Block([])
|
|
697
|
+
list_cls_def = nodes.ClassDef('list', list_block)
|
|
698
|
+
list_type_info = nodes.TypeInfo(
|
|
699
|
+
list_sym_table, list_cls_def, 'builtins'
|
|
700
|
+
)
|
|
701
|
+
list_type_info._fullname = 'builtins.list'
|
|
702
|
+
list_cls_def.info = list_type_info
|
|
703
|
+
list_sym = nodes.SymbolTableNode(nodes.GDEF, list_type_info)
|
|
704
|
+
|
|
705
|
+
ctx = _make_ctx('Owner', [])
|
|
706
|
+
ctx.api.lookup_qualified.return_value = target_sym
|
|
707
|
+
ctx.api.modules = {}
|
|
708
|
+
ctx.api.parse_bool.return_value = False
|
|
709
|
+
|
|
710
|
+
def _lookup_fqn(name):
|
|
711
|
+
if name == field_fullname:
|
|
712
|
+
return field_sym
|
|
713
|
+
if name == 'builtins.list':
|
|
714
|
+
return list_sym
|
|
715
|
+
return None
|
|
716
|
+
|
|
717
|
+
ctx.api.lookup_fully_qualified_or_none.side_effect = _lookup_fqn
|
|
718
|
+
return ctx
|
|
719
|
+
|
|
720
|
+
def test_list_of_objects_field_resolved_to_list_type(self):
|
|
721
|
+
field_fullname = 'oslo_versionedobjects.fields.ListOfObjectsField'
|
|
722
|
+
target = _make_class_info('ChildObj', 'mymodule')
|
|
723
|
+
assignment = _make_object_field_assignment(
|
|
724
|
+
'children',
|
|
725
|
+
field_fullname,
|
|
726
|
+
'ChildObj',
|
|
727
|
+
)
|
|
728
|
+
ctx = self._make_ctx_with_object_resolution(field_fullname, target)
|
|
729
|
+
processed: set[str] = set()
|
|
730
|
+
self.plugin._add_ovo_members_to_class(
|
|
731
|
+
ctx, assignment.rvalue, processed
|
|
732
|
+
)
|
|
733
|
+
self.assertIn('children', ctx.cls.info.names)
|
|
734
|
+
field_type = ctx.cls.info.names['children'].node.type
|
|
735
|
+
self.assertIsInstance(field_type, types.Instance)
|
|
736
|
+
self.assertEqual('builtins.list', field_type.type.fullname)
|
|
737
|
+
|
|
738
|
+
def test_object_field_resolved_to_instance_type(self):
|
|
739
|
+
field_fullname = 'oslo_versionedobjects.fields.ObjectField'
|
|
740
|
+
target = _make_class_info('ChildObj', 'mymodule')
|
|
741
|
+
assignment = _make_object_field_assignment(
|
|
742
|
+
'child',
|
|
743
|
+
field_fullname,
|
|
744
|
+
'ChildObj',
|
|
745
|
+
)
|
|
746
|
+
ctx = self._make_ctx_with_object_resolution(field_fullname, target)
|
|
747
|
+
processed: set[str] = set()
|
|
748
|
+
self.plugin._add_ovo_members_to_class(
|
|
749
|
+
ctx, assignment.rvalue, processed
|
|
750
|
+
)
|
|
751
|
+
self.assertIn('child', ctx.cls.info.names)
|
|
752
|
+
field_type = ctx.cls.info.names['child'].node.type
|
|
753
|
+
self.assertIsInstance(field_type, types.Instance)
|
|
754
|
+
self.assertIs(field_type.type, target)
|
|
755
|
+
|
|
756
|
+
|
|
424
757
|
class TestGenerateOvoFieldDefs(test.TestCase):
|
|
425
758
|
def setUp(self):
|
|
426
759
|
super().setUp()
|
|
@@ -802,6 +802,24 @@ class TestRemotableClassmethodDeprecation(test.TestCase):
|
|
|
802
802
|
str(caught_warnings[0].message),
|
|
803
803
|
)
|
|
804
804
|
|
|
805
|
+
def test_remotable_classmethod_context_as_kwarg(self):
|
|
806
|
+
with warnings.catch_warnings():
|
|
807
|
+
warnings.simplefilter("ignore", DeprecationWarning)
|
|
808
|
+
|
|
809
|
+
@base.VersionedObjectRegistry.register_if(False)
|
|
810
|
+
class MyLegacyObj(base.VersionedObject):
|
|
811
|
+
VERSION = '1.0'
|
|
812
|
+
|
|
813
|
+
@base.remotable_classmethod
|
|
814
|
+
def create(
|
|
815
|
+
cls: 'type[MyLegacyObj]', context: context.RequestContext
|
|
816
|
+
) -> context.RequestContext:
|
|
817
|
+
return context
|
|
818
|
+
|
|
819
|
+
ctx = context.RequestContext('user', 'project')
|
|
820
|
+
result = MyLegacyObj.create(context=ctx)
|
|
821
|
+
self.assertEqual(ctx, result)
|
|
822
|
+
|
|
805
823
|
|
|
806
824
|
class _LocalTest(_BaseTestCase):
|
|
807
825
|
def setUp(self):
|
|
@@ -1099,6 +1117,10 @@ class _TestObject(_BaseTestCase):
|
|
|
1099
1117
|
result = obj.marco()
|
|
1100
1118
|
self.assertEqual(result, 'polo')
|
|
1101
1119
|
|
|
1120
|
+
def test_static_result_context_as_kwarg(self):
|
|
1121
|
+
obj = MyObj.query(context=self.context)
|
|
1122
|
+
self.assertEqual(obj.bar, 'bar')
|
|
1123
|
+
|
|
1102
1124
|
def test_updates(self):
|
|
1103
1125
|
obj = MyObj.query(self.context)
|
|
1104
1126
|
self.assertEqual(obj.foo, 1)
|
|
@@ -1126,14 +1148,18 @@ class _TestObject(_BaseTestCase):
|
|
|
1126
1148
|
self.assertEqual({'rel_object', 'rel_objects'}, obj.obj_what_changed())
|
|
1127
1149
|
obj.obj_reset_changes()
|
|
1128
1150
|
self.assertEqual({'rel_object'}, obj.obj_what_changed())
|
|
1129
|
-
|
|
1130
|
-
|
|
1151
|
+
rel_object = obj.rel_object
|
|
1152
|
+
assert rel_object is not None
|
|
1153
|
+
rel_objects = obj.rel_objects
|
|
1154
|
+
assert rel_objects is not None
|
|
1155
|
+
self.assertEqual({'baz'}, rel_object.obj_what_changed())
|
|
1156
|
+
self.assertEqual({'baz'}, rel_objects[0].obj_what_changed())
|
|
1131
1157
|
obj.obj_reset_changes(recursive=True, fields=['foo'])
|
|
1132
1158
|
self.assertEqual({'rel_object'}, obj.obj_what_changed())
|
|
1133
|
-
self.assertEqual({'baz'},
|
|
1134
|
-
self.assertEqual({'baz'},
|
|
1159
|
+
self.assertEqual({'baz'}, rel_object.obj_what_changed())
|
|
1160
|
+
self.assertEqual({'baz'}, rel_objects[0].obj_what_changed())
|
|
1135
1161
|
obj.obj_reset_changes(recursive=True)
|
|
1136
|
-
self.assertEqual(set(),
|
|
1162
|
+
self.assertEqual(set(), rel_object.obj_what_changed())
|
|
1137
1163
|
self.assertEqual(set(), obj.obj_what_changed())
|
|
1138
1164
|
|
|
1139
1165
|
def test_get(self):
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"git_version": "fe03a6f", "is_release": true}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/configuration/index.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/contributor/index.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/exception.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/fields.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/fixture.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/doc/source/reference/index.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/__init__.py
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_i18n.py
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_options.py
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/_utils.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/exception.py
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/fields.py
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/fixture.py
RENAMED
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/oslo_versionedobjects/py.typed
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2023.1.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2023.2.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2024.1.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2024.2.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2025.1.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2025.2.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/2026.1.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/queens.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/unreleased.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/ussuri.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/victoria.rst
RENAMED
|
File without changes
|
{oslo_versionedobjects-3.10.0 → oslo_versionedobjects-3.10.2}/releasenotes/source/wallaby.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|