Replace OS SEM manager dependency with internal provisioning manager

Signed-off-by: Eamonn Mansour <[email protected]>
galasa-dev · Sep 20, 2024 · cca7272 · cca7272
1 parent f3e6095
commit cca7272
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 23 deletions.
diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle
@@ -36,11 +36,11 @@ dependencies {
     implementation 'org.assertj:assertj-core'
 
     implementation 'dev.galasa:dev.galasa.galasaecosystem.manager'
-    implementation 'dev.galasa:dev.galasa.sem.manager'
     implementation 'dev.galasa:dev.galasa.cicsts.manager'
     implementation 'dev.galasa:dev.galasa.sdv.manager'
     implementation 'dev.galasa:dev.galasa.zosprogram.manager'
 
+    implementation 'com.ibm.cics.managers:com.ibm.cics.provisioning.manager:0.0.4'
     implementation 'com.google.code.gson:gson:2.10.1'
 }
 

diff --git a/...inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java b/...inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.ceci.local;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Tags;
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"ceciManager","localecosystem","java11","ubuntu"})
 @Tags({"codecoverage"})

diff --git a/.../java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java b/.../java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.ceci.local.isolated;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"ceciManager","localecosystem","java11","ubuntu","isolated"})
 public class CECILocalJava11UbuntuIsolated extends AbstractCECILocal {

diff --git a/...s/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java b/...s/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.ceci.local.mvp;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
 import dev.galasa.galasaecosystem.ILocalEcosystem;
@@ -17,11 +19,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 // @Test
 @TestAreas({"ceciManager","localecosystem","java11","ubuntu","mvp"})
 public class CECILocalJava11UbuntuMvp extends AbstractCECILocal {

diff --git a/...inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java b/...inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.ceda.local;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Tags;
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cedaManager","localecosystem","java11","ubuntu"})
 @Tags({"codecoverage"})

diff --git a/.../java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java b/.../java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.ceda.local.isolated;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cedaManager","localecosystem","java11","ubuntu","isolated"})
 public class CEDALocalJava11UbuntuIsolated extends AbstractCEDALocal {

diff --git a/...inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java b/...inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.cemt.local;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Tags;
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cemtManager","localecosystem","java11","ubuntu"})
 @Tags({"codecoverage"})

diff --git a/.../java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java b/.../java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.cemt.local.isolated;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cemtManager","localecosystem","java11","ubuntu","isolated"})
 public class CEMTLocalJava11UbuntuIsolated extends AbstractCEMTLocal {

diff --git a/...ests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java b/...ests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.cicsts.local;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Tags;
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cicstsManager","localecosystem","java11","ubuntu"})
 @Tags({"codecoverage"})

diff --git a/...a/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java b/...a/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.cicsts.local.isolated;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"cicstsManager","localecosystem","java11","ubuntu","isolated"})
 public class CICSTSLocalJava11UbuntuIsolated extends AbstractCICSTSLocal {

diff --git a/...l.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java b/...l.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.sdv.local;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Tags;
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"sdvManager","localecosystem","java11","ubuntu"})
 @Tags({"codecoverage"})

diff --git a/...in/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java b/...in/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java
@@ -5,6 +5,8 @@
  */
 package dev.galasa.internal.inttests.sdv.local.isolated;
 
+import com.ibm.cics.provisioning.annotations.Topology;
+
 import dev.galasa.Test;
 import dev.galasa.TestAreas;
 import dev.galasa.galasaecosystem.IGenericEcosystem;
@@ -18,11 +20,10 @@
 import dev.galasa.linux.ILinuxImage;
 import dev.galasa.linux.LinuxImage;
 import dev.galasa.linux.OperatingSystem;
-import dev.galasa.sem.SemTopology;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
 
-@SemTopology
+@Topology
 @Test
 @TestAreas({"sdvManager","localecosystem","java11","ubuntu","isolated"})
 public class SDVLocalJava11UbuntuIsolated extends AbstractSDVLocal {