remove reverse connection in integration tests

emelialei88 · emelialei88 · commit 5118ddf7b647 · 2025-06-18T11:20:24.000-04:00
Signed-off-by: Emelia Lei &lt;wlei29@bloomberg.net&gt;
diff --git a/src/groups/mqb/mqbcfg/mqbcfg.xsd b/src/groups/mqb/mqbcfg/mqbcfg.xsd
@@ -335,25 +335,16 @@
         myClusters.................:
             definition of the clusters the current machine is part of (if any);
             empty means this broker does not belong to any cluster
-        myReverseClusters..........:
-            name of the clusters (if any) the current machine is expected to
-            receive inbound connections about and therefore should pro-actively
-            create a proxy cluster at startup
         myVirtualClusters..........:
             information about all the virtual clusters the current machine is
             considered to belong to (if any)
         clusters...................: array of cluster definition
-        reversedClusterConnections.:
-            cluster and associated remote connections that should be
-            established
       </documentation>
     </annotation>
     <sequence>
       <element name='myClusters'                 type='tns:ClusterDefinition'         maxOccurs='unbounded'/>
-      <element name='myReverseClusters'          type='string'                        maxOccurs='unbounded'/>
       <element name='myVirtualClusters'          type='tns:VirtualClusterInformation' maxOccurs='unbounded'/>
       <element name='proxyClusters'              type='tns:ClusterProxyDefinition'    maxOccurs='unbounded'/>
-      <element name='reversedClusterConnections' type='tns:ReversedClusterConnection' maxOccurs='unbounded'/>
     </sequence>
   </complexType>
 
@@ -830,19 +821,4 @@
     </sequence>
   </complexType>
 
-  <complexType name='ReversedClusterConnection'>
-    <annotation>
-      <documentation>
-        Type representing the configuration for remote cluster connections..
-
-        name.............: name of the cluster
-        connections......: list of connections to establish
-      </documentation>
-    </annotation>
-    <sequence>
-      <element name='name'        type='string'/>
-      <element name='connections' type='tns:ClusterNodeConnection' maxOccurs='unbounded'/>
-    </sequence>
-  </complexType>
-
 </schema>
diff --git a/src/python/blazingmq/dev/configurator/__init__.py b/src/python/blazingmq/dev/configurator/__init__.py
@@ -66,7 +66,7 @@ class Broker:
     id: int
     config: mqbcfg.Configuration
     clusters: mqbcfg.ClustersDefinition = field(
-        default_factory=lambda: mqbcfg.ClustersDefinition([], [], [], [], [])
+        default_factory=lambda: mqbcfg.ClustersDefinition([], [], [])
     )
     domains: Dict[str, "Domain"] = field(default_factory=dict)
     proxy_clusters: Set[str] = field(default_factory=set)
@@ -126,7 +126,7 @@ def add_proxy_definition(self, cluster: "AbstractCluster"):
             )
         )
 
-    def proxy(self, target: Union[Domain, "AbstractCluster"], reverse: bool = False):
+    def proxy(self, target: Union[Domain, "AbstractCluster"]):
         domains = [target] if isinstance(target, Domain) else target.domains.values()
         for domain in domains:
             cluster = domain.cluster
@@ -137,57 +137,6 @@ def proxy(self, target: Union[Domain, "AbstractCluster"], reverse: bool = False)
             if cluster.name not in self.proxy_clusters:
                 self.add_proxy_definition(cluster)
 
-            if not reverse:
-                continue
-
-            if cluster.name in self.clusters.my_reverse_clusters:
-                continue
-
-            self.clusters.my_reverse_clusters.append(cluster.name)
-            reverse_cluster = self.configurator.clusters[cluster.name]
-
-            for node in reverse_cluster.nodes.values():
-                if reverse_cluster.name not in node.proxy_clusters:
-                    node.add_proxy_definition(reverse_cluster)
-
-                reversed_cluster_connections_found = False
-                if node.clusters.reversed_cluster_connections is None:
-                    node.clusters.reversed_cluster_connections = []
-                else:
-                    for (
-                        reversed_cluster_connections
-                    ) in node.clusters.reversed_cluster_connections:
-                        if reversed_cluster_connections.name == reverse_cluster.name:
-                            reversed_cluster_connections_found = True
-                            break
-
-                if not reversed_cluster_connections_found:
-                    reversed_cluster_connections = mqbcfg.ReversedClusterConnection(
-                        reverse_cluster.name, []
-                    )
-                    node.clusters.reversed_cluster_connections.append(
-                        reversed_cluster_connections
-                    )
-
-                if self.listeners:
-                    for listener in self.listeners:
-                        print(listener)
-                        reversed_cluster_connections.connections.append(
-                            mqbcfg.ClusterNodeConnection(
-                                mqbcfg.TcpClusterNodeConnection(
-                                    f"tcp://{self.host}:{listener.port}"
-                                )
-                            )
-                        )
-                else:
-                    reversed_cluster_connections.connections.append(
-                        mqbcfg.ClusterNodeConnection(
-                            mqbcfg.TcpClusterNodeConnection(
-                                f"tcp://{self.host}:{self.port}"
-                            )
-                        )
-                    )
-
         return self
 
 
diff --git a/src/python/blazingmq/dev/it/fixtures.py b/src/python/blazingmq/dev/it/fixtures.py
@@ -511,10 +511,6 @@ class ForwardProxyConnection(ProxyConnection):
     suffix = ""
 
 
-class ReverseProxyConnection:
-    suffix = "_rev"
-
-
 WorkspaceConfigurator = Callable[..., None]
 
 
