Merge pull request #27554 from vespa-engine/olaa/cmr-category

Store CMR categories and forward to node reports

7 files changed, 13 insertions, 9 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainerTest.java
index a20a2e26d22..a25304ee297 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainerTest.java
@@ -36,9 +36,9 @@ public class ChangeRequestMaintainerTest {
         changeRequestMaintainer.maintain();
 
         persistedChangeRequest  = tester.curator().readChangeRequest("some-id").get();
-        assertEquals(Status.CANCELED, persistedChangeRequest.getChangeRequestSource().getStatus());
+        assertEquals(Status.CANCELED, persistedChangeRequest.getChangeRequestSource().status());
         assertEquals(ChangeRequest.Approval.APPROVED, persistedChangeRequest.getApproval());
-        assertEquals(time, persistedChangeRequest.getChangeRequestSource().getPlannedStartTime());
+        assertEquals(time, persistedChangeRequest.getChangeRequestSource().plannedStartTime());
         assertEquals(0, changeRequestClient.getApprovedChangeRequests().size());
     }
 
@@ -99,6 +99,7 @@ public class ChangeRequestMaintainerTest {
                         .url("some-url")
                         .system("some-system")
                         .status(status)
+                        .category("some-category")
                         .build())
                 .build();
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
index 39bf61df9ed..cba916df52a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
@@ -58,7 +58,7 @@ public class VcmrMaintainerTest {
     @Test
     void recycle_hosts_after_completion() {
         var vcmrReport = new VcmrReport();
-        vcmrReport.addVcmr(new ChangeRequestSource("aws", "id123", "url", ChangeRequestSource.Status.WAITING_FOR_APPROVAL , ZonedDateTime.now(), ZonedDateTime.now()));
+        vcmrReport.addVcmr(new ChangeRequestSource("aws", "id123", "url", ChangeRequestSource.Status.WAITING_FOR_APPROVAL , ZonedDateTime.now(), ZonedDateTime.now(), "N/A"));
         var parkedNode = createNode(host1, NodeType.host, Node.State.parked, true);
         var failedNode = createNode(host2, NodeType.host, Node.State.failed, false);
         var reports = vcmrReport.toNodeReports();
@@ -285,7 +285,7 @@ public class VcmrMaintainerTest {
 
 
     private VespaChangeRequest newChangeRequest(ChangeRequestSource.Status sourceStatus, State state1, State state2, ZonedDateTime startTime) {
-        var source = new ChangeRequestSource("aws", changeRequestId, "url", sourceStatus , startTime, ZonedDateTime.now());
+        var source = new ChangeRequestSource("aws", changeRequestId, "url", sourceStatus , startTime, ZonedDateTime.now(), "N/A");
         var actionPlan = List.of(
                 new HostAction(host1.value(), state1, Instant.now()),
                 new HostAction(host2.value(), state2, Instant.now())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ChangeRequestSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ChangeRequestSerializerTest.java
index 77686467336..a429e9090cc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ChangeRequestSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ChangeRequestSerializerTest.java
@@ -21,7 +21,7 @@ public class ChangeRequestSerializerTest {
 
     @Test
     void reserialization_equality() {
-        var source = new ChangeRequestSource("aws", "id321", "url", ChangeRequestSource.Status.STARTED, ZonedDateTime.now(), ZonedDateTime.now());
+        var source = new ChangeRequestSource("aws", "id321", "url", ChangeRequestSource.Status.STARTED, ZonedDateTime.now(), ZonedDateTime.now(), "Some category");
         var actionPlan = List.of(
                 new HostAction("host1", HostAction.State.RETIRING, Instant.now()),
                 new HostAction("host2", HostAction.State.RETIRED, Instant.now())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandlerTest.java
index de2bf70997a..8a915d72b25 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandlerTest.java
@@ -86,7 +86,7 @@ public class ChangeManagementApiHandlerTest extends ControllerContainerTest {
     private VespaChangeRequest createChangeRequest() {
         var instant = Instant.ofEpochMilli(9001);
         var date = ZonedDateTime.ofInstant(instant, java.time.ZoneId.of("UTC"));
-        var source = new ChangeRequestSource("aws", "id321", "url", ChangeRequestSource.Status.STARTED, date, date);
+        var source = new ChangeRequestSource("aws", "id321", "url", ChangeRequestSource.Status.STARTED, date, date, "N/A");
         var actionPlan = List.of(
                 new HostAction("host1", HostAction.State.RETIRING, instant),
                 new HostAction("host2", HostAction.State.RETIRED, instant)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/patched-vcmr.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/patched-vcmr.json
index 3db8b226b21..b05a299bc4d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/patched-vcmr.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/patched-vcmr.json
@@ -10,7 +10,8 @@
     "url": "url",
     "plannedStartTime": "1970-01-01T00:00:09.001Z[UTC]",
     "plannedEndTime": "1970-01-01T00:00:09.001Z[UTC]",
-    "status": "STARTED"
+    "status": "STARTED",
+    "category": "N/A"
   },
   "actionPlan": {
     "hosts": [
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmr.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmr.json
index 545fe289be8..531a182cad6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmr.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmr.json
@@ -10,7 +10,8 @@
     "url": "url",
     "plannedStartTime": "1970-01-01T00:00:09.001Z[UTC]",
     "plannedEndTime": "1970-01-01T00:00:09.001Z[UTC]",
-    "status": "STARTED"
+    "status": "STARTED",
+    "category": "N/A"
   },
   "actionPlan": {
     "hosts": [
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json
index 4ae079ebfb4..3a456d09bc5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json
@@ -12,7 +12,8 @@
         "url": "url",
         "plannedStartTime": "1970-01-01T00:00:09.001Z[UTC]",
         "plannedEndTime": "1970-01-01T00:00:09.001Z[UTC]",
-        "status": "STARTED"
+        "status": "STARTED",
+        "category": "N/A"
       },
       "actionPlan": {
         "hosts": [