lockss-pybasic 0.3.0.dev12__py3-none-any.whl → 0.3.0.dev13__py3-none-any.whl

lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.3.0-dev12'
+__version__ = '0.3.0-dev13'

lockss/pybasic/nodeutil.py

@@ -38,7 +38,7 @@ import re
 from typing import Annotated, Any, ClassVar, Literal, Optional, TypeAlias, Union
 
 from annotated_types import Ge, Le
-from pydantic import BaseModel, BeforeValidator, Field, TypeAdapter
+from pydantic import BaseModel, BeforeValidator, Field, TypeAdapter, model_validator
 
 
 #: An annotated type for port numbers (0-65535)
@@ -47,10 +47,13 @@ PortNumber: TypeAlias = Annotated[int, Ge(0), Le(65535)]
 
 class NodeTypeEnum(Enum):
     """An enumerated type representing LOCKSS node types."""
-    #: An enumerated constant representing LOCKSS 1.x nodes.
+    #: An enumerated constant representing a LOCKSS 1.x node.
     V1 = 'v1'
-    #: An enumerated constant representing LOCKSS 2.x nodes.
+    #: An enumerated constant representing a LOCKSS 2.x node.
     V2 = 'v2'
+    #: An enumerated constant representing a LOCKSS 1.x and 2.x node pair in
+    #: migration mode.
+    V1_V2_MIGRATION_PAIR = 'v1-v2-migration-pair'
 
 
 class NodeProtocolEnum(Enum):
@@ -84,9 +87,6 @@ class BaseNodeSpec(BaseModel):
                                        title='Protocol',
                                        description="The protocol for reaching the node")
 
-    host: str = Field(title='Host',
-                      description="The node's host")
-
 
 class NodeSpec1(BaseNodeSpec):
 
@@ -94,10 +94,18 @@ class NodeSpec1(BaseNodeSpec):
 
     type: Literal['v1'] = Field(**BaseNodeSpec.TYPE_FIELD)
 
+    host: str = Field(title='Host',
+                      description="The node's host")
+
     ui: PortNumber = Field(default=DEFAULT_UI_PORT_V1,
                            title='UI Port',
                            description="The LOCKSS 1.x node's Web user interface port")
 
+    @model_validator(mode='before')
+    @classmethod
+    def _parse_compact_node_spec(cls, data: Any) -> Any:
+        return _maybe_deserialize_compact_node_spec(data)
+
 
 class NodeSpec2(BaseNodeSpec):
 
@@ -115,6 +123,9 @@ class NodeSpec2(BaseNodeSpec):
 
     type: Literal['v2'] = Field(**BaseNodeSpec.TYPE_FIELD)
 
+    host: str = Field(title='Host',
+                      description="The node's host")
+
     repository: PortNumber = Field(default=DEFAULT_REPO_PORT,
                                    title='Repository Port',
                                    description="The node's Repository Service REST API Port")
@@ -139,6 +150,22 @@ class NodeSpec2(BaseNodeSpec):
                              title='SOAP Port',
                              description="The node's SOAP Compatibility Service REST API Port")
 
+    @model_validator(mode='before')
+    @classmethod
+    def _parse_compact_node_spec(cls, data: Any) -> Any:
+        return _maybe_deserialize_compact_node_spec(data)
+
+
+class NodeSpec12Pair(BaseNodeSpec):
+
+    type: Literal['v1-v2-migration-pair'] = Field(**BaseNodeSpec.TYPE_FIELD)
+
+    origin: NodeSpec1 = Field(title='Origin',
+                              description='The origin node (LOCKSS 1.x)')
+
+    destination: NodeSpec2 = Field(title='Destination',
+                                   description='The destination node (LOCKSS 2.x)')
+
 
 _RE_COMPACT_NODE_SPEC: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
 
@@ -184,7 +211,7 @@ def _maybe_deserialize_compact_node_spec(value: Any) -> Any:
 #: A type for LOCKSS node specifications, that also accepts a compact LOCKSS
 #: node specification.
 NodeSpec: TypeAlias = Annotated[
-    Annotated[Union[NodeSpec1, NodeSpec2], Field(discriminator='type')],
+    Annotated[Union[NodeSpec1, NodeSpec2, NodeSpec12Pair], Field(discriminator='type')],
     BeforeValidator(_maybe_deserialize_compact_node_spec)
 ]
 

{lockss_pybasic-0.3.0.dev12.dist-info → lockss_pybasic-0.3.0.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockss-pybasic
-Version: 0.3.0.dev12
+Version: 0.3.0.dev13
 Summary: Basic Python utilities
 License: BSD-3-Clause
 License-File: LICENSE
@@ -26,7 +26,7 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev12
+.. |RELEASE| replace:: 0.3.0-dev13
 
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 

lockss_pybasic-0.3.0.dev13.dist-info/RECORD

@@ -0,0 +1,10 @@
+lockss/pybasic/__init__.py,sha256=P7tODLAt_4QzJsvGrZ9Qyo2cV6816dwJBSJXG9azjO8,1679
+lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
+lockss/pybasic/cliutil.py,sha256=rKpodgt2oO9SHbwN1v13cMzg337YWT-iDzNM2SaUn7k,8221
+lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
+lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
+lockss/pybasic/nodeutil.py,sha256=qhZql5gNTEK-bLX_GPzEc95wVp-5bObWgBBE2Qpwv4k,9284
+lockss_pybasic-0.3.0.dev13.dist-info/METADATA,sha256=2RqdcFhWIr_x0HL5Zozk3j5vBAXQPW-g21gduglVt8A,2495
+lockss_pybasic-0.3.0.dev13.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+lockss_pybasic-0.3.0.dev13.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
+lockss_pybasic-0.3.0.dev13.dist-info/RECORD,,

lockss_pybasic-0.3.0.dev12.dist-info/RECORD

@@ -1,10 +0,0 @@
-lockss/pybasic/__init__.py,sha256=OUJuXzOlzbjkZbYpkS3aSJMq_3eIDJU4Jejpy3q_pJk,1679
-lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
-lockss/pybasic/cliutil.py,sha256=rKpodgt2oO9SHbwN1v13cMzg337YWT-iDzNM2SaUn7k,8221
-lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
-lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
-lockss/pybasic/nodeutil.py,sha256=-MSCS79JMAgoja00lTs0ycHUbI5JJHvCCQMRXOyB-fc,8293
-lockss_pybasic-0.3.0.dev12.dist-info/METADATA,sha256=kcyJf4uOVaGjFyowMi9rtWp2v9v4IwlD0g1KgPznyFY,2495
-lockss_pybasic-0.3.0.dev12.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
-lockss_pybasic-0.3.0.dev12.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
-lockss_pybasic-0.3.0.dev12.dist-info/RECORD,,