p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BB: Avoid race condition when importing config and credentials

This commit is contained in:
Ilija Lazoroski 2022-07-27 16:58:46 +02:00
parent 9ad96cbf14
commit fdf73821f4
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
View File

@ -34,18 +34,35 @@ class MonkeyIslandClient(object):
@avoid_race_condition @avoid_race_condition
def import_config(self, test_configuration: TestConfiguration): def import_config(self, test_configuration: TestConfiguration):
self.requests.post_json( self._import_config(test_configuration)
self._import_credentials(test_configuration.propagation_credentials)
@avoid_race_condition
def _import_config(self, test_configuration: TestConfiguration):
response = self.requests.post_json(
"api/agent-configuration", "api/agent-configuration",
json=AgentConfiguration.to_mapping(test_configuration.agent_configuration), json=AgentConfiguration.to_mapping(test_configuration.agent_configuration),
) )
if response.ok:
LOGGER.info("Configuration is imported.")
else:
LOGGER.error(f"Failed to import config: {response}")
assert False
@avoid_race_condition
def _import_credentials(self, propagation_credentials: Credentials):
serialized_propagation_credentials = [ serialized_propagation_credentials = [
Credentials.to_mapping(credentials) Credentials.to_mapping(credentials) for credentials in propagation_credentials
for credentials in test_configuration.propagation_credentials
] ]
self.requests.post_json( response = self.requests.post_json(
"/api/propagation-credentials/configured-credentials", "/api/propagation-credentials/configured-credentials",
json=serialized_propagation_credentials, json=serialized_propagation_credentials,
) )
if response.ok:
LOGGER.info("Credentials are imported.")
else:
LOGGER.error(f"Failed to import credentials: {response}")
assert False
@avoid_race_condition @avoid_race_condition
def run_monkey_local(self): def run_monkey_local(self):