Merge pull request #592 from pinheadmz/selfnodes

add podname-indexed dict "self.tanks" to Commander

resources/scenarios/commander.py

@@ -9,6 +9,7 @@
 import sys
 import tempfile
 from pathlib import Path
+from typing import Dict
 
 from test_framework.authproxy import AuthServiceProxy
 from test_framework.p2p import NetworkThread
@@ -80,6 +81,9 @@ def setup(self):
         ch.setFormatter(formatter)
         self.log.addHandler(ch)
 
+        # Keep a separate index of tanks by pod name
+        self.tanks: Dict[str, TestNode] = {}
+
         for i, tank in enumerate(WARNET):
             self.log.info(
                 f"Adding TestNode #{i} from pod {tank['tank']} with IP {tank['rpc_host']}"
@@ -106,6 +110,7 @@ def setup(self):
             node.rpc_connected = True
             node.init_peers = tank["init_peers"]
             self.nodes.append(node)
+            self.tanks[tank["tank"]] = node
 
         self.num_nodes = len(self.nodes)
 

test/data/scenario_connect_dag.py

@@ -56,16 +56,16 @@ def run_test(self):
         self.connect_nodes(6, 7)
         self.sync_all()
 
-        zero_peers = self.nodes[0].getpeerinfo()
-        one_peers = self.nodes[1].getpeerinfo()
-        two_peers = self.nodes[2].getpeerinfo()
-        three_peers = self.nodes[3].getpeerinfo()
-        four_peers = self.nodes[4].getpeerinfo()
-        five_peers = self.nodes[5].getpeerinfo()
-        six_peers = self.nodes[6].getpeerinfo()
-        seven_peers = self.nodes[7].getpeerinfo()
-        eight_peers = self.nodes[8].getpeerinfo()
-        nine_peers = self.nodes[9].getpeerinfo()
+        zero_peers = self.tanks["tank-0000"].getpeerinfo()
+        one_peers = self.tanks["tank-0001"].getpeerinfo()
+        two_peers = self.tanks["tank-0002"].getpeerinfo()
+        three_peers = self.tanks["tank-0003"].getpeerinfo()
+        four_peers = self.tanks["tank-0004"].getpeerinfo()
+        five_peers = self.tanks["tank-0005"].getpeerinfo()
+        six_peers = self.tanks["tank-0006"].getpeerinfo()
+        seven_peers = self.tanks["tank-0007"].getpeerinfo()
+        eight_peers = self.tanks["tank-0008"].getpeerinfo()
+        nine_peers = self.tanks["tank-0009"].getpeerinfo()
 
         for node in self.nodes:
             self.log.info(f"Node {node.index}: tank={node.tank} ip={node.rpchost}")

test/data/scenario_p2p_interface.py

@@ -34,7 +34,7 @@ def run_test(self):
         self.log.info("Adding the p2p connection")
 
         p2p_block_store = self.nodes[0].add_p2p_connection(
-            P2PStoreBlock(), dstaddr=self.nodes[0].rpchost, dstport=18444
+            P2PStoreBlock(), dstaddr=self.tanks["tank-0000"].rpchost, dstport=18444
         )
 
         self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages")