mergetbapi 1.3.52__tar.gz → 1.4.1__tar.gz

{mergetbapi-1.3.52 → mergetbapi-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mergetbapi
-Version: 1.3.52
+Version: 1.4.1
 Summary: Client interface to the MergeTB API
 Home-page: https://gitlab.com/mergetb/api
 Author: Brian Kocoloski

{mergetbapi-1.3.52 → mergetbapi-1.4.1}/mergetbapi/portal/v1/__init__.py

@@ -157,6 +157,13 @@ class ArtifactGetDetail(betterproto.Enum):
     MetaOnly = 2
 
 
+class BgpPeerRole(betterproto.Enum):
+    Unspecified = 0
+    Regular = 1
+    BorderGateway = 2
+    RouteReflector = 3
+
+
 class DiagnosticLevel(betterproto.Enum):
     DiagUnspec = 0
     Error = 1
@@ -645,7 +652,7 @@ class UpdateUserRequest(betterproto.Message):
     usstate: str = betterproto.string_field(14)
     toggle_email_valid: bool = betterproto.bool_field(15)
     """
-    Set the user email as validated or not. If true will toggle the state. 
+    Set the user email as validated or not. If true will toggle the state.
      (Only useful if your portal supports email validation.)
     """
 
@@ -2007,6 +2014,8 @@ class CreateDeploymentRequest(betterproto.Message):
     model: str = betterproto.string_field(2)
     id: "DeploymentId" = betterproto.message_field(3)
     xdc: str = betterproto.string_field(4)
+    access_mode: "AccessMode" = betterproto.enum_field(5)
+    """xdc name will be <Xdc>.<User's personal project>"""
 
 
 @dataclass(eq=False, repr=False)
@@ -2015,12 +2024,14 @@ class CreateDeploymentResponse(betterproto.Message):
 
 
 @dataclass(eq=False, repr=False)
-class CancelDeploymentRequest(betterproto.Message):
+class DeleteDeploymentRequest(betterproto.Message):
     id: "DeploymentId" = betterproto.message_field(1)
+    delete_experiment: bool = betterproto.bool_field(2)
+    delete_xdc: bool = betterproto.bool_field(3)
 
 
 @dataclass(eq=False, repr=False)
-class CancelDeploymentResponse(betterproto.Message):
+class DeleteDeploymentResponse(betterproto.Message):
     pass
 
 
@@ -2029,27 +2040,30 @@ class DeploymentInfo(betterproto.Message):
     id: "DeploymentId" = betterproto.message_field(1)
     xdc: str = betterproto.string_field(2)
     status: str = betterproto.string_field(3)
+    creator: str = betterproto.string_field(4)
+    access_mode: "AccessMode" = betterproto.enum_field(5)
 
 
 @dataclass(eq=False, repr=False)
-class ListDeploymentsRequest(betterproto.Message):
-    pass
+class GetDeploymentsRequest(betterproto.Message):
+    filter: "FilterMode" = betterproto.enum_field(1)
 
 
 @dataclass(eq=False, repr=False)
-class ListDeploymentsResponse(betterproto.Message):
+class GetDeploymentsResponse(betterproto.Message):
     deployments: List["DeploymentInfo"] = betterproto.message_field(1)
 
 
 @dataclass(eq=False, repr=False)
-class GetDeploymentStatusRequest(betterproto.Message):
+class GetDeploymentRequest(betterproto.Message):
     id: "DeploymentId" = betterproto.message_field(1)
     status_ms: int = betterproto.int32_field(2)
 
 
 @dataclass(eq=False, repr=False)
-class GetDeploymentStatusResponse(betterproto.Message):
-    status: "TaskTree" = betterproto.message_field(1)
+class GetDeploymentResponse(betterproto.Message):
+    info: "DeploymentInfo" = betterproto.message_field(1)
+    status: "TaskTree" = betterproto.message_field(2)
 
 
 @dataclass(eq=False, repr=False)
@@ -2290,6 +2304,7 @@ class Realization(betterproto.Message):
     link_emulation: "LinkEmulationParams" = betterproto.message_field(15)
     created: datetime = betterproto.message_field(16)
     expires: datetime = betterproto.message_field(17)
+    embed_version: str = betterproto.string_field(18)
 
 
 @dataclass(eq=False, repr=False)
@@ -2316,21 +2331,48 @@ class RealizationSummary(betterproto.Message):
 @dataclass(eq=False, repr=False)
 class InfrapodConfig(betterproto.Message):
     phy: str = betterproto.string_field(1)
-    addr: str = betterproto.string_field(2)
+    local_addr: str = betterproto.string_field(2)
     subnet: str = betterproto.string_field(3)
     gw: str = betterproto.string_field(4)
     vid: int = betterproto.uint32_field(5)
     mgmt_phy: str = betterproto.string_field(6)
     vni: int = betterproto.uint32_field(7)
-    endpoint: "Endpoint" = betterproto.message_field(8)
+    local_endpoint: "Endpoint" = betterproto.message_field(8)
+    ifr_net_endpoint: "Endpoint" = betterproto.message_field(9)
+    ifr_net_addr: str = betterproto.string_field(10)
+
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        if self.is_set("phy"):
+            warnings.warn("InfrapodConfig.phy is deprecated", DeprecationWarning)
+        if self.is_set("subnet"):
+            warnings.warn("InfrapodConfig.subnet is deprecated", DeprecationWarning)
+        if self.is_set("gw"):
+            warnings.warn("InfrapodConfig.gw is deprecated", DeprecationWarning)
+        if self.is_set("vid"):
+            warnings.warn("InfrapodConfig.vid is deprecated", DeprecationWarning)
+        if self.is_set("mgmt_phy"):
+            warnings.warn("InfrapodConfig.mgmt_phy is deprecated", DeprecationWarning)
+        if self.is_set("vni"):
+            warnings.warn("InfrapodConfig.vni is deprecated", DeprecationWarning)
 
 
 @dataclass(eq=False, repr=False)
 class InfranetEmbedding(betterproto.Message):
     infrapod_server: str = betterproto.string_field(1)
-    """hostname of infrapod server"""
-
     infrapod_site: str = betterproto.string_field(2)
+    configs: List["InfrapodConfig"] = betterproto.message_field(3)
+
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        if self.is_set("infrapod_server"):
+            warnings.warn(
+                "InfranetEmbedding.infrapod_server is deprecated", DeprecationWarning
+            )
+        if self.is_set("infrapod_site"):
+            warnings.warn(
+                "InfranetEmbedding.infrapod_site is deprecated", DeprecationWarning
+            )
 
 
 @dataclass(eq=False, repr=False)
@@ -2503,6 +2545,9 @@ class BgpPeer(betterproto.Message):
     local_asn: int = betterproto.uint32_field(2)
     remote_asn: int = betterproto.uint32_field(3)
     network: str = betterproto.string_field(4)
+    router_id: str = betterproto.string_field(5)
+    transit_ip: str = betterproto.string_field(6)
+    role: "BgpPeerRole" = betterproto.enum_field(7)
 
 
 @dataclass(eq=False, repr=False)
@@ -2570,6 +2615,7 @@ class LinkEmulation(betterproto.Message):
     interfaces: List[str] = betterproto.string_field(5)
     nodes: List[str] = betterproto.string_field(6)
     server: str = betterproto.string_field(7)
+    facility: str = betterproto.string_field(8)
 
 
 @dataclass(eq=False, repr=False)
@@ -2735,6 +2781,27 @@ class MzParameters(betterproto.Message):
     infranet_vni: int = betterproto.uint32_field(6)
     resolve_expnet: bool = betterproto.bool_field(7)
 
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        if self.is_set("infrapod_server"):
+            warnings.warn(
+                "MzParameters.infrapod_server is deprecated", DeprecationWarning
+            )
+        if self.is_set("infrapod_phy"):
+            warnings.warn("MzParameters.infrapod_phy is deprecated", DeprecationWarning)
+        if self.is_set("infranet_addr"):
+            warnings.warn(
+                "MzParameters.infranet_addr is deprecated", DeprecationWarning
+            )
+        if self.is_set("infranet_subnet"):
+            warnings.warn(
+                "MzParameters.infranet_subnet is deprecated", DeprecationWarning
+            )
+        if self.is_set("infranet_gw"):
+            warnings.warn("MzParameters.infranet_gw is deprecated", DeprecationWarning)
+        if self.is_set("infranet_vni"):
+            warnings.warn("MzParameters.infranet_vni is deprecated", DeprecationWarning)
+
 
 @dataclass(eq=False, repr=False)
 class Materialization(betterproto.Message):
@@ -2757,6 +2824,8 @@ class Materialization(betterproto.Message):
     """Moa"""
 
     created: datetime = betterproto.message_field(13)
+    infranet: "InfranetEmbedding" = betterproto.message_field(14)
+    embed_version: str = betterproto.string_field(15)
 
 
 @dataclass(eq=False, repr=False)
@@ -3179,6 +3248,7 @@ class AttachXdcRequest(betterproto.Message):
     experiment: str = betterproto.string_field(3)
     realization: str = betterproto.string_field(4)
     realization_project: str = betterproto.string_field(5)
+    force: bool = betterproto.bool_field(6)
 
 
 @dataclass(eq=False, repr=False)
@@ -5941,52 +6011,52 @@ class DeployStub(betterproto.ServiceStub):
             metadata=metadata,
         )
 
