experiments: use congestion control algorithm enum for ns3 nodes

experiments/pyexps/e2e_cc.py

@@ -69,7 +69,6 @@ for congestion_control in types_of_congestion_control:
             queue_size = int(bdp * 2**k_val)
 
             options = {
-                'ns3::TcpL4Protocol::SocketType': congestion_control.ns3,
                 'ns3::TcpSocket::SegmentSize': f'{mtu-52}',
                 'ns3::TcpSocket::SndBufSize': '524288',
                 'ns3::TcpSocket::RcvBufSize': '524288',
@@ -91,6 +90,7 @@ for congestion_control in types_of_congestion_control:
                 host.data_rate = f'{link_rate}Mbps'
                 host.ip = f'192.168.64.{i}/24'
                 host.queue_size = f'{queue_size}B'
+                host.congestion_control = congestion_control
                 app = e2e.E2EPacketSinkApplication('sink')
                 app.local_ip = '0.0.0.0:5000'
                 app.stop_time = '20s'
@@ -107,6 +107,7 @@ for congestion_control in types_of_congestion_control:
                 host.data_rate = f'{link_rate}Mbps'
                 host.ip = f'192.168.64.{i+num_ns3_hosts+num_simbricks_hosts}/24'
                 host.queue_size = f'{queue_size}B'
+                host.congestion_control = congestion_control
                 app = e2e.E2EBulkSendApplication('sender')
                 app.remote_ip = f'192.168.64.{i}:5000'
                 app.stop_time = '20s'

experiments/pyexps/e2e_split.py

@@ -68,7 +68,6 @@ for congestion_control in types_of_congestion_control:
             queue_size = int(bdp * 2**k_val)
 
             options = {
-                'ns3::TcpL4Protocol::SocketType': congestion_control.ns3,
                 'ns3::TcpSocket::SegmentSize': f'{mtu-52}',
                 'ns3::TcpSocket::SndBufSize': '524288',
                 'ns3::TcpSocket::RcvBufSize': '524288',
@@ -110,6 +109,7 @@ for congestion_control in types_of_congestion_control:
                 host.data_rate = f'{link_rate}Mbps'
                 host.ip = f'192.168.64.{i}/24'
                 host.queue_size = f'{queue_size}B'
+                host.congestion_control = congestion_control
                 app = e2e.E2EPacketSinkApplication('sink')
                 app.local_ip = '0.0.0.0:5000'
                 app.stop_time = '20s'
@@ -126,6 +126,7 @@ for congestion_control in types_of_congestion_control:
                 host.data_rate = f'{link_rate}Mbps'
                 host.ip = f'192.168.64.{i+num_ns3_hosts+num_simbricks_hosts}/24'
                 host.queue_size = f'{queue_size}B'
+                host.congestion_control = congestion_control
                 app = e2e.E2EBulkSendApplication('sender')
                 app.remote_ip = f'192.168.64.{i}:5000'
                 app.stop_time = '20s'

experiments/simbricks/orchestration/e2e_components.py

@@ -286,16 +286,19 @@ class E2ESimpleNs3Host(E2EHost):
         self.data_rate = ""
         self.queue_size = ""
         self.delay = ""
-        # todo change this to an enum
-        self.congestion_control = ""
+        self.congestion_control: CongestionControl = None
         self.ip = ""
 
     def ns3_config(self) -> str:
+        if self.congestion_control is None:
+            cc = ""
+        else:
+            cc = self.congestion_control.ns3
         self.mapping.update({
             "DataRate": self.data_rate,
             "QueueSize": self.queue_size,
             "Delay": self.delay,
-            "CongestionControl": self.congestion_control,
+            "CongestionControl": cc,
             "Ip": self.ip,
         })
         return super().ns3_config()