Fix on the yamlinclude library error

Author: afmurillo

dhalsim/parser/config_parser.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 import yaml
-from yamlinclude import YamlIncludeConstructor
+import yaml_include
 from schema import Schema, Or, And, Use, Optional, SchemaError, Regex
 
 from dhalsim.parser.input_parser import InputParser
@@ -626,8 +626,12 @@ def __init__(self, config_path: Path):
 
         self.config_path = config_path.absolute()
 
-        YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader,
-                                                   base_dir=config_path.absolute().parent)
+        #YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader,
+        #                                           base_dir=config_path.absolute().parent)
+
+        yaml.add_constructor("!include", 
+                             yaml_include.Constructor(base_dir=config_path.absolute().parent), 
+                             yaml.FullLoader)
 
         try:
             self.data = self.apply_schema(self.config_path)

examples/ctown_topology/ctown_config.yaml

@@ -1,13 +1,12 @@
 inp_file: ctown_map.inp
 iterations: 2880
-#iterations: 70
 network_topology_type: complex
 plcs: !include ctown_plcs.yaml
 
 log_level: debug
 simulator: epynet
 demand: pdd
-attacks: !include ctown_unconstrained_blackbox_concealment_mitm.yaml
+#attacks: !include ctown_unconstrained_blackbox_concealment_mitm.yaml
 #attacks: !include ctown_concealment_mitm_value.yaml
 #attacks: !include ctown_payload_replay_conceal.yaml
 #ma attacks: !include ctown_network_replay_conceal.yaml