Small changes and added a verification in the scada node

Author: afmurillo

dhalsim/python2/generic_scada.py

@@ -82,33 +82,20 @@ def __init__(self, intermediate_yaml_path):
 
         # Simple data has PLC tags, without the index (T101, 1) becomes T101
         self.plc_data, self.simple_plc_data  = self.generate_plcs()
-        #self.saved_values = [['iteration', 'timestamp']]
 
         for PLC in self.intermediate_yaml['plcs']:
             if 'sensors' not in PLC:
                 PLC['sensors'] = list()
 
             if 'actuators' not in PLC:
                 PLC['actuators'] = list()
-            #self.saved_values[0].extend(PLC['sensors'])
-            #self.saved_values[0].extend(PLC['actuators'])
 
         self.update_cache_flag = False
         self.plcs_ready = False
 
-        
-        #self.previous_cache = {}
-        #for ip in self.plc_data:
-        #    self.previous_cache[ip] = [0] * len(self.plc_data[ip])
-        
-        
-        #self.cache = {}
-        #for ip in self.plc_data:
-        #    self.cache[ip] = [0] * len(self.plc_data[ip])
-        
         columns_list = ['iteration', 'timestamp']
         columns_list.extend(self.get_scada_tags())
-        # self.cache = dict.fromkeys(self.get_scada_tags())
+
 
         self.cache = pd.DataFrame(columns=columns_list)
         self.cache.loc[0] = 0
@@ -272,7 +259,6 @@ def sigint_handler(self, sig, frame):
         Shutdown protocol for the scada, writes the output before exiting.
         """
         self.stop_cache_update()
-        #self.cache_thread.join()
         self.write_output()
         self.scada_run = False
         self.logger.debug("SCADA shutdown")
@@ -285,10 +271,6 @@ def write_output(self):
         results = self.cache        
         results.to_csv(self.output_path, index=False)
 
-        #with self.output_path.open(mode='w') as output:
-        #    writer = csv.writer(output)
-        #    writer.writerows(self.saved_values)
-
     def generate_plcs(self):
         """
         Generates a list of tuples, the first part being the ip of a PLC,
@@ -341,11 +323,12 @@ def update_cache(self, lock, cache_update_time):
                 try:                
                     values = self.receive_multiple(self.plc_data[plc_ip], plc_ip)                    
                     values_float = [float(x) for x in values]
-                    with lock: 
-                        clock = int(self.get_master_clock())
-                        self.cache.loc[clock, self.simple_plc_data[plc_ip]] = values_float
-                        self.cache.loc[clock, 'iteration'] = clock
-                        self.updated_plc[plc_ip] = True
+                    if len(values_float) == len(self.simple_plc_data[plc_ip]):
+                        with lock: 
+                            clock = int(self.get_master_clock())
+                            self.cache.loc[clock, self.simple_plc_data[plc_ip]] = values_float
+                            self.cache.loc[clock, 'iteration'] = clock
+                            self.updated_plc[plc_ip] = True
                 except Exception as e:
                     self.logger.error(
                         "PLC receive_multiple with tags {tags} from {ip} failed with exception '{e}'".format(

examples/ctown_topology/dataset/dataset_anomaly_config_files/ctown_config_13.yaml

@@ -0,0 +1,10 @@
+inp_file: ctown_map.inp
+iterations: 2880
+network_topology_type: complex
+plcs: !include ctown_plcs.yaml
+simulator: epynet
+demand: pdd
+output_path: attack_output_13
+demand_patterns: events/demands_ctown_01.csv
+initial_tank_data: events/tanks_ctown_01.csv
+attacks: !include dataset_attacks/attack_13.yaml

examples/ctown_topology/dataset/dataset_normal_operating_conditions/ctown_config.yaml

@@ -9,4 +9,3 @@ network_loss_data: network_loss_data.csv
 network_delay_data: network_delay_data.csv
 simulator: epynet
 demand: pdd
-#log_level: debug