Merge remote-tracking branch 'origin/dev' into 4.0.0-dev

tests/assets/configs/basic_switched_network.yaml

@@ -25,7 +25,19 @@ game:
   - ICMP
   - TCP
   - UDP
-
+  thresholds:
+    nmne:
+      high: 100
+      medium: 25
+      low: 5
+    file_access:
+      high: 10
+      medium: 5
+      low: 2
+    app_executions:
+      high: 5
+      medium: 3
+      low: 2
 agents:
   - ref: client_2_green_user
     team: GREEN
@@ -64,10 +76,16 @@ agents:
             options:
               hosts:
                 - hostname: client_1
+                  applications:
+                    - application_name: WebBrowser
+                  folders:
+                    - folder_name: root
+                      files:
+                        - file_name: "test.txt"
                 - hostname: client_2
                 - hostname: client_3
               num_services: 1
-              num_applications: 0
+              num_applications: 1
               num_folders: 1
               num_files: 1
               num_nics: 2
@@ -182,6 +200,10 @@ simulation:
         options:
           ntp_server_ip: 192.168.1.10
       - type: ntp-server
+      folders:
+        - folder_name: root
+          files:
+          - file_name: test.txt
     - hostname: client_2
       type: computer
       ip_address: 192.168.10.22