-    async def get_deployment_status(
+    async def delete_deployment(
         self,
-        get_deployment_status_request: "GetDeploymentStatusRequest",
+        delete_deployment_request: "DeleteDeploymentRequest",
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
         metadata: Optional["MetadataLike"] = None
-    ) -> "GetDeploymentStatusResponse":
+    ) -> "DeleteDeploymentResponse":
         return await self._unary_unary(
-            "/portal.v1.Deploy/GetDeploymentStatus",
-            get_deployment_status_request,
-            GetDeploymentStatusResponse,
+            "/portal.v1.Deploy/DeleteDeployment",
+            delete_deployment_request,
+            DeleteDeploymentResponse,
             timeout=timeout,
             deadline=deadline,
             metadata=metadata,
         )
 
-    async def cancel_deployment(
+    async def get_deployments(
         self,
-        cancel_deployment_request: "CancelDeploymentRequest",
+        get_deployments_request: "GetDeploymentsRequest",
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
         metadata: Optional["MetadataLike"] = None
-    ) -> "CancelDeploymentResponse":
+    ) -> "GetDeploymentsResponse":
         return await self._unary_unary(
-            "/portal.v1.Deploy/CancelDeployment",
-            cancel_deployment_request,
-            CancelDeploymentResponse,
+            "/portal.v1.Deploy/GetDeployments",
+            get_deployments_request,
+            GetDeploymentsResponse,
             timeout=timeout,
             deadline=deadline,
             metadata=metadata,
         )
 
