#2888: Fix merge test failures.
This commit is contained in:
@@ -588,9 +588,9 @@ simulation:
|
||||
default_gateway: 192.168.1.1
|
||||
services:
|
||||
- type: DNSServer
|
||||
options:
|
||||
domain_mapping:
|
||||
arcd.com: 192.168.1.12 # web server
|
||||
# options:
|
||||
# domain_mapping:
|
||||
# arcd.com: 192.168.1.12 # web server
|
||||
|
||||
- type: server
|
||||
hostname: web_server
|
||||
|
||||
@@ -1380,9 +1380,9 @@ simulation:
|
||||
default_gateway: 192.168.1.1
|
||||
services:
|
||||
- type: DNSServer
|
||||
options:
|
||||
domain_mapping:
|
||||
arcd.com: 192.168.1.12 # web server
|
||||
# options:
|
||||
# domain_mapping:
|
||||
# arcd.com: 192.168.1.12 # web server
|
||||
|
||||
- hostname: web_server
|
||||
type: server
|
||||
|
||||
@@ -496,12 +496,11 @@ def test_c2_suite_yaml():
|
||||
computer_b: Computer = yaml_network.get_node_by_hostname("node_b")
|
||||
c2_beacon: C2Beacon = computer_b.software_manager.software.get("C2Beacon")
|
||||
c2_beacon.configure(
|
||||
c2_server_ip_address=c2_beacon.config.c2_server_ip_address,
|
||||
keep_alive_frequency=c2_beacon.config.keep_alive_frequency,
|
||||
masquerade_port=c2_beacon.config.masquerade_port,
|
||||
masquerade_protocol=c2_beacon.config.masquerade_protocol,
|
||||
)
|
||||
|
||||
c2_server_ip_address=c2_beacon.config.c2_server_ip_address,
|
||||
keep_alive_frequency=c2_beacon.config.keep_alive_frequency,
|
||||
masquerade_port=c2_beacon.config.masquerade_port,
|
||||
masquerade_protocol=c2_beacon.config.masquerade_protocol,
|
||||
)
|
||||
|
||||
assert c2_server.operating_state == ApplicationOperatingState.RUNNING
|
||||
|
||||
|
||||
Reference in New Issue
Block a user