Addressing Review comments

Author: kumar-shivam-ranjan

ads/aqua/app.py

@@ -64,6 +64,7 @@ def __init__(self) -> None:
             set_auth("resource_principal")
         self._auth = default_signer({"service_endpoint": OCI_ODSC_SERVICE_ENDPOINT})
         self.ds_client = oc.OCIClientFactory(**self._auth).data_science
+        self.compute_client = oc.OCIClientFactory(**default_signer()).compute
         self.logging_client = oc.OCIClientFactory(**default_signer()).logging_management
         self.identity_client = oc.OCIClientFactory(**default_signer()).identity
         self.region = extract_region(self._auth)

ads/aqua/ui.py

@@ -102,11 +102,13 @@ def list_capacity_reservations(self, **kwargs) -> list:
         """
         compartment_id = kwargs.pop("compartment_id", COMPARTMENT_OCID)
         logger.info(f"Loading Capacity reservations from compartment: {compartment_id}")
-        compute_client = oc.OCIClientFactory(**default_signer()).compute
-        reservations = compute_client.list_compute_capacity_reservations(
+
+        reservations = self.compute_client.list_compute_capacity_reservations(
             compartment_id=compartment_id, **kwargs
         )
-        return reservations.data
+        return sanitize_response(
+            oci_client=self.compute_client, response=reservations.data
+        )
 
     @telemetry(entry_point="plugin=ui&action=list_compartments", name="aqua")
     def list_compartments(self) -> str:

ads/config.py

@@ -14,7 +14,7 @@
 OCI_IDENTITY_SERVICE_ENDPOINT = os.environ.get("OCI_IDENTITY_SERVICE_ENDPOINT")
 NB_SESSION_COMPARTMENT_OCID = os.environ.get("NB_SESSION_COMPARTMENT_OCID")
 PROJECT_OCID = os.environ.get("PROJECT_OCID") or os.environ.get("PIPELINE_PROJECT_OCID")
-IS_BYOR_ENABLED = os.environ.get("ALLOWLISTED_FOR_BYOR")
+IS_BYOR_ENABLED = os.environ.get("ALLOWLISTED_FOR_BYOR", False)
 NB_SESSION_OCID = os.environ.get("NB_SESSION_OCID")
 USER_OCID = os.environ.get("USER_OCID")
 OCI_RESOURCE_PRINCIPAL_VERSION = os.environ.get("OCI_RESOURCE_PRINCIPAL_VERSION")

tests/unitary/with_extras/aqua/test_data/ui/capacity_reservations_list.json

@@ -0,0 +1,15 @@
+[
+  {
+    "availability_domain": "<AD>",
+    "compartment_id": "ocid1.compartment.oc1..<OCID>",
+    "defined_tags": {},
+    "display_name": "test-reservation",
+    "freeform_tags": {},
+    "id": "ocid1.capacityreservation.oc1.iad...<OCID>",
+    "is_default_reservation": false,
+    "lifecycle_state": "ACTIVE",
+    "reserved_instance_count": 0,
+    "time_created": "2025-05-14T07:17:53.795000Z",
+    "used_instance_count": 0
+  }
+]

tests/unitary/with_extras/aqua/test_ui.py

@@ -97,6 +97,46 @@ def tearDownClass(cls):
         reload(ads.aqua)
         reload(ads.aqua.ui)
 
+    def test_list_capacity_reservations(self):
+        capacity_reservations_list = os.path.join(
+            self.curr_dir, "test_data/ui/capacity_reservations_list.json"
+        )
+        with open(capacity_reservations_list, "r") as _file:
+            capacity_reservations = json.load(_file)
+
+        self.app.compute_client.list_compute_capacity_reservations = MagicMock(
+            return_value=oci.response.Response(
+                status=200,
+                request=MagicMock(),
+                headers=MagicMock(),
+                data=[
+                    oci.core.models.ComputeCapacityReservationSummary(
+                        **capacity_reservation
+                    )
+                    for capacity_reservation in capacity_reservations
+                ],
+            )
+        )
+        results = self.app.list_capacity_reservations()
+        expected_attributes = {
+            "id",
+            "compartmentId",
+            "displayName",
+            "definedTags",
+            "freeformTags",
+            "lifecycleState",
+            "availabilityDomain",
+            "reservedInstanceCount",
+            "usedInstanceCount",
+            "isDefaultReservation",
+            "timeCreated",
+        }
+        for result in results:
+            self.assertTrue(
+                expected_attributes.issuperset(set(result)), "Attributes mismatch"
+            )
+        assert len(results) == len(capacity_reservations)
+
     def test_list_log_groups(self):
         """Test to lists all log groups for the specified compartment or tenancy"""
         log_groups_list = os.path.join(

tests/unitary/with_extras/aqua/test_ui_handler.py

@@ -50,6 +50,14 @@ def tearDownClass(cls):
         reload(ads.aqua)
         reload(ads.aqua.extension.ui_handler)
 
+    @patch("ads.aqua.ui.AquaUIApp.list_capacity_reservations")
+    def test_list_capacity_reservations(self, mock_list_reservations):
+        self.ui_handler.request.path = "aqua/capacityreservations"
+        self.ui_handler.get(id="")
+        mock_list_reservations.assert_called_with(
+            compartment_id=TestDataset.USER_COMPARTMENT_ID
+        )
+
     @patch("ads.aqua.ui.AquaUIApp.list_log_groups")
     def test_list_log_groups(self, mock_list_log_groups):
         """Test get method to fetch log groups"""