-    async def list_deployments(
+    async def get_deployment(
         self,
-        list_deployments_request: "ListDeploymentsRequest",
+        get_deployment_request: "GetDeploymentRequest",
         *,
         timeout: Optional[float] = None,
         deadline: Optional["Deadline"] = None,
         metadata: Optional["MetadataLike"] = None
-    ) -> "ListDeploymentsResponse":
+    ) -> "GetDeploymentResponse":
         return await self._unary_unary(
-            "/portal.v1.Deploy/ListDeployments",
-            list_deployments_request,
-            ListDeploymentsResponse,
+            "/portal.v1.Deploy/GetDeployment",
+            get_deployment_request,
+            GetDeploymentResponse,
             timeout=timeout,
             deadline=deadline,
             metadata=metadata,
@@ -8774,19 +8844,19 @@ class DeployBase(ServiceBase):
     ) -> "CreateDeploymentResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
-    async def get_deployment_status(
-        self, get_deployment_status_request: "GetDeploymentStatusRequest"
-    ) -> "GetDeploymentStatusResponse":
+    async def delete_deployment(
+        self, delete_deployment_request: "DeleteDeploymentRequest"
+    ) -> "DeleteDeploymentResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
-    async def cancel_deployment(
-        self, cancel_deployment_request: "CancelDeploymentRequest"
-    ) -> "CancelDeploymentResponse":
+    async def get_deployments(
+        self, get_deployments_request: "GetDeploymentsRequest"
+    ) -> "GetDeploymentsResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
-    async def list_deployments(
-        self, list_deployments_request: "ListDeploymentsRequest"
-    ) -> "ListDeploymentsResponse":
+    async def get_deployment(
+        self, get_deployment_request: "GetDeploymentRequest"
+    ) -> "GetDeploymentResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
     async def __rpc_create_deployment(
@@ -8797,28 +8867,28 @@ class DeployBase(ServiceBase):
         response = await self.create_deployment(request)
         await stream.send_message(response)
 
-    async def __rpc_get_deployment_status(
+    async def __rpc_delete_deployment(
         self,
-        stream: "grpclib.server.Stream[GetDeploymentStatusRequest, GetDeploymentStatusResponse]",
+        stream: "grpclib.server.Stream[DeleteDeploymentRequest, DeleteDeploymentResponse]",
     ) -> None:
         request = await stream.recv_message()
-        response = await self.get_deployment_status(request)
+        response = await self.delete_deployment(request)
         await stream.send_message(response)
 
-    async def __rpc_cancel_deployment(
+    async def __rpc_get_deployments(
         self,
-        stream: "grpclib.server.Stream[CancelDeploymentRequest, CancelDeploymentResponse]",
+        stream: "grpclib.server.Stream[GetDeploymentsRequest, GetDeploymentsResponse]",
     ) -> None:
         request = await stream.recv_message()
-        response = await self.cancel_deployment(request)
+        response = await self.get_deployments(request)
         await stream.send_message(response)
 
-    async def __rpc_list_deployments(
+    async def __rpc_get_deployment(
         self,
-        stream: "grpclib.server.Stream[ListDeploymentsRequest, ListDeploymentsResponse]",
+        stream: "grpclib.server.Stream[GetDeploymentRequest, GetDeploymentResponse]",
     ) -> None:
         request = await stream.recv_message()
-        response = await self.list_deployments(request)
+        response = await self.get_deployment(request)
         await stream.send_message(response)
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
@@ -8829,22 +8899,22 @@ class DeployBase(ServiceBase):
                 CreateDeploymentRequest,
                 CreateDeploymentResponse,
             ),
-            "/portal.v1.Deploy/GetDeploymentStatus": grpclib.const.Handler(
-                self.__rpc_get_deployment_status,
+            "/portal.v1.Deploy/DeleteDeployment": grpclib.const.Handler(
+                self.__rpc_delete_deployment,
                 grpclib.const.Cardinality.UNARY_UNARY,
-                GetDeploymentStatusRequest,
-                GetDeploymentStatusResponse,
+                DeleteDeploymentRequest,
+                DeleteDeploymentResponse,
             ),
-            "/portal.v1.Deploy/CancelDeployment": grpclib.const.Handler(
-                self.__rpc_cancel_deployment,
+            "/portal.v1.Deploy/GetDeployments": grpclib.const.Handler(
+                self.__rpc_get_deployments,
                 grpclib.const.Cardinality.UNARY_UNARY,
-                CancelDeploymentRequest,
-                CancelDeploymentResponse,
+                GetDeploymentsRequest,
+                GetDeploymentsResponse,
             ),
-            "/portal.v1.Deploy/ListDeployments": grpclib.const.Handler(
-                self.__rpc_list_deployments,
+            "/portal.v1.Deploy/GetDeployment": grpclib.const.Handler(
+                self.__rpc_get_deployment,
                 grpclib.const.Cardinality.UNARY_UNARY,
-                ListDeploymentsRequest,
-                ListDeploymentsResponse,
+                GetDeploymentRequest,
+                GetDeploymentResponse,
             ),
         }

{mergetbapi-1.3.52 → mergetbapi-1.4.1}/mergetbapi/xir/__init__.py

@@ -1,8 +1,8 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: mergetb/xir/v0.3/core.proto
+# sources: mergetb/xir/pb/core.proto
 # plugin: python-betterproto
 # This file has been @generated
-
+import warnings
 from dataclasses import dataclass
 from typing import (
     Dict,
@@ -41,6 +41,7 @@ class Isa(betterproto.Enum):
 class MemoryType(betterproto.Enum):
     DDR3 = 0
     DDR4 = 1
+    DDR5 = 2
 
 
 class NicModel(betterproto.Enum):
@@ -310,7 +311,7 @@ class Capability(betterproto.Enum):
 
 
 class LinkRole(betterproto.Enum):
-    LinkRole_Unspecified = 0
+    Unspecified = 0
     InfraLink = 1
     XpLink = 2
     Tor = 3
@@ -319,6 +320,9 @@ class LinkRole(betterproto.Enum):
     GatewayLink = 6
     SimLink = 7
     HarborEndpoint = 8
+    InternalLink = 9
+    BorderGatewayLink = 10
+    WireguardLink = 11
 
 
 class DiskRole(betterproto.Enum):
@@ -437,6 +441,7 @@ class Node(betterproto.Message):
 
     host: "StringConstraint" = betterproto.message_field(14)
     tags: "SetConstraint" = betterproto.message_field(15)
+    facility: "StringConstraint" = betterproto.message_field(16)
 
 
 @dataclass(eq=False, repr=False)
@@ -571,7 +576,7 @@ class Resource(betterproto.Message):
     firmware: "Firmware" = betterproto.message_field(9)
     os: "OsConfig" = betterproto.message_field(10)
     product_info: "ProductInfo" = betterproto.message_field(11)
-    tpa: int = betterproto.uint64_field(12)
+    rlz_ordering: int = betterproto.uint64_field(12)
     ipmi: "Bmc" = betterproto.message_field(13, group="power_control")
     relayboard: "RelayBoard" = betterproto.message_field(14, group="power_control")
     pdu: "PowerDistributionUnit" = betterproto.message_field(15, group="power_control")
@@ -582,6 +587,7 @@ class Resource(betterproto.Message):
     )
     realization_tags: List[str] = betterproto.string_field(19)
     capabilities: List["Capability"] = betterproto.enum_field(20)
+    bgp_id: int = betterproto.uint32_field(21)
 
 
 @dataclass(eq=False, repr=False)
@@ -695,6 +701,7 @@ class BgpRouterConfig(betterproto.Message):
     asn: int = betterproto.uint32_field(2)
     interfaces: List["InterfaceConfig"] = betterproto.message_field(3)
     evpn: "EvpnConfig" = betterproto.message_field(4)
+    router_id: str = betterproto.string_field(5)
 
 
 @dataclass(eq=False, repr=False)
@@ -758,12 +765,19 @@ class Port(betterproto.Message):
     form_factor: "ConnectorKind" = betterproto.enum_field(6)
     connector: "Ref" = betterproto.message_field(7)
     role: "LinkRole" = betterproto.enum_field(8)
-    tpa: int = betterproto.uint64_field(9)
+    rlz_ordering: int = betterproto.uint64_field(9)
     queues: int = betterproto.uint64_field(10)
     breakout: "Breakout" = betterproto.message_field(11)
     bond: "PortBond" = betterproto.message_field(12)
     name: str = betterproto.string_field(13)
     sriov: "Sriov" = betterproto.message_field(14)
+    roles: List["LinkRole"] = betterproto.enum_field(15)
+    bridge: str = betterproto.string_field(16)
+
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        if self.is_set("role"):
+            warnings.warn("Port.role is deprecated", DeprecationWarning)
 
 
 @dataclass(eq=False, repr=False)
@@ -816,6 +830,7 @@ class Cable(betterproto.Message):
     kind: "CableKind" = betterproto.enum_field(3)
     ends: List["End"] = betterproto.message_field(4)
     product_info: "ProductInfo" = betterproto.message_field(5)
+    remote_facility: str = betterproto.string_field(6)
 
 
 @dataclass(eq=False, repr=False)
@@ -855,6 +870,8 @@ class FacilityProperties(betterproto.Message):
     """Non-key-value properties"""
 
     standard_images: List[str] = betterproto.string_field(4)
+    facility_bgp_ids: List[int] = betterproto.uint32_field(5)
+    xir_version: str = betterproto.string_field(6)
 
 
 @dataclass(eq=False, repr=False)

{mergetbapi-1.3.52 → mergetbapi-1.4.1}/mergetbapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mergetbapi
-Version: 1.3.52
+Version: 1.4.1
 Summary: Client interface to the MergeTB API
 Home-page: https://gitlab.com/mergetb/api
 Author: Brian Kocoloski