diff --git a/pkg/monitor/cluster/maintenance.go b/pkg/monitor/cluster/maintenance.go index 1e3731ffd70..31d93086e44 100644 --- a/pkg/monitor/cluster/maintenance.go +++ b/pkg/monitor/cluster/maintenance.go @@ -48,10 +48,10 @@ func (p pucmState) String() string { } const ( - pucmNone pucmState = "none" - pucmPending pucmState = "pending" - pucmPlannedOngoing pucmState = "planned_ongoing" - pucmUnplannedOngoing pucmState = "unplanned_ongoing" + pucmNone pucmState = "none" + pucmPending pucmState = "pending" + pucmPlanned pucmState = "planned" + pucmUnplanned pucmState = "unplanned" ) func (mon *Monitor) emitPucmState(ctx context.Context) error { @@ -66,9 +66,9 @@ func (mon *Monitor) emitPucmState(ctx context.Context) error { func getPucmState(clusterProperties api.OpenShiftClusterProperties) pucmState { if pucmOngoing(clusterProperties) { if clusterProperties.PucmPending { - return pucmPlannedOngoing + return pucmPlanned } - return pucmUnplannedOngoing + return pucmUnplanned } else if clusterProperties.PucmPending { return pucmPending } diff --git a/pkg/monitor/cluster/maintenance_test.go b/pkg/monitor/cluster/maintenance_test.go index b91f8af9c23..d9f79ee1fe9 100644 --- a/pkg/monitor/cluster/maintenance_test.go +++ b/pkg/monitor/cluster/maintenance_test.go @@ -33,28 +33,28 @@ func TestEmitPucmState(t *testing.T) { expectedPucmState: pucmPending, }, { - name: "state unplanned ongoing - admin updating in flight and no admin update error", + name: "state unplanned - admin updating in flight and no admin update error", provisioningState: api.ProvisioningStateAdminUpdating, - expectedPucmState: pucmUnplannedOngoing, + expectedPucmState: pucmUnplanned, }, { - name: "state planned ongoing - admin updating in flight and no admin update error", + name: "state planned - admin updating in flight and no admin update error", provisioningState: api.ProvisioningStateAdminUpdating, pucmPending: true, - expectedPucmState: pucmPlannedOngoing, + expectedPucmState: pucmPlanned, }, { - name: "state unplanned ongoing - not admin updating but admin update error", + name: "state unplanned - not admin updating but admin update error", provisioningState: api.ProvisioningStateFailed, adminUpdateErr: "PUCM failed", - expectedPucmState: pucmUnplannedOngoing, + expectedPucmState: pucmUnplanned, }, { - name: "state planned ongoing - not admin updating but admin update error", + name: "state planned - not admin updating but admin update error", provisioningState: api.ProvisioningStateFailed, pucmPending: true, adminUpdateErr: "PUCM failed", - expectedPucmState: pucmPlannedOngoing, + expectedPucmState: pucmPlanned, }, } { t.Run(tt.name, func(t *testing.T) {