#2913: Changes to update test_sticky_rewards.py

This commit is contained in:
Nick Todd
2024-11-07 13:08:44 +00:00
parent 9d6536fa6a
commit e0b885cc79
2 changed files with 28 additions and 9 deletions

View File

@@ -211,7 +211,7 @@ class WebServer404Penalty(AbstractReward, identifier="WEB_SERVER_404_PENALTY"):
return 1.0 if status == 200 else -1.0 if status == 404 else 0.0 return 1.0 if status == 200 else -1.0 if status == 404 else 0.0
self.reward = sum(map(status2rew, codes)) / len(codes) # convert form HTTP codes to rewards and average self.reward = sum(map(status2rew, codes)) / len(codes) # convert form HTTP codes to rewards and average
elif not self.sticky: # there are no codes, but reward is not sticky, set reward to 0 elif not self.config.sticky: # there are no codes, but reward is not sticky, set reward to 0
self.reward = 0.0 self.reward = 0.0
else: # skip calculating if sticky and no new codes. instead, reuse last step's value else: # skip calculating if sticky and no new codes. instead, reuse last step's value
pass pass
@@ -278,7 +278,7 @@ class WebpageUnavailablePenalty(AbstractReward, identifier="WEBPAGE_UNAVAILABLE_
elif web_browser_state is NOT_PRESENT_IN_STATE or not web_browser_state["history"]: elif web_browser_state is NOT_PRESENT_IN_STATE or not web_browser_state["history"]:
_LOGGER.debug( _LOGGER.debug(
"Web browser reward could not be calculated because the web browser history on node", "Web browser reward could not be calculated because the web browser history on node",
f"{self.node_hostname} was not reported in the simulation state. Returning 0.0", f"{self.config.node_hostname} was not reported in the simulation state. Returning 0.0",
) )
self.reward = 0.0 self.reward = 0.0
else: else:

View File

@@ -11,7 +11,12 @@ from primaite.interface.request import RequestResponse
class TestWebServer404PenaltySticky: class TestWebServer404PenaltySticky:
def test_non_sticky(self): def test_non_sticky(self):
reward = WebServer404Penalty(node_hostname="computer", service_name="WebService", sticky=False) schema = WebServer404Penalty.ConfigSchema(
node_hostname="computer",
service_name="WebService",
sticky=False,
)
reward = WebServer404Penalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
codes = [] codes = []
@@ -38,7 +43,12 @@ class TestWebServer404PenaltySticky:
assert reward.calculate(state, last_action_response) == -1.0 assert reward.calculate(state, last_action_response) == -1.0
def test_sticky(self): def test_sticky(self):
reward = WebServer404Penalty(node_hostname="computer", service_name="WebService", sticky=True) schema = WebServer404Penalty.ConfigSchema(
node_hostname="computer",
service_name="WebService",
sticky=True,
)
reward = WebServer404Penalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
codes = [] codes = []
@@ -67,7 +77,8 @@ class TestWebServer404PenaltySticky:
class TestWebpageUnavailabilitySticky: class TestWebpageUnavailabilitySticky:
def test_non_sticky(self): def test_non_sticky(self):
reward = WebpageUnavailablePenalty(node_hostname="computer", sticky=False) schema = WebpageUnavailablePenalty.ConfigSchema(node_hostname="computer", sticky=False)
reward = WebpageUnavailablePenalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
action, params, request = "DO_NOTHING", {}, ["DONOTHING"] action, params, request = "DO_NOTHING", {}, ["DONOTHING"]
@@ -127,7 +138,8 @@ class TestWebpageUnavailabilitySticky:
assert reward.calculate(state, last_action_response) == -1.0 assert reward.calculate(state, last_action_response) == -1.0
def test_sticky(self): def test_sticky(self):
reward = WebpageUnavailablePenalty(node_hostname="computer", sticky=True) schema = WebpageUnavailablePenalty.ConfigSchema(node_hostname="computer", sticky=True)
reward = WebpageUnavailablePenalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
action, params, request = "DO_NOTHING", {}, ["DONOTHING"] action, params, request = "DO_NOTHING", {}, ["DONOTHING"]
@@ -188,7 +200,11 @@ class TestWebpageUnavailabilitySticky:
class TestGreenAdminDatabaseUnreachableSticky: class TestGreenAdminDatabaseUnreachableSticky:
def test_non_sticky(self): def test_non_sticky(self):
reward = GreenAdminDatabaseUnreachablePenalty(node_hostname="computer", sticky=False) schema = GreenAdminDatabaseUnreachablePenalty.ConfigSchema(
node_hostname="computer",
sticky=False,
)
reward = GreenAdminDatabaseUnreachablePenalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
action, params, request = "DO_NOTHING", {}, ["DONOTHING"] action, params, request = "DO_NOTHING", {}, ["DONOTHING"]
@@ -214,7 +230,6 @@ class TestGreenAdminDatabaseUnreachableSticky:
# agent did nothing, because reward is not sticky, it goes back to 0 # agent did nothing, because reward is not sticky, it goes back to 0
action, params, request = "DO_NOTHING", {}, ["DONOTHING"] action, params, request = "DO_NOTHING", {}, ["DONOTHING"]
response = RequestResponse(status="success", data={}) response = RequestResponse(status="success", data={})
browser_history = []
state = {"network": {"nodes": {"computer": {"applications": {"DatabaseClient": {}}}}}} state = {"network": {"nodes": {"computer": {"applications": {"DatabaseClient": {}}}}}}
last_action_response = AgentHistoryItem( last_action_response = AgentHistoryItem(
timestep=0, action=action, parameters=params, request=request, response=response timestep=0, action=action, parameters=params, request=request, response=response
@@ -244,7 +259,11 @@ class TestGreenAdminDatabaseUnreachableSticky:
assert reward.calculate(state, last_action_response) == -1.0 assert reward.calculate(state, last_action_response) == -1.0
def test_sticky(self): def test_sticky(self):
reward = GreenAdminDatabaseUnreachablePenalty(node_hostname="computer", sticky=True) schema = GreenAdminDatabaseUnreachablePenalty.ConfigSchema(
node_hostname="computer",
sticky=True,
)
reward = GreenAdminDatabaseUnreachablePenalty(config=schema)
# no response codes yet, reward is 0 # no response codes yet, reward is 0
action, params, request = "DO_NOTHING", {}, ["DONOTHING"] action, params, request = "DO_NOTHING", {}, ["DONOTHING"]