oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1355 - Renamed the NodeType custom type in custom_typing.py as it clased with the NodeType enum in enums.py

Browse Source
This commit is contained in:
Chris McCarthy
2023-05-26 09:43:37 +01:00
parent 6245ad9298
commit 05ebd15053
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/primaite/pol/green_pol.py
View File

@@ -5,7 +5,7 @@ from typing import Dict, Union
from networkx import MultiGraph, shortest_path
from primaite.acl.access_control_list import AccessControlList
from primaite.common.custom_typing import NodeType
from primaite.common.custom_typing import NodeUnion
from primaite.common.enums import HardwareState, NodePOLType, NodeType, SoftwareState
from primaite.links.link import Link
from primaite.nodes.active_node import ActiveNode
@@ -19,7 +19,7 @@ _VERBOSE = False
def apply_iers(
network: MultiGraph,
nodes: Dict[str, NodeType],
nodes: Dict[str, NodeUnion],
links: Dict[str, Link],
iers: Dict[str, IER],
acl: AccessControlList,
@@ -230,7 +230,7 @@ def apply_iers(
def apply_node_pol(
nodes: Dict[str, NodeType],
nodes: Dict[str, NodeUnion],
node_pol: Dict[any, Union[NodeStateInstructionGreen, NodeStateInstructionRed]],
step: int,
):

8
src/primaite/pol/red_agent_pol.py
View File

@@ -5,7 +5,7 @@ from typing import Dict
from networkx import MultiGraph, shortest_path
from primaite.acl.access_control_list import AccessControlList
from primaite.common.custom_typing import NodeType
from primaite.common.custom_typing import NodeUnion
from primaite.common.enums import (
HardwareState,
NodePOLInitiator,
@@ -24,7 +24,7 @@ _VERBOSE = False
def apply_red_agent_iers(
network: MultiGraph,
nodes: Dict[str, NodeType],
nodes: Dict[str, NodeUnion],
links: Dict[str, Link],
iers: Dict[str, IER],
acl: AccessControlList,
@@ -221,7 +221,7 @@ def apply_red_agent_iers(
def apply_red_agent_node_pol(
nodes: NodeType,
nodes: Dict[str, NodeUnion],
iers: Dict[str, IER],
node_pol: Dict[str, NodeStateInstructionRed],
step: int,
@@ -256,7 +256,7 @@ def apply_red_agent_node_pol(
if step >= start_step and step <= stop_step:
# continue --------------------------
target_node: NodeType = nodes[target_node_id]
target_node: NodeUnion = nodes[target_node_id]
# Based the action taken on the initiator type
if initiator == NodePOLInitiator.DIRECT: