diff --git a/src/main/java/io/odh/test/utils/DscUtils.java b/src/main/java/io/odh/test/utils/DscUtils.java index 44c57ccc..ed1af1b7 100644 --- a/src/main/java/io/odh/test/utils/DscUtils.java +++ b/src/main/java/io/odh/test/utils/DscUtils.java @@ -42,19 +42,19 @@ public static DSCInitialization getBasicDSCI() { .withNewSpec() .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE) .withNewMonitoring() - .withManagementState(Monitoring.ManagementState.MANAGED) + .withManagementState(Monitoring.ManagementState.Managed) .withNamespace(OdhConstants.MONITORING_NAMESPACE) .endMonitoring() .withNewServiceMesh() - .withManagementState(ServiceMesh.ManagementState.MANAGED) + .withManagementState(ServiceMesh.ManagementState.Managed) .withNewControlPlane() .withName(ServiceMeshOperator.SERVICE_MESH_NAME) .withNamespace(ServiceMeshOperator.SERVICE_MESH_NAMESPACE) - .withMetricsCollection(ControlPlane.MetricsCollection.ISTIO) + .withMetricsCollection(ControlPlane.MetricsCollection.Istio) .endControlPlane() .endServiceMesh() .withNewTrustedCABundle() - .withManagementState(TrustedCABundle.ManagementState.REMOVED) + .withManagementState(TrustedCABundle.ManagementState.Removed) .endTrustedCABundle() .endSpec() .build(); @@ -69,28 +69,28 @@ public static DataScienceCluster getBasicDSC(String dsProjectName) { .withComponents( new ComponentsBuilder() .withWorkbenches( - new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.MANAGED).build() + new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.Managed).build() ) .withDashboard( - new DashboardBuilder().withManagementState(Dashboard.ManagementState.MANAGED).build() + new DashboardBuilder().withManagementState(Dashboard.ManagementState.Managed).build() ) .withKserve( - new KserveBuilder().withManagementState(Kserve.ManagementState.MANAGED).build() + new KserveBuilder().withManagementState(Kserve.ManagementState.Managed).build() ) .withKueue( - new KueueBuilder().withManagementState(Kueue.ManagementState.MANAGED).build() + new KueueBuilder().withManagementState(Kueue.ManagementState.Managed).build() ) .withCodeflare( - new CodeflareBuilder().withManagementState(Codeflare.ManagementState.MANAGED).build() + new CodeflareBuilder().withManagementState(Codeflare.ManagementState.Managed).build() ) .withDatasciencepipelines( - new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.MANAGED).build() + new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.Managed).build() ) .withModelmeshserving( - new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.MANAGED).build() + new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.Managed).build() ) .withRay( - new RayBuilder().withManagementState(Ray.ManagementState.MANAGED).build() + new RayBuilder().withManagementState(Ray.ManagementState.Managed).build() ) .build()) .endSpec() diff --git a/src/test/java/io/odh/test/e2e/continuous/DataScienceClusterST.java b/src/test/java/io/odh/test/e2e/continuous/DataScienceClusterST.java index 118d08ab..84c02c54 100644 --- a/src/test/java/io/odh/test/e2e/continuous/DataScienceClusterST.java +++ b/src/test/java/io/odh/test/e2e/continuous/DataScienceClusterST.java @@ -55,21 +55,21 @@ void init() { void checkDataScienceClusterExists() { DataScienceCluster cluster = dataScienceProjectCli.inNamespace(OdhConstants.CONTROLLERS_NAMESPACE).withName(DS_CLUSTER_NAME).get(); - assertEquals(Kserve.ManagementState.MANAGED, cluster.getSpec().getComponents().getKserve().getManagementState()); - assertEquals(Codeflare.ManagementState.MANAGED, cluster.getSpec().getComponents().getCodeflare().getManagementState()); - assertEquals(Dashboard.ManagementState.MANAGED, cluster.getSpec().getComponents().getDashboard().getManagementState()); - assertEquals(Ray.ManagementState.MANAGED, cluster.getSpec().getComponents().getRay().getManagementState()); - assertEquals(Modelmeshserving.ManagementState.MANAGED, cluster.getSpec().getComponents().getModelmeshserving().getManagementState()); - assertEquals(Datasciencepipelines.ManagementState.MANAGED, cluster.getSpec().getComponents().getDatasciencepipelines().getManagementState()); + assertEquals(Kserve.ManagementState.Managed, cluster.getSpec().getComponents().getKserve().getManagementState()); + assertEquals(Codeflare.ManagementState.Managed, cluster.getSpec().getComponents().getCodeflare().getManagementState()); + assertEquals(Dashboard.ManagementState.Managed, cluster.getSpec().getComponents().getDashboard().getManagementState()); + assertEquals(Ray.ManagementState.Managed, cluster.getSpec().getComponents().getRay().getManagementState()); + assertEquals(Modelmeshserving.ManagementState.Managed, cluster.getSpec().getComponents().getModelmeshserving().getManagementState()); + assertEquals(Datasciencepipelines.ManagementState.Managed, cluster.getSpec().getComponents().getDatasciencepipelines().getManagementState()); if (!Environment.PRODUCT.equals(Environment.PRODUCT_ODH) && Environment.OPERATOR_INSTALL_TYPE.equalsIgnoreCase(InstallTypes.OLM.toString()) && Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv()).equals("2.7.0")) { // https://issues.redhat.com/browse/RHOAIENG-3234 Remove Kueue from RHOAI 2.7 assertNull(cluster.getSpec().getComponents().getKueue()); } else { - assertEquals(Kueue.ManagementState.MANAGED, cluster.getSpec().getComponents().getKueue().getManagementState()); + assertEquals(Kueue.ManagementState.Managed, cluster.getSpec().getComponents().getKueue().getManagementState()); } - assertEquals(Workbenches.ManagementState.MANAGED, cluster.getSpec().getComponents().getWorkbenches().getManagementState()); + assertEquals(Workbenches.ManagementState.Managed, cluster.getSpec().getComponents().getWorkbenches().getManagementState()); } @Test diff --git a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java index 250d4f89..35b44c10 100644 --- a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java +++ b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java @@ -85,20 +85,20 @@ void createDataScienceCluster() { DataScienceCluster cluster = DataScienceClusterResource.dataScienceCLusterClient().withName(DS_PROJECT_NAME).get(); - assertEquals(Kserve.ManagementState.MANAGED, cluster.getSpec().getComponents().getKserve().getManagementState()); - assertEquals(Codeflare.ManagementState.MANAGED, cluster.getSpec().getComponents().getCodeflare().getManagementState()); - assertEquals(Dashboard.ManagementState.MANAGED, cluster.getSpec().getComponents().getDashboard().getManagementState()); - assertEquals(Datasciencepipelines.ManagementState.MANAGED, cluster.getSpec().getComponents().getDatasciencepipelines().getManagementState()); - assertEquals(Workbenches.ManagementState.MANAGED, cluster.getSpec().getComponents().getWorkbenches().getManagementState()); - assertEquals(Modelmeshserving.ManagementState.MANAGED, cluster.getSpec().getComponents().getModelmeshserving().getManagementState()); - assertEquals(Ray.ManagementState.MANAGED, cluster.getSpec().getComponents().getRay().getManagementState()); + assertEquals(Kserve.ManagementState.Managed, cluster.getSpec().getComponents().getKserve().getManagementState()); + assertEquals(Codeflare.ManagementState.Managed, cluster.getSpec().getComponents().getCodeflare().getManagementState()); + assertEquals(Dashboard.ManagementState.Managed, cluster.getSpec().getComponents().getDashboard().getManagementState()); + assertEquals(Datasciencepipelines.ManagementState.Managed, cluster.getSpec().getComponents().getDatasciencepipelines().getManagementState()); + assertEquals(Workbenches.ManagementState.Managed, cluster.getSpec().getComponents().getWorkbenches().getManagementState()); + assertEquals(Modelmeshserving.ManagementState.Managed, cluster.getSpec().getComponents().getModelmeshserving().getManagementState()); + assertEquals(Ray.ManagementState.Managed, cluster.getSpec().getComponents().getRay().getManagementState()); if (!Environment.PRODUCT.equals(Environment.PRODUCT_ODH) && Environment.OPERATOR_INSTALL_TYPE.equalsIgnoreCase(InstallTypes.OLM.toString()) && Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv()).equals("2.7.0")) { // https://issues.redhat.com/browse/RHOAIENG-3234 Remove Kueue from RHOAI 2.7 assertNull(cluster.getSpec().getComponents().getKueue()); } else { - assertEquals(Kueue.ManagementState.MANAGED, cluster.getSpec().getComponents().getKueue().getManagementState()); + assertEquals(Kueue.ManagementState.Managed, cluster.getSpec().getComponents().getKueue().getManagementState()); } } } diff --git a/src/test/java/io/odh/test/e2e/standard/NotebookST.java b/src/test/java/io/odh/test/e2e/standard/NotebookST.java index 0aa752d6..547dd65a 100644 --- a/src/test/java/io/odh/test/e2e/standard/NotebookST.java +++ b/src/test/java/io/odh/test/e2e/standard/NotebookST.java @@ -142,28 +142,28 @@ void deployDataScienceCluster() { .withComponents( new ComponentsBuilder() .withWorkbenches( - new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.MANAGED).build() + new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.Managed).build() ) .withDashboard( - new DashboardBuilder().withManagementState(Dashboard.ManagementState.MANAGED).build() + new DashboardBuilder().withManagementState(Dashboard.ManagementState.Managed).build() ) .withKserve( - new KserveBuilder().withManagementState(Kserve.ManagementState.MANAGED).build() + new KserveBuilder().withManagementState(Kserve.ManagementState.Managed).build() ) .withKueue( - new KueueBuilder().withManagementState(Kueue.ManagementState.MANAGED).build() + new KueueBuilder().withManagementState(Kueue.ManagementState.Managed).build() ) .withCodeflare( - new CodeflareBuilder().withManagementState(Codeflare.ManagementState.MANAGED).build() + new CodeflareBuilder().withManagementState(Codeflare.ManagementState.Managed).build() ) .withDatasciencepipelines( - new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.MANAGED).build() + new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.Managed).build() ) .withModelmeshserving( - new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.MANAGED).build() + new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.Managed).build() ) .withRay( - new RayBuilder().withManagementState(Ray.ManagementState.MANAGED).build() + new RayBuilder().withManagementState(Ray.ManagementState.Managed).build() ) .build()) .endSpec() diff --git a/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java b/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java index df1b39f9..3a9b4d31 100644 --- a/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java +++ b/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java @@ -161,7 +161,7 @@ void testUserCanCreateRunAndDeleteADSPipelineFromDSProject() throws IOException .withEnableSamplePipeline(false) .withInjectDefaultScript(true) .withStripEOF(true) - .withTerminateStatus(ApiServer.TerminateStatus.CANCELLED) + .withTerminateStatus(ApiServer.TerminateStatus.Cancelled) .withTrackArtifacts(true) .endApiServer() .withNewDatabase() diff --git a/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java b/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java index 2077b60e..adcc68d1 100644 --- a/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java +++ b/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java @@ -109,24 +109,24 @@ void deployDataScienceCluster() { .withComponents( new ComponentsBuilder() .withWorkbenches( - new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.MANAGED).build() + new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.Managed).build() ) .withDashboard( - new DashboardBuilder().withManagementState(Dashboard.ManagementState.MANAGED).build() + new DashboardBuilder().withManagementState(Dashboard.ManagementState.Managed).build() ) .withKserve( - new KserveBuilder().withManagementState(Kserve.ManagementState.MANAGED).build() + new KserveBuilder().withManagementState(Kserve.ManagementState.Managed).build() ) .withKueue( - new KueueBuilder().withManagementState(Kueue.ManagementState.MANAGED).build() + new KueueBuilder().withManagementState(Kueue.ManagementState.Managed).build() ) .withCodeflare( - new CodeflareBuilder().withManagementState(Codeflare.ManagementState.MANAGED).build() + new CodeflareBuilder().withManagementState(Codeflare.ManagementState.Managed).build() ) // TODO(jdanek): remove devFlags prior to release, when KFPv2 is the default .withDatasciencepipelines( new DatasciencepipelinesBuilder() - .withManagementState(Datasciencepipelines.ManagementState.MANAGED) + .withManagementState(Datasciencepipelines.ManagementState.Managed) // https://github.com/opendatahub-io/data-science-pipelines-operator/blob/main/datasciencecluster/datasciencecluster.yaml .withDevFlags( new DevFlagsBuilder() @@ -144,10 +144,10 @@ void deployDataScienceCluster() { .build() ) .withModelmeshserving( - new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.MANAGED).build() + new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.Managed).build() ) .withRay( - new RayBuilder().withManagementState(Ray.ManagementState.MANAGED).build() + new RayBuilder().withManagementState(Ray.ManagementState.Managed).build() ) .build()) .endSpec() @@ -235,7 +235,7 @@ void testUserCanOperateDSv2PipelineFromDSProject() throws IOException { .withEnableSamplePipeline(false) .withInjectDefaultScript(true) .withStripEOF(true) - .withTerminateStatus(ApiServer.TerminateStatus.CANCELLED) + .withTerminateStatus(ApiServer.TerminateStatus.Cancelled) .withTrackArtifacts(true) .endApiServer() .withNewDatabase() diff --git a/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java b/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java index acee52cc..b5e7e5bf 100644 --- a/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java +++ b/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java @@ -58,28 +58,28 @@ protected void deployDsc(String name) { .withComponents( new ComponentsBuilder() .withWorkbenches( - new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.MANAGED).build() + new WorkbenchesBuilder().withManagementState(Workbenches.ManagementState.Managed).build() ) .withDashboard( - new DashboardBuilder().withManagementState(Dashboard.ManagementState.MANAGED).build() + new DashboardBuilder().withManagementState(Dashboard.ManagementState.Managed).build() ) .withKserve( - new KserveBuilder().withManagementState(Kserve.ManagementState.REMOVED).build() + new KserveBuilder().withManagementState(Kserve.ManagementState.Removed).build() ) .withKueue( - new KueueBuilder().withManagementState(Kueue.ManagementState.MANAGED).build() + new KueueBuilder().withManagementState(Kueue.ManagementState.Managed).build() ) .withCodeflare( - new CodeflareBuilder().withManagementState(Codeflare.ManagementState.MANAGED).build() + new CodeflareBuilder().withManagementState(Codeflare.ManagementState.Managed).build() ) .withDatasciencepipelines( - new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.MANAGED).build() + new DatasciencepipelinesBuilder().withManagementState(Datasciencepipelines.ManagementState.Managed).build() ) .withModelmeshserving( - new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.MANAGED).build() + new ModelmeshservingBuilder().withManagementState(Modelmeshserving.ManagementState.Managed).build() ) .withRay( - new RayBuilder().withManagementState(Ray.ManagementState.MANAGED).build() + new RayBuilder().withManagementState(Ray.ManagementState.Managed).build() ) .build()) .endSpec() diff --git a/src/test/java/io/odh/test/unit/UnitTests.java b/src/test/java/io/odh/test/unit/UnitTests.java index 70520001..5ac3938d 100644 --- a/src/test/java/io/odh/test/unit/UnitTests.java +++ b/src/test/java/io/odh/test/unit/UnitTests.java @@ -58,13 +58,13 @@ void testCreateDSCInitialization() { .withApplicationsNamespace("opendatahub") .withNewMonitoring() .withNamespace("monitoring") - .withManagementState(Monitoring.ManagementState.MANAGED) + .withManagementState(Monitoring.ManagementState.Managed) .endMonitoring() .withNewServiceMesh() .withNewControlPlane() .withNamespace("istio") .withName("istio") - .withMetricsCollection(ControlPlane.MetricsCollection.ISTIO) + .withMetricsCollection(ControlPlane.MetricsCollection.Istio) .endControlPlane() .endServiceMesh() .endSpec() @@ -92,19 +92,19 @@ void testCreateDeleteDataScienceCluster() { .withNewSpec() .withNewComponents() .withNewCodeflare() - .withManagementState(Codeflare.ManagementState.MANAGED) + .withManagementState(Codeflare.ManagementState.Managed) .endCodeflare() .withNewDashboard() - .withManagementState(Dashboard.ManagementState.MANAGED) + .withManagementState(Dashboard.ManagementState.Managed) .endDashboard() .withNewKserve() - .withManagementState(Kserve.ManagementState.REMOVED) + .withManagementState(Kserve.ManagementState.Removed) .endKserve() .withNewWorkbenches() - .withManagementState(Workbenches.ManagementState.MANAGED) + .withManagementState(Workbenches.ManagementState.Managed) .endWorkbenches() .withNewDatasciencepipelines() - .withManagementState(Datasciencepipelines.ManagementState.MANAGED) + .withManagementState(Datasciencepipelines.ManagementState.Managed) .withNewDevFlags() .withManifests(new ManifestsBuilder().withUri("https://kornys.com").build()) .endDatasciencepipelinesDevFlags() @@ -116,7 +116,7 @@ void testCreateDeleteDataScienceCluster() { dsClient.resource(cluster).create(); DataScienceCluster returned = dsClient.withName(cluster.getMetadata().getName()).get(); - assertEquals(Codeflare.ManagementState.MANAGED, returned.getSpec().getComponents().getCodeflare().getManagementState()); + assertEquals(Codeflare.ManagementState.Managed, returned.getSpec().getComponents().getCodeflare().getManagementState()); dsClient.withName(cluster.getMetadata().getName()).delete();