Commit Graph

  • a08ec8844a Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment Chris McCarthy 2023-06-12 16:42:26 +01:00
  • 173e6d77a3 Merged PR 75: Fixing the functionality of resetting a node Brian Kanyora 2023-06-12 15:21:47 +00:00
  • eac17b6e16 Merged PR 75: Fixing the functionality of resetting a node Brian Kanyora 2023-06-12 15:21:47 +00:00
  • 4596687e35 Merge remote-tracking branch 'origin/dev' into feature/898-Fix-the-functionality-of-resetting-a-node Chris McCarthy 2023-06-12 14:20:16 +01:00
  • 8f86bda4d2 Merge remote-tracking branch 'origin/dev' into feature/898-Fix-the-functionality-of-resetting-a-node Chris McCarthy 2023-06-12 14:20:16 +01:00
  • 4c4f351534 #951 - Can not view and change the log level from the cli. - Fixed write transaction issue in transactions_to_file.py Chris McCarthy 2023-06-09 22:23:45 +01:00
  • 3c8a8188fb #951 - Can not view and change the log level from the cli. - Fixed write transaction issue in transactions_to_file.py Chris McCarthy 2023-06-09 22:23:45 +01:00
  • 3016f4b984 Apply suggestions from code review Christopher McCarthy 2023-06-09 20:31:12 +00:00
  • 29d1566789 Apply suggestions from code review Christopher McCarthy 2023-06-09 20:31:12 +00:00
  • ed8b53f5ef 901 - added logic to add acls to list (needs more logic adding to it) SunilSamra 2023-06-09 16:56:42 +01:00
  • c5175c500e 901 - added logic to add acls to list (needs more logic adding to it) SunilSamra 2023-06-09 16:56:42 +01:00
  • 149a534851 #915 - Annotated logs func in cli.py to take -n. - Fixed entry point on main.py - Commented out the print reward line in step func of primaite_env.py. - Added jupyterlab==3.6.1 to pyproject.toml Chris McCarthy 2023-06-09 16:44:49 +01:00
  • 605737cd5f #915 - Annotated logs func in cli.py to take -n. - Fixed entry point on main.py - Commented out the print reward line in step func of primaite_env.py. - Added jupyterlab==3.6.1 to pyproject.toml Chris McCarthy 2023-06-09 16:44:49 +01:00
  • 1a7d158d77 #915 - Force app dir creation before config file sink Chris McCarthy 2023-06-09 16:04:56 +01:00
  • 747ea9d0c6 #915 - Force app dir creation before config file sink Chris McCarthy 2023-06-09 16:04:56 +01:00
  • 86b813afa1 #915 - Synced with dev Chris McCarthy 2023-06-09 15:49:48 +01:00
  • f5e195604f #915 - Synced with dev Chris McCarthy 2023-06-09 15:49:48 +01:00
  • f7b0617dc3 901 - changed name of enum in enums.py and added class attriubutes in access_control_list.py SunilSamra 2023-06-09 15:45:13 +01:00
  • 29ba64462a 901 - changed name of enum in enums.py and added class attriubutes in access_control_list.py SunilSamra 2023-06-09 15:45:13 +01:00
  • 33127abcc3 901 - added ACL list to observations.py as its own observation space with the ACL attributes and the position of the ACL rule in the ACL list, added ImplicitFirewallRule to enums.py and added acl_implicit_rule, max_acl_list to primaite_env.py SunilSamra 2023-06-09 15:17:20 +01:00
  • afc133cbc5 901 - added ACL list to observations.py as its own observation space with the ACL attributes and the position of the ACL rule in the ACL list, added ImplicitFirewallRule to enums.py and added acl_implicit_rule, max_acl_list to primaite_env.py SunilSamra 2023-06-09 15:17:20 +01:00
  • 2fccbbd9df Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment Chris McCarthy 2023-06-09 13:41:05 +01:00
  • 0dbd89e5cb Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment Chris McCarthy 2023-06-09 13:41:05 +01:00
  • 3a5d982991 #915 - Synced with dev to bring in changes from #898 Chris McCarthy 2023-06-09 13:11:14 +01:00
  • af4e71db9b #915 - Synced with dev to bring in changes from #898 Chris McCarthy 2023-06-09 13:11:14 +01:00
  • f989deb198 901 - changed AccessControlList in access_control_list.py from a dict to a list SunilSamra 2023-06-09 11:25:45 +01:00
  • 7382ed26b3 901 - changed AccessControlList in access_control_list.py from a dict to a list SunilSamra 2023-06-09 11:25:45 +01:00
  • 495357a4bc Merged PR 69: Configurable observation space. Marek Wolan 2023-06-09 09:52:47 +00:00
  • fd3b304373 Merged PR 69: Configurable observation space. Marek Wolan 2023-06-09 09:52:47 +00:00
  • 6c2c95b329 Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment Chris McCarthy 2023-06-09 10:35:14 +01:00
  • 9b4ed1199b Merge remote-tracking branch 'origin/dev' into feature/915_PRI-31_Packaging_Deployment Chris McCarthy 2023-06-09 10:35:14 +01:00
  • ec7306ec39 Apply suggestions from code review Christopher McCarthy 2023-06-09 09:31:01 +00:00
  • 647ba2fcc1 Apply suggestions from code review Christopher McCarthy 2023-06-09 09:31:01 +00:00
  • a597cf95d7 Fix obs tests with new changes Marek Wolan 2023-06-09 10:28:24 +01:00
  • 64bf4bf58a Fix obs tests with new changes Marek Wolan 2023-06-09 10:28:24 +01:00
  • 00a30bcb7a Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-09 09:01:54 +01:00
  • b917b65d49 Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-09 09:01:54 +01:00
  • 0c962a7576 Merged PR 76: 893 - Combine NODE and ACL action spaces into single action space Sunil Samra 2023-06-09 07:28:31 +00:00
  • 6d502045cb Merged PR 76: 893 - Combine NODE and ACL action spaces into single action space Sunil Samra 2023-06-09 07:28:31 +00:00
  • 5558750f13 #915 - Refactored documentation and included APi docs, dependencies. - make files now re-build autosummary and deps file. - Added typer and platformdirs to deps in pyproject.toml. - Made root_is_pure = True in setup.py as platform/python specific wheels don't need to be built but the option is there should we need to. - Added an e2e test for primaite.main.run func. Chris McCarthy 2023-06-08 15:57:38 +01:00
  • de86c85b23 #915 - Refactored documentation and included APi docs, dependencies. - make files now re-build autosummary and deps file. - Added typer and platformdirs to deps in pyproject.toml. - Made root_is_pure = True in setup.py as platform/python specific wheels don't need to be built but the option is there should we need to. - Added an e2e test for primaite.main.run func. Chris McCarthy 2023-06-08 15:57:38 +01:00
  • 92334133c9 #915 - typer==0.9.0 added to pyproject.toml Chris McCarthy 2023-06-08 08:56:39 +01:00
  • 1809cbe1f4 #915 - typer==0.9.0 added to pyproject.toml Chris McCarthy 2023-06-08 08:56:39 +01:00
  • 58186dc958 #915 - Ensured LOG_DIR is created so primaite package can be used to perform setup while still logging using primaite logs. Chris McCarthy 2023-06-08 08:49:06 +01:00
  • 61bd70a6c9 #915 - Ensured LOG_DIR is created so primaite package can be used to perform setup while still logging using primaite logs. Chris McCarthy 2023-06-08 08:49:06 +01:00
  • bf9fcddaa3 #915 - Ensured primaite setup is carried out on devops pipelines that install primaite. Chris McCarthy 2023-06-08 08:39:00 +01:00
  • 0795a7b4f8 #915 - Ensured primaite setup is carried out on devops pipelines that install primaite. Chris McCarthy 2023-06-08 08:39:00 +01:00
  • c03dc8fd6b # 915 - Fixed issue in conftest.py where session_path and timestamp_str were not being passed to Primaite. - Also now logging all test outputs to temp directory. Chris McCarthy 2023-06-07 22:57:37 +01:00
  • 02e37e5096 # 915 - Fixed issue in conftest.py where session_path and timestamp_str were not being passed to Primaite. - Also now logging all test outputs to temp directory. Chris McCarthy 2023-06-07 22:57:37 +01:00
  • 98fc1e4c71 #915 - Created app dirs and set as constants in the top-level init. - renamed _config_values_main to training_config.py and renamed the ConfigValuesMain class to TrainingConfig. Moved training_config.py to src/primaite/config/training_config.py - Renamed all training config yaml file keys to make creating an instance of TrainingConfig easier. Moved action_type and num_steps over to the training config. - Decoupled the training config and lay down config. - Refactored main.py so that it can be ran from CLI and can take a training config path and a lay down config path. - refactored all outputs so that they save to the session dir. - Added some necessary setup scripts that handle creating app dirs, fronting example config files to the user, fronting demo notebooks to the user, performing clean-up in between installations etc. - Added functions that attempt to retrieve the file path of users example config files that have been fronted by the primaite setup. - Added logging config and a getLogger function in the top-level init. - Refactored all logs entries logged to use a logger using the primaite logging config. - Added basic typer CLI for doing things like setup, viewing logs, viewing primaite version, running a basic session. - Updated test to use new features and config structures. - Began updating docs. More to do here. Chris McCarthy 2023-06-07 22:40:16 +01:00
  • 273876873e #915 - Created app dirs and set as constants in the top-level init. - renamed _config_values_main to training_config.py and renamed the ConfigValuesMain class to TrainingConfig. Moved training_config.py to src/primaite/config/training_config.py - Renamed all training config yaml file keys to make creating an instance of TrainingConfig easier. Moved action_type and num_steps over to the training config. - Decoupled the training config and lay down config. - Refactored main.py so that it can be ran from CLI and can take a training config path and a lay down config path. - refactored all outputs so that they save to the session dir. - Added some necessary setup scripts that handle creating app dirs, fronting example config files to the user, fronting demo notebooks to the user, performing clean-up in between installations etc. - Added functions that attempt to retrieve the file path of users example config files that have been fronted by the primaite setup. - Added logging config and a getLogger function in the top-level init. - Refactored all logs entries logged to use a logger using the primaite logging config. - Added basic typer CLI for doing things like setup, viewing logs, viewing primaite version, running a basic session. - Updated test to use new features and config structures. - Began updating docs. More to do here. Chris McCarthy 2023-06-07 22:40:16 +01:00
  • 4329c65211 Apply suggestions from code review. Marek Wolan 2023-06-07 15:25:11 +01:00
  • 9417cd85ab Apply suggestions from code review. Marek Wolan 2023-06-07 15:25:11 +01:00
  • 6089fb6950 893 - removed unnecessary functions from utils.py and changed single_action_space_fixed_blue_actions_main_config.yaml back to GENERIC agentIdentifier after PR comments SunilSamra 2023-06-07 14:39:52 +01:00
  • 6f3e40e390 893 - removed unnecessary functions from utils.py and changed single_action_space_fixed_blue_actions_main_config.yaml back to GENERIC agentIdentifier after PR comments SunilSamra 2023-06-07 14:39:52 +01:00
  • 718cd8acd6 Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-07 14:39:20 +01:00
  • 89cea9289b Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-07 14:39:20 +01:00
  • f9bb97300a feature\898: Added doc strings Brian Kanyora 2023-06-07 11:09:00 +01:00
  • 038abb9be7 feature\898: Added doc strings Brian Kanyora 2023-06-07 11:09:00 +01:00
  • 281bb78612 893 - removed print statements for demonstration SunilSamra 2023-06-07 09:19:30 +01:00
  • 709fbc500e 893 - removed print statements for demonstration SunilSamra 2023-06-07 09:19:30 +01:00
  • bb98900759 Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-07 09:18:24 +01:00
  • 57b982eea3 Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-07 09:18:24 +01:00
  • a8ce699df3 Merged PR 61: Fix minor logic errors in main script Marek Wolan 2023-06-06 15:02:40 +00:00
  • ef3cef530b Merged PR 61: Fix minor logic errors in main script Marek Wolan 2023-06-06 15:02:40 +00:00
  • e17e5ac4b9 893 - added new line for assert statements SunilSamra 2023-06-06 15:54:35 +01:00
  • 6cc9516744 893 - added new line for assert statements SunilSamra 2023-06-06 15:54:35 +01:00
  • 91fb063797 Merge remote-tracking branch 'origin/dev' into bugfix/1441-main-py-minor-bugs Marek Wolan 2023-06-06 15:50:35 +01:00
  • bfd19280d5 Merge remote-tracking branch 'origin/dev' into bugfix/1441-main-py-minor-bugs Marek Wolan 2023-06-06 15:50:35 +01:00
  • 0817a4cad3 893 - added consistent action for test_reward.py SunilSamra 2023-06-06 13:49:22 +01:00
  • 2eff3912fb 893 - added consistent action for test_reward.py SunilSamra 2023-06-06 13:49:22 +01:00
  • 10585490fe 893 - SunilSamra 2023-06-06 13:47:07 +01:00
  • 69c5c9458b 893 - SunilSamra 2023-06-06 13:47:07 +01:00
  • d572c033e1 Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 13:46:01 +01:00
  • af44b99b6f Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 13:46:01 +01:00
  • a85c653feb Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-06 13:40:17 +01:00
  • c969bc32f5 Merge remote-tracking branch 'origin/dev' into feature/1468-observations-class Marek Wolan 2023-06-06 13:40:17 +01:00
  • 3c9061ff8f Merged PR 62: Make reward calculation consider red POL Marek Wolan 2023-06-06 12:27:55 +00:00
  • a987ffb745 Merged PR 62: Make reward calculation consider red POL Marek Wolan 2023-06-06 12:27:55 +00:00
  • 2e1bdf2361 893 - changed action in conftest.py back to sample of the environment action space SunilSamra 2023-06-06 13:23:08 +01:00
  • babd4eb5f8 893 - changed action in conftest.py back to sample of the environment action space SunilSamra 2023-06-06 13:23:08 +01:00
  • efd0f6ed08 893 - returned config_values in conftest to move run_generic_set_actions into test_single_action_space.py SunilSamra 2023-06-06 13:21:04 +01:00
  • d922d4d054 893 - returned config_values in conftest to move run_generic_set_actions into test_single_action_space.py SunilSamra 2023-06-06 13:21:04 +01:00
  • 7cef392f14 Merge remote-tracking branch 'origin/feature/893-node-acl-into-one-action-space' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 13:12:58 +01:00
  • 940013f9a6 Merge remote-tracking branch 'origin/feature/893-node-acl-into-one-action-space' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 13:12:58 +01:00
  • 58a87ee0c8 893 - applied changes raised during PR SunilSamra 2023-06-06 13:12:28 +01:00
  • e15c8c8c89 893 - applied changes raised during PR SunilSamra 2023-06-06 13:12:28 +01:00
  • e0ed97be36 Apply suggestions from code review Sunil Samra 2023-06-06 12:07:22 +00:00
  • dcab4b0d4a Apply suggestions from code review Sunil Samra 2023-06-06 12:07:22 +00:00
  • 5add9d620c 893 - updated the docs to reflect changes made to action space SunilSamra 2023-06-06 11:57:04 +01:00
  • 8558ca1020 893 - updated the docs to reflect changes made to action space SunilSamra 2023-06-06 11:57:04 +01:00
  • a45f0d1979 Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 11:56:52 +01:00
  • 17d036302f Merge remote-tracking branch 'origin/dev' into feature/893-node-acl-into-one-action-space SunilSamra 2023-06-06 11:56:52 +01:00
  • dc7be7d8e6 893 - set the action_space to NOTHING so test_reward.py passes and removed unnecessary test print statements SunilSamra 2023-06-06 11:10:38 +01:00
  • 49707b0a17 893 - set the action_space to NOTHING so test_reward.py passes and removed unnecessary test print statements SunilSamra 2023-06-06 11:10:38 +01:00
  • 5cfc46c4e4 feature\898: Fixed the resetting operating state to set compromised or overwhelmed services or operating system back to a good state. Added a reset count that switches the node into a good state. Created a "SHUTTING DOWN" operating state to last for a (configurable) and a "BOOTING" operating state to last for a (configurable). Created a test file to test the reset changes the node to a good state when its set to a COMPROMISED state. The last two test tests makes sure that the node boots and shutdowns correctly. Lastly, updated the docs file as well. Brian Kanyora 2023-06-06 11:03:43 +01:00
  • e52dfababc feature\898: Fixed the resetting operating state to set compromised or overwhelmed services or operating system back to a good state. Added a reset count that switches the node into a good state. Created a "SHUTTING DOWN" operating state to last for a (configurable) and a "BOOTING" operating state to last for a (configurable). Created a test file to test the reset changes the node to a good state when its set to a COMPROMISED state. The last two test tests makes sure that the node boots and shutdowns correctly. Lastly, updated the docs file as well. Brian Kanyora 2023-06-06 11:03:43 +01:00
  • 1a7d629d5a 893 - added new tests to test action space size and node is completing both sets of actions in a single episode and created new main config SunilSamra 2023-06-06 11:00:41 +01:00
  • 55f13ae654 893 - added new tests to test action space size and node is completing both sets of actions in a single episode and created new main config SunilSamra 2023-06-06 11:00:41 +01:00
  • 4dd064cab8 feature\898: Fixed the resetting operating state to set compromised or overwhelmed services or operating system back to a good state. Added a reset count that switches the node into a good state. Created a "SHUTTING DOWN" operating state to last for a (configurable) and a "BOOTING" operating state to last for a (configurable). Created a test file to test the reset changes the node to a good state when its set to a COMPROMISED state. The last two test tests makes sure that the node boots and shutdowns correctly. Lastly, updated the docs file as well. Brian Kanyora 2023-06-05 23:59:32 +01:00