mergetbapi 1.4.2__tar.gz → 1.5.0__tar.gz

{mergetbapi-1.4.2 → mergetbapi-1.5.0}/PKG-INFO

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

{mergetbapi-1.4.2 → mergetbapi-1.5.0}/mergetbapi/portal/v1/__init__.py

@@ -179,6 +179,7 @@ class BgpPeerRole(betterproto.Enum):
     Regular = 1
     BorderGateway = 2
     RouteReflector = 3
+    LocalBorderGateway = 4
 
 
 class DiagnosticLevel(betterproto.Enum):
@@ -2110,6 +2111,12 @@ class DeploymentId(betterproto.Message):
 class CreateDeploymentRequest(betterproto.Message):
     dont_cleanup_on_fail: bool = betterproto.bool_field(1)
     model: str = betterproto.string_field(2)
+    """
+    Model/Revision/Tag could be a oneoff, but it doesn't translate well to json encoding
+    """
+
+    revision: str = betterproto.string_field(6)
+    tag: str = betterproto.string_field(7)
     id: "DeploymentId" = betterproto.message_field(3)
     xdc: str = betterproto.string_field(4)
     access_mode: "AccessMode" = betterproto.enum_field(5)
@@ -2371,6 +2378,78 @@ class Vlist(betterproto.Message):
     values: List[int] = betterproto.uint32_field(1)
 
 