@@ -587,7 +583,6 @@ def multi_node_cluster_config(
     configurator: cfg.Configurator,
     port_allocator: Iterator[int],
     mode: Mode,
-    reverse_proxy: bool = False,
 ) -> None:
     mode.tweak(configurator.proto.cluster)
 
@@ -613,7 +608,7 @@ def multi_node_cluster_config(
             tcp_host="localhost",
             tcp_port=next(port_allocator),
             data_center=data_center,
-        ).proxy(cluster, reverse=reverse_proxy)
+        ).proxy(cluster)
 
 
 multi_node_cluster_params = [
@@ -645,7 +640,6 @@ def multi_interface_cluster_config(
     port_allocator: Iterator[int],
     mode: Mode,
     listener_count: int,
-    reverse_proxy: bool = False,
 ) -> None:
     """A factory for cluster configurations containing multiple open TCP interfaces.
 
@@ -662,8 +656,6 @@ def multi_interface_cluster_config(
         mode: The cluster operation mode
         listener_count: The number of listeners that should be opened on a broker. The
             minimum number of listeners is 1.
-        reverse_proxy: If True, configure reverse proxy brokers for the cluster.
-            Otherwise, configure regular proxies for the cluster.
     """
     mode.tweak(configurator.proto.cluster)
 
@@ -699,7 +691,7 @@ def multi_interface_cluster_config(
                 (f"listener{i}", next(port_allocator)) for i in range(listener_count)
             ],
             data_center=data_center,
-        ).proxy(cluster, reverse=reverse_proxy)
+        ).proxy(cluster)
 
 
 multi_interface_cluster_params = [
@@ -739,7 +731,6 @@ def virtual_cluster_config(
     configurator: cfg.Configurator,
     port_allocator: Iterator[int],
     mode: Mode,
-    reverse_proxy: bool = False,
 ) -> None:
     mode.tweak(configurator.proto.cluster)
 
@@ -778,7 +769,7 @@ def virtual_cluster_config(
             tcp_host="localhost",
             tcp_port=next(port_allocator),
             data_center=data_center,
-        ).proxy(cluster, reverse=reverse_proxy)
+        ).proxy(cluster)
 
 
 virtual_cluster_params = [
@@ -813,14 +804,13 @@ def cluster_config(request, config):
 ###############################################################################
 # cluster fixture for all the combinations of three setups:
 #    - connect via a virtual cluster
-#    - cluster reverse connects to proxies
 #    - use CSL mode
 
 
 cartesian_product_cluster_params = [
     pytest.param(
-        functools.partial(config, mode=mode, reverse_proxy=rp_suffix != ""),
-        id=f"{topology}{mode.suffix}{rp_suffix}",
+        functools.partial(config, mode=mode),
+        id=f"{topology}{mode.suffix}",
         marks=[
             pytest.mark.integrationtest,
             pytest.mark.pr_integrationtest,
@@ -833,7 +823,6 @@ def cluster_config(request, config):
         ("virtual", virtual_cluster_config),
     )
     for mode in Mode.__members__.values()
-    for rp_suffix in ("", "_rp")
 ]
 
 
diff --git a/src/python/blazingmq/schemas/mqbcfg.py b/src/python/blazingmq/schemas/mqbcfg.py
@@ -1563,32 +1563,6 @@ class NetworkInterfaces:
     )
 
 
-@dataclass
-class ReversedClusterConnection:
-    """Type representing the configuration for remote cluster connections..
-
-    name.............: name of the cluster
-    connections......: list of connections to establish
-    """
-
-    name: Optional[str] = field(
-        default=None,
-        metadata={
-            "type": "Element",
-            "namespace": "http://bloomberg.com/schemas/mqbcfg",
-            "required": True,
-        },
-    )
-    connections: List[ClusterNodeConnection] = field(
-        default_factory=list,
-        metadata={
-            "type": "Element",
-            "namespace": "http://bloomberg.com/schemas/mqbcfg",
-            "min_occurs": 1,
-        },
-    )
-
-
 @dataclass
 class StatPluginConfig:
     name: str = field(
@@ -2087,17 +2061,10 @@ class ClustersDefinition:
     myClusters.................:
     definition of the clusters the current machine is part of (if any);
     empty means this broker does not belong to any cluster
-    myReverseClusters..........:
-    name of the clusters (if any) the current machine is expected to
-    receive inbound connections about and therefore should pro-actively
-    create a proxy cluster at startup
     myVirtualClusters..........:
     information about all the virtual clusters the current machine is
     considered to belong to (if any)
     clusters...................: array of cluster definition
-    reversedClusterConnections.:
-    cluster and associated remote connections that should be
-    established
     """
 
     my_clusters: List[ClusterDefinition] = field(
@@ -2109,15 +2076,6 @@ class ClustersDefinition:
             "min_occurs": 1,
         },
     )
-    my_reverse_clusters: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "myReverseClusters",
-            "type": "Element",
-            "namespace": "http://bloomberg.com/schemas/mqbcfg",
-            "min_occurs": 1,
-        },
-    )
     my_virtual_clusters: List[VirtualClusterInformation] = field(
         default_factory=list,
         metadata={
@@ -2136,15 +2094,6 @@ class ClustersDefinition:
             "min_occurs": 1,
         },
     )
-    reversed_cluster_connections: List[ReversedClusterConnection] = field(
-        default_factory=list,
-        metadata={
-            "name": "reversedClusterConnections",
-            "type": "Element",
-            "namespace": "http://bloomberg.com/schemas/mqbcfg",
-            "min_occurs": 1,
-        },
-    )
 
 
 @dataclass
