Merge remote-tracking branch 'origin/dev' into feature/2319-database-admin

src/primaite/config/_package_data/example_config.yaml

@@ -634,8 +634,8 @@ simulation:
     nodes:
 
     - ref: router_1
-      type: router
       hostname: router_1
+      type: router
       num_ports: 5
       ports:
         1:
@@ -670,18 +670,18 @@ simulation:
           protocol: ICMP
 
     - ref: switch_1
-      type: switch
       hostname: switch_1
+      type: switch
       num_ports: 8
 
     - ref: switch_2
-      type: switch
       hostname: switch_2
+      type: switch
       num_ports: 8
 
     - ref: domain_controller
-      type: server
       hostname: domain_controller
+      type: server
       ip_address: 192.168.1.10
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
@@ -693,8 +693,8 @@ simulation:
             arcd.com: 192.168.1.12 # web server
 
     - ref: web_server
-      type: server
       hostname: web_server
+      type: server
       ip_address: 192.168.1.12
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
@@ -710,8 +710,8 @@ simulation:
 
 
     - ref: database_server
-      type: server
       hostname: database_server
+      type: server
       ip_address: 192.168.1.14
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
@@ -725,8 +725,8 @@ simulation:
         type: FTPClient
 
     - ref: backup_server
-      type: server
       hostname: backup_server
+      type: server
       ip_address: 192.168.1.16
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
@@ -736,8 +736,8 @@ simulation:
         type: FTPServer
 
     - ref: security_suite
-      type: server
       hostname: security_suite
+      type: server
       ip_address: 192.168.1.110
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.1.1
@@ -748,8 +748,8 @@ simulation:
           subnet_mask: 255.255.255.0
 
     - ref: client_1
-      type: computer
       hostname: client_1
+      type: computer
       ip_address: 192.168.10.21
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.10.1
@@ -775,8 +775,8 @@ simulation:
         type: DNSClient
 
     - ref: client_2
-      type: computer
       hostname: client_2
+      type: computer
       ip_address: 192.168.10.22
       subnet_mask: 255.255.255.0
       default_gateway: 192.168.10.1