+@dataclass(eq=False, repr=False)
+class WgEnclave(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+    gateways: Dict[str, "WgIfConfig"] = betterproto.map_field(
+        2, betterproto.TYPE_STRING, betterproto.TYPE_MESSAGE
+    )
+    clients: Dict[str, "WgIfConfig"] = betterproto.map_field(
+        3, betterproto.TYPE_STRING, betterproto.TYPE_MESSAGE
+    )
+    ver: int = betterproto.int64_field(4)
+    gateway_ips: Dict[str, str] = betterproto.map_field(
+        5, betterproto.TYPE_STRING, betterproto.TYPE_STRING
+    )
+    client_ips: Dict[str, str] = betterproto.map_field(
+        6, betterproto.TYPE_STRING, betterproto.TYPE_STRING
+    )
+    created: datetime = betterproto.message_field(7)
+
+
+@dataclass(eq=False, repr=False)
+class WgIfConfig(betterproto.Message):
+    endpoint: str = betterproto.string_field(1)
+    key: str = betterproto.string_field(2)
+    allowedips: List[str] = betterproto.string_field(3)
+    accessaddr: str = betterproto.string_field(4)
+
+
+@dataclass(eq=False, repr=False)
+class AddWgIfConfigRequest(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+    config: "WgIfConfig" = betterproto.message_field(2)
+    gateway: bool = betterproto.bool_field(3)
+
+
+@dataclass(eq=False, repr=False)
+class AddWgIfConfigResponse(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class DelWgIfConfigRequest(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+    key: str = betterproto.string_field(2)
+
+
+@dataclass(eq=False, repr=False)
+class DelWgIfConfigResponse(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class GetWgIfConfigRequest(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+    key: str = betterproto.string_field(2)
+
+
+@dataclass(eq=False, repr=False)
+class GetWgIfConfigResponse(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+    endpoint: str = betterproto.string_field(2)
+
+
+@dataclass(eq=False, repr=False)
+class GetWgEnclaveRequest(betterproto.Message):
+    enclaveid: str = betterproto.string_field(1)
+
+
+@dataclass(eq=False, repr=False)
+class GetWgEnclaveResponse(betterproto.Message):
+    enclave: "WgEnclave" = betterproto.message_field(1)
+
+
 @dataclass(eq=False, repr=False)
 class Realization(betterproto.Message):
     complete: bool = betterproto.bool_field(1)
@@ -2566,6 +2645,8 @@ class Waypoint(betterproto.Message):
     tap: "VlanTapPort" = betterproto.message_field(6, group="interface")
     vtep: "Vtep" = betterproto.message_field(7, group="interface")
     bgp_peer: "BgpPeer" = betterproto.message_field(8, group="interface")
+    wireguard: "WireguardLink" = betterproto.message_field(10, group="interface")
+    gre: "GreLink" = betterproto.message_field(11, group="interface")
     mtu: int = betterproto.uint32_field(9)
 
 
@@ -2646,6 +2727,7 @@ class BgpPeer(betterproto.Message):
     router_id: str = betterproto.string_field(5)
     transit_ip: str = betterproto.string_field(6)
     role: "BgpPeerRole" = betterproto.enum_field(7)
+    transit_hostname: str = betterproto.string_field(8)
 
 
 @dataclass(eq=False, repr=False)
@@ -2688,6 +2770,26 @@ class VlanVfPort(betterproto.Message):
     vid: int = betterproto.uint32_field(3)
 
 
+@dataclass(eq=False, repr=False)
+class WireguardLink(betterproto.Message):
+    name: str = betterproto.string_field(1)
+    interface: "WgIfConfig" = betterproto.message_field(2)
+    peers: List["WgIfConfig"] = betterproto.message_field(3)
+
+
+@dataclass(eq=False, repr=False)
+class GreLink(betterproto.Message):
+    name: str = betterproto.string_field(1)
+    underlay_local_ip: str = betterproto.string_field(2)
+    """underlay: the physical/transit network path"""
+
+    underlay_remote_ip: str = betterproto.string_field(3)
+    overlay_local_ip: str = betterproto.string_field(4)
+    """overlay: the virtual tunnel path"""
+
+    overlay_remote_ip: str = betterproto.string_field(5)
+
+
 @dataclass(eq=False, repr=False)
 class Diagnostic(betterproto.Message):
     message: str = betterproto.string_field(1)
@@ -3425,78 +3527,6 @@ class JupyterCfg(betterproto.Message):
     ver: int = betterproto.int64_field(5)
 
 
-@dataclass(eq=False, repr=False)
-class WgEnclave(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-    gateways: Dict[str, "WgIfConfig"] = betterproto.map_field(
-        2, betterproto.TYPE_STRING, betterproto.TYPE_MESSAGE
-    )
-    clients: Dict[str, "WgIfConfig"] = betterproto.map_field(
-        3, betterproto.TYPE_STRING, betterproto.TYPE_MESSAGE
-    )
-    ver: int = betterproto.int64_field(4)
-    gateway_ips: Dict[str, str] = betterproto.map_field(
-        5, betterproto.TYPE_STRING, betterproto.TYPE_STRING
-    )
-    client_ips: Dict[str, str] = betterproto.map_field(
-        6, betterproto.TYPE_STRING, betterproto.TYPE_STRING
-    )
-    created: datetime = betterproto.message_field(7)
-
-
-@dataclass(eq=False, repr=False)
-class WgIfConfig(betterproto.Message):
-    endpoint: str = betterproto.string_field(1)
-    key: str = betterproto.string_field(2)
-    allowedips: List[str] = betterproto.string_field(3)
-    accessaddr: str = betterproto.string_field(4)
-
-
-@dataclass(eq=False, repr=False)
-class AddWgIfConfigRequest(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-    config: "WgIfConfig" = betterproto.message_field(2)
-    gateway: bool = betterproto.bool_field(3)
-
-
-@dataclass(eq=False, repr=False)
-class AddWgIfConfigResponse(betterproto.Message):
-    pass
-
-
-@dataclass(eq=False, repr=False)
-class DelWgIfConfigRequest(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-    key: str = betterproto.string_field(2)
-
-
-@dataclass(eq=False, repr=False)
-class DelWgIfConfigResponse(betterproto.Message):
-    pass
-
-
-@dataclass(eq=False, repr=False)
-class GetWgIfConfigRequest(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-    key: str = betterproto.string_field(2)
-
-
-@dataclass(eq=False, repr=False)
-class GetWgIfConfigResponse(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-    endpoint: str = betterproto.string_field(2)
-
-
-@dataclass(eq=False, repr=False)
-class GetWgEnclaveRequest(betterproto.Message):
-    enclaveid: str = betterproto.string_field(1)
-
-
-@dataclass(eq=False, repr=False)
-class GetWgEnclaveResponse(betterproto.Message):
-    enclave: "WgEnclave" = betterproto.message_field(1)
-
-
 @dataclass(eq=False, repr=False)
 class KvUser(betterproto.Message):
     username: str = betterproto.string_field(1)

{mergetbapi-1.4.2 → mergetbapi-1.5.0}/mergetbapi/xir/__init__.py

@@ -325,6 +325,8 @@ class LinkRole(betterproto.Enum):
     InternalLink = 9
     BorderGatewayLink = 10
     WireguardLink = 11
+    IPMILink = 12
+    BGPUnderlayLink = 13
 
 
 class DiskRole(betterproto.Enum):
@@ -469,6 +471,7 @@ class Ref(betterproto.Message):
     element: str = betterproto.string_field(1)
     index: int = betterproto.uint32_field(2)
     subref: "Subref" = betterproto.message_field(3)
+    facility: str = betterproto.string_field(4)
 
 
 @dataclass(eq=False, repr=False)
@@ -565,6 +568,13 @@ class ProductInfo(betterproto.Message):
     cost: float = betterproto.float_field(5)
 
 
+@dataclass(eq=False, repr=False)
+class WireguardConfig(betterproto.Message):
+    port: int = betterproto.int32_field(1)
+    pub: str = betterproto.string_field(2)
+    prv: str = betterproto.string_field(3)
+
+
 @dataclass(eq=False, repr=False)
 class Resource(betterproto.Message):
     id: str = betterproto.string_field(1)
@@ -590,6 +600,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)
+    fqdn: str = betterproto.string_field(22)
 
 
 @dataclass(eq=False, repr=False)
@@ -675,6 +686,7 @@ class OsConfig(betterproto.Message):
     append: str = betterproto.string_field(5)
     rootdev: str = betterproto.string_field(6)
     default_image: str = betterproto.string_field(7)
+    multifac_wg_config: "WireguardConfig" = betterproto.message_field(8)
 
 
 @dataclass(eq=False, repr=False)
@@ -775,6 +787,7 @@ class Port(betterproto.Message):
     sriov: "Sriov" = betterproto.message_field(14)
     roles: List["LinkRole"] = betterproto.enum_field(15)
     bridge: str = betterproto.string_field(16)
+    facility: str = betterproto.string_field(17)
 
     def __post_init__(self) -> None:
         super().__post_init__()
@@ -834,6 +847,11 @@ class Cable(betterproto.Message):
     product_info: "ProductInfo" = betterproto.message_field(5)
     remote_facility: str = betterproto.string_field(6)
 
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        if self.is_set("remote_facility"):
+            warnings.warn("Cable.remote_facility is deprecated", DeprecationWarning)
+
 
 @dataclass(eq=False, repr=False)
 class End(betterproto.Message):
@@ -849,6 +867,7 @@ class Connector(betterproto.Message):
     capacity: int = betterproto.uint64_field(5)
     port: "Ref" = betterproto.message_field(6)
     breakout: "Breakout" = betterproto.message_field(7)
+    facility: str = betterproto.string_field(8)
 
 
 @dataclass(eq=False, repr=False)
@@ -874,6 +893,7 @@ class FacilityProperties(betterproto.Message):
     standard_images: List[str] = betterproto.string_field(4)
     facility_bgp_ids: List[int] = betterproto.uint32_field(5)
     xir_version: str = betterproto.string_field(6)
+    facility_local_network: str = betterproto.string_field(7)
 
 
 @dataclass(eq=False, repr=False)

{mergetbapi-1.4.2 → mergetbapi-1.5.0}/mergetbapi.egg-info/PKG-INFO

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