Merge pull request #24 from afmurillo/dev-paper

Pump speed working now

Author: afmurillo

dhalsim/python2/automatic_router.py

@@ -0,0 +1,87 @@
+import argparse
+import os
+import signal
+import subprocess
+import sys
+from pathlib import Path
+
+from automatic_node import NodeControl
+from py2_logger import get_logger
+
+empty_loc = '/dev/null'
+
+
+class RouterControl(NodeControl):
+    """
+    This class is started for a router. It starts a tcpdump process.
+    """
+
+    def __init__(self, intermediate_yaml, router_name):
+        super(RouterControl, self).__init__(intermediate_yaml)
+
+        self.output_path = Path(self.data["output_path"])
+        self.logger = get_logger(self.data['log_level'])
+        self.process_tcp_dump = None
+        self.router_name = router_name
+        self.interface_name = router_name + '-eth0'
+
+    def terminate(self):
+        """
+        This function stops the tcp dump and the plc process.
+        """
+
+        self.process_tcp_dump.send_signal(signal.SIGINT)
+        self.process_tcp_dump.wait()
+        if self.process_tcp_dump.poll() is None:
+            self.process_tcp_dump.terminate()
+        if self.process_tcp_dump.poll() is None:
+            self.process_tcp_dump.kill()
+
+        self.logger.debug("Stopping Router tcpdump process.")
+
+
+    def main(self):
+        """
+        This function starts the tcp dump and plc process and then waits for the plc
+        process to finish.
+        """
+        self.process_tcp_dump = self.start_tcpdump_capture()
+
+        while self.process_tcp_dump.poll() is None:
+            pass
+        self.terminate()
+
+    def start_tcpdump_capture(self):
+        """
+        Start a tcp dump.
+        """
+        pcap = self.output_path / (self.interface_name + '.pcap')
+
+        # Output is not printed to console
+        no_output = open(empty_loc, 'w')
+        tcp_dump = subprocess.Popen(['tcpdump', '-i', self.interface_name, '-w',
+                                     str(pcap)], shell=False, stderr=no_output, stdout=no_output)
+        return tcp_dump
+
+
+def is_valid_file(parser_instance, arg):
+    """
+    Verifies whether the intermediate yaml path is valid.
+    """
+    if not os.path.exists(arg):
+        parser_instance.error(arg + " does not exist.")
+    else:
+        return arg
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Start everything for a plc')
+    parser.add_argument(dest="intermediate_yaml",
+                        help="intermediate yaml file", metavar="FILE",
+                        type=lambda x: is_valid_file(parser, x))
+    parser.add_argument(dest="index", help="Index of PLC in intermediate yaml", type=int,
+                        metavar="N")
+
+    args = parser.parse_args()
+    router_control = RouterControl(Path(args.intermediate_yaml))
+    router_control.main()

dhalsim/python2/topo/complex_topo.py

@@ -2,6 +2,9 @@
 from mininet.node import Node
 from mininet.net import Mininet
 import yaml
+from pathlib import Path
+import sys
+import signal
 
 
 class Error(Exception):
@@ -27,6 +30,31 @@ def config(self, **params):
     def terminate(self):
         self.cmd('sysctl net.ipv4.ip_forward=0')
 
+        for router_process in self.router_processes:
+            if router_process.poll() is None:
+                try:
+                    self.end_process(router_process)
+                except Exception as msg:
+                    self.logger.error("Exception shutting down router: " + str(msg))
+
+
+    @staticmethod
+    def end_process(process):
+        """
+        End a process.
+
+        :param process: the process to end
+        """
+        process.terminate()
+
+        if process.poll() is None:
+            process.send_signal(signal.SIGINT)
+            process.wait()
+        if process.poll() is None:
+            process.terminate()
+        if process.poll() is None:
+            process.kill()
+
 
 class ComplexTopo(Topo):
     """
@@ -64,6 +92,8 @@ def __init__(self, intermediate_yaml_path):
         # Initialize mininet topology
         Topo.__init__(self)
 
+        self.router_processes = []
+
     @staticmethod
     def check_amount_of_nodes(data):
         """
@@ -280,13 +310,6 @@ def setup_network_for_node(self, net, node_data, provider_router):
         # Add provider router as default gateway to the plcs gateway router
         gateway.cmd('route add default gw {ip}'.format(ip=node_data['provider_ip']))
 
-        # TODO what do these do? they are not necessary yet
-        # gateway.cmd(
-        #     'iptables -A FORWARD -o {name}-eth1 -i {name}-eth0 -s {ip} -m conntrack --ctstate NEW -j ACCEPT'.format(
-        #         name=node_data['gateway_name'], ip=node_data['local_ip']))
-        # gateway.cmd(
-        #     'iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT')
-
         # Masquerade the from ip when forwarding a request from a plc to the provider
         gateway.cmd('iptables -t nat -F POSTROUTING')
         gateway.cmd('iptables -t nat -A POSTROUTING -o {name}-eth0  -j MASQUERADE'.format(
@@ -298,3 +321,7 @@ def setup_network_for_node(self, net, node_data, provider_router):
                 ip=node_data['local_ip']))
         gateway.cmd('iptables -A FORWARD -p tcp -d {ip} --dport {port} -j ACCEPT'.format(
             ip=node_data['local_ip'], port=self.cpppo_port))
+
+        automatic_router_path = Path(__file__).parent.absolute() / "automatic_router.py"
+        cmd = ["python2", str(automatic_router_path), str(self.intermediate_yaml), node_data['gateway_name']]
+        self.router_processes.append(node.popen(cmd, stderr=sys.stderr, stdout=sys.stdout))

examples/anytown_topology/anytown_config.yaml

@@ -4,7 +4,7 @@ iterations: 30
 network_topology_type: complex
 plcs: !include anytown_plcs.yaml
 
-simulator: wntr
+simulator: epynet
 demand: pdd
 demand_patterns: demands_anytown_small.csv
-attacks !include anytown_mitm.yaml
+#attacks !include anytown_mitm.yaml

examples/ctown_topology/ctown_map.inp

@@ -1116,13 +1116,13 @@ LINK          PU7 CLOSED IF NODE          T4            ABOVE          4.5
 
 ; ----------- T5 ---
 LINK          PU8 OPEN IF   NODE          T5            BELOW          1.5
-LINK          PU8 CLOSED IF NODE          T5            ABOVE          4.5
+LINK          PU8 CLOSED IF NODE          T5            ABOVE          4.0
 
 ; ----------- T7 ---
-LINK          PU10 OPEN IF  NODE          T7            BELOW          2.5
+LINK          PU10 OPEN IF  NODE          T7            BELOW          1.5
 LINK          PU10 CLOSED IF NODE         T7            ABOVE          4.8
 
-LINK          PU11 OPEN IF  NODE          T7            BELOW          1
+LINK          PU11 OPEN IF  NODE          T7            BELOW          0.5
 LINK          PU11 CLOSED IF NODE         T7            ABOVE          3