Implement basic random topology

tests/pubsub/test_random_topology.py

@@ -198,39 +198,31 @@ async def perform_test_from_obj(obj):
 #     }
 #     await perform_test_from_obj(test_obj)
 
-def generate_random_topology(num_nodes, topic_density, num_topics, max_nodes_per_topic, max_msgs_per_topic):
+def generate_random_topology(num_nodes, density, num_topics, max_nodes_per_topic, max_msgs_per_topic):
-    nodes = range(num_nodes)
+    nodes = [str(i).zfill(2) for i in range(0,num_nodes)]
     
-    # Create a separate graph for each topic
+    # 1) Generate random graph structure
-    topic_graphs = {}
-    for topic in range(num_topics):
-        # TODO: Pick random num of nodes to be in topic (at least 1)
-        num_nodes_in_topic = max_nodes_per_topic
-        nodes_in_topic = random.sample(nodes, num_nodes_in_topic)
-        print("***Nodes in topic***")
-        print(num_nodes_in_topic)
-        print(nodes_in_topic)
 
     # Create initial graph by connecting each node to its previous node
     # This ensures the graph is connected
     graph = {}
 
-        graph[nodes_in_topic[0]] = []
+    graph[nodes[0]] = []
 
-        max_num_edges = num_nodes_in_topic * (num_nodes_in_topic - 1) / 2
+    max_num_edges = num_nodes * (num_nodes - 1) / 2
-        num_edges = 1
+    num_edges = 0
 
-        for i in range(1, len(nodes_in_topic)):
+    for i in range(1, len(nodes)):
-            prev = nodes_in_topic[i - 1]
+        prev = nodes[i - 1]
-            curr = nodes_in_topic[i]
+        curr = nodes[i]
 
         graph[curr] = [prev]
         graph[prev].append(curr)
         num_edges += 1
 
-        # Add random edges until topic density is hit
+    # Add random edges until density is hit
-        while num_edges / max_num_edges < topic_density:
+    while num_edges / max_num_edges < density:
-            selected_nodes = random.sample(nodes_in_topic, 2)
+        selected_nodes = random.sample(nodes, 2)
 
         # Only add the nodes as neighbors if they are not already neighbors
         if selected_nodes[0] not in graph[selected_nodes[1]]:
@@ -238,36 +230,60 @@ def generate_random_topology(num_nodes, topic_density, num_topics, max_nodes_per
             graph[selected_nodes[1]].append(selected_nodes[0])
             num_edges += 1
 
-        topic_graphs[topic] = graph
+    # 2) Pick num_topics random nodes to perform random walks at 
-        print(graph)
+    nodes_to_start_topics_from = random.sample(nodes, num_topics)
 
-    # Generate network graph from union of topic graphs
+    nodes_in_topic_list = []
-    network_graph = {}
+    for node in nodes_to_start_topics_from:
+        nodes_walked = []
+        curr = node
+        nodes_walked.append(curr)
 
-    for topic in topic_graphs:
+        # TODO: Pick random num of nodes per topic
-        graph = topic_graphs[topic]
+        while len(nodes_walked) < max_nodes_per_topic:
-        for node in graph:
+            # Pick a random neighbor of curr to walk to
-            # Add node if not in network graph
+            neighbors = graph[curr]
-            if node not in network_graph:
+            rand_num = random.randint(0, len(neighbors) - 1)
-                network_graph[node] = []
+            neighbor = neighbors[rand_num]
-            for neighbor in graph[node]:
+            curr = neighbor
-                # Add neighbor if not in network graph
+            if curr not in nodes_walked:
-                if neighbor not in network_graph:
+                nodes_walked.append(curr)
-                    network_graph[neighbor] = []
 
-                # Add edge if not in network graph
+        nodes_in_topic_list.append(nodes_walked)
-                if neighbor not in network_graph[node]:
-                    network_graph[node].append(neighbor)
-                    network_graph[neighbor].append(node)
 
-def test_simple_random():
+    # 3) Start creating test_obj
+    test_obj = {"supported_protocols": ["/floodsub/1.0.0"]}
+    test_obj["adj_list"] = graph
+    test_obj["topic_map"] = {}
+    for i in range(len(nodes_in_topic_list)):
+        test_obj["topic_map"][str(i)] = nodes_in_topic_list[i]
+
+    # 4) Finish creating test_obj by adding messages at random start nodes in each topic
+    test_obj["messages"] = []
+    for i in range(len(nodes_in_topic_list)):
+        nodes_in_topic = nodes_in_topic_list[i]
+        rand_num = random.randint(0, len(nodes_in_topic) - 1)
+        start_node = nodes_in_topic[rand_num]
+        test_obj["messages"].append({
+                "topics": [str(i)],
+                "data": str(random.randint(0, 1000)),
+                "node_id": str(start_node)
+            })
+
+    # 5) Return completed test_obj
+    return test_obj
+
+@pytest.mark.asyncio
+async def test_simple_random():
     num_nodes = 4
-    topic_density = 0.5
+    topic_density = 1
     num_topics = 2
     max_nodes_per_topic = 4
     max_msgs_per_topic = 1
-    topology = generate_random_topology(num_nodes, topic_density, num_topics,\
+    topology_test_obj = generate_random_topology(num_nodes, topic_density, num_topics,\
         max_nodes_per_topic, max_msgs_per_topic)
-    print("TOPOLOGY")
+    print(topology_test_obj)
-    print(topology)
+    await perform_test_from_obj(topology_test_obj)
+    # print("TOPOLOGY")
+    # print(topology)