Fixed the path to the attacks virtual environment.

Preparing DHALSIM release 0.3.0. Only missing aspect is proper integration with Davide's epynet


Former-commit-id: 3fc359b

Author: afmurillo

ICS_topologies/enhanced_ctown_topology/automatic_plant.py

@@ -50,11 +50,13 @@ def start_simulation(self):
         wntr_environment_path = home_path + str("/wntr-experiments/bin/python")
         print "Launching simulation for week index: " + str(sys.argv[2])
 
-        #cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2]
-        cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2]
-        #argv[3] is the attack repository path
+        cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2]
+        #cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2]
         if len(sys.argv) >= 4:
-            cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2] + \
+            #cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2] + \
+            #             " " + sys.argv[3]
+
+            cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2] + \
                          " " + sys.argv[3]
 
         cmd = shlex.split(cmd_string)

ICS_topologies/enhanced_ctown_topology/automatic_run.py

@@ -199,7 +199,7 @@ def automatic_start(self):
             plc_number = str(self.attack_options['source_plc'])[-1]
             print("Attacker is node: " + 'attacker_' + str(plc_number))
             attacker = net.get('attacker_' + str(plc_number))
-            cmd_string = "../../../attack-experiments/env/bin/python ../../attack_repository/mitm_plc/mitm_attack.py 192.168.1.1 192.168.1.254 "\
+            cmd_string = "../../../attack-experiments/bin/python ../../attack_repository/mitm_plc/mitm_attack.py 192.168.1.1 192.168.1.254 "\
                          + str(self.attack_options['name']) + " "\
                          + str(self.attack_options['values'][0])
             mitm_cmd = shlex.split(cmd_string)
@@ -287,10 +287,6 @@ def finish(self):
             self.end_process(self.simulation)
             print "Physical Simulation process terminated"
 
-        # toDo: This method is not working
-        #self.parse_pcap_files()
-        #self.merge_pcap_files()
-
         # moves all the results to a folder named week_<week_index>
         self.move_output_files(self.week_index)
 

ICS_topologies/wadi_topology/automatic_run.py

@@ -137,7 +137,7 @@ def automatic_start(self):
             plc_number = str(self.attack_options['source_plc'])[-1]
             print("Attacker is node: " + 'attacker_1')
             attacker = net.get('attacker_1')
-            cmd_string = "../../../attack-experiments/env/bin/python ../../attack_repository/mitm_plc/wadi_mitm_attack.py 192.168.1.20 192.168.1.10 "\
+            cmd_string = "../../../attack-experiments/bin/python ../../attack_repository/mitm_plc/wadi_mitm_attack.py 192.168.1.20 192.168.1.10 "\
                          + str(self.attack_options['name']) + " "\
                          + str(self.attack_options['values'][0])
             mitm_cmd = shlex.split(cmd_string)