Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/src/bootstrap/Constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ class EnvLayer(EnumBackport):
# Package / Patch State Ordering Constants
# This ordering ensures that the most important information is preserved in the case of patch object truncation
PackageClassificationOrderInStatusReporting = {
PackageClassification.SECURITY: 1,
PackageClassification.CRITICAL: 2,
PackageClassification.CRITICAL: 1,
PackageClassification.SECURITY: 2,
PackageClassification.OTHER: 3,
PackageClassification.UNCLASSIFIED: 4
}
Expand Down
30 changes: 17 additions & 13 deletions src/core/tests/Test_StatusHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,14 @@ def test_sort_packages_by_classification_and_state(self):
with self.runtime.env_layer.file_system.open("../../extension/tests/helpers/PatchOrderAssessmentSummary.json", 'r') as file_handle:
assessment_patches = json.load(file_handle)["patches"]
assessment_patches_sorted = self.runtime.status_handler.sort_packages_by_classification_and_state(assessment_patches)
print('what is assessment_patches', assessment_patches_sorted)
# + Classifications | Patch State +
# |--------------------|-------------|
self.assertEqual(assessment_patches_sorted[0]["name"], "test-package-3") # | Other, Security | |
self.assertEqual(assessment_patches_sorted[0]["name"], "test-package-1") # | Critical | |
self.assertEqual(assessment_patches_sorted[1]["name"], "test-package-4") # | Security, Critical | |
self.assertEqual(assessment_patches_sorted[2]["name"], "test-package-7") # | Security | |
self.assertEqual(assessment_patches_sorted[3]["name"], "test-package-1") # | Critical | |
self.assertEqual(assessment_patches_sorted[4]["name"], "test-package-5") # | Critical, Other | |
self.assertEqual(assessment_patches_sorted[2]["name"], "test-package-5") # | Critical, Other | |
self.assertEqual(assessment_patches_sorted[3]["name"], "test-package-3") # | Other, Security | |
self.assertEqual(assessment_patches_sorted[4]["name"], "test-package-7") # | Security | |
self.assertEqual(assessment_patches_sorted[5]["name"], "test-package-2") # | Other | |
self.assertEqual(assessment_patches_sorted[6]["name"], "test-package-6") # | Unclassified | |

Expand All @@ -377,15 +378,18 @@ def test_sort_packages_by_classification_and_state(self):
installation_patches_sorted = self.runtime.status_handler.sort_packages_by_classification_and_state(installation_patches)
# + Classifications | Patch State +
# |--------------------|-------------|
self.assertEqual(installation_patches_sorted[0]["name"], "test-package-6") # | Security | Failed |
self.assertEqual(installation_patches_sorted[1]["name"], "test-package-12") # | Critical, Security | Failed |
self.assertEqual(installation_patches_sorted[2]["name"], "test-package-11") # | Security | Installed |
self.assertEqual(installation_patches_sorted[3]["name"], "test-package-10") # | Security | Available |
self.assertEqual(installation_patches_sorted[4]["name"], "test-package-9") # | Security | Pending |
self.assertEqual(installation_patches_sorted[5]["name"], "test-package-8") # | Security, Critical | Excluded |
self.assertEqual(installation_patches_sorted[6]["name"], "test-package-7") # | Security | NotSelected |
self.assertEqual(installation_patches_sorted[7]["name"], "test-package-14") # | Critical | Installed |
self.assertEqual(installation_patches_sorted[8]["name"], "test-package-13") # | Critical | Available |
self.assertEqual(installation_patches_sorted[0]["name"], "test-package-12") # | Critical, Security | Failed |
self.assertEqual(installation_patches_sorted[1]["name"], "test-package-14") # | Critical | Installed |
self.assertEqual(installation_patches_sorted[2]["name"], "test-package-13") # | Critical | Available |
self.assertEqual(installation_patches_sorted[3]["name"], "test-package-8") # | Security, Critical | Excluded |

self.assertEqual(installation_patches_sorted[4]["name"], "test-package-6") # | Security | Failed |
self.assertEqual(installation_patches_sorted[5]["name"], "test-package-11") # | Security | Installed |
self.assertEqual(installation_patches_sorted[6]["name"], "test-package-10") # | Security | Available |
self.assertEqual(installation_patches_sorted[7]["name"], "test-package-9") # | Security | Pending |
self.assertEqual(installation_patches_sorted[8]["name"], "test-package-7") # | Security | NotSelected |


self.assertEqual(installation_patches_sorted[9]["name"], "test-package-5") # | Other | Installed |
self.assertEqual(installation_patches_sorted[10]["name"], "test-package-4") # | Other | Available |
self.assertEqual(installation_patches_sorted[11]["name"], "test-package-3") # | Other | Pending |
Expand Down