Migration of the scheduler and orchestrator packages

.gitignore

@@ -7,3 +7,6 @@ TESTS-TestSuites.xml
 .idea
 # to allow each developer customize sonarlint
 org.sonarlint.eclipse.core.prefs
+# Files created by RETORCH orch tool
+/retorch-orchestration/retorchfiles/envfiles/
+/retorch-orchestration/retorchfiles/scripts/

README.md

@@ -231,15 +231,16 @@ parameters:
 - `jenkinsFilePath`: String with the location where the `Jenkinsfile` will be created (usually the root of the project: `./`).
 
 The following code snippet shows an example of the method invocation:
+
  ```java
-import giis.retorch.orchestration.main.OrchestrationGenericToolBox;
+import giis.retorch.orchestration.generator.OrchestrationGenericToolBox;
 
 public class SutExampleRetorchMain {
 
-    public static void main(String[] args)  {
-        OrchestrationGenericToolBox toolBox = new OrchestrationGenericToolBox();
-        toolBox.generateJenkinsfile("giis.sutexample.e2e.functional.tests", "sutexample", "./");
-    }
+  public static void main(String[] args) {
+    OrchestrationGenericToolBox toolBox = new OrchestrationGenericToolBox();
+    toolBox.generateJenkinsfile("giis.sutexample.e2e.functional.tests", "sutexample", "./");
+  }
 }
 ```
 

pom.xml

@@ -41,6 +41,12 @@
 
         <mockito.version>4.11.0</mockito.version>
 
+        <commons.collections.version>4.4</commons.collections.version>
+
+        <guava-java.version>33.3.1-jre</guava-java.version>
+
+        <commons-io.version>2.18.0</commons-io.version>
+
     </properties>
 
     <modules>
@@ -78,6 +84,21 @@
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency><!-- This package allows make intersections and complementary operations between lists https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava-java.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version> <!-- Changed version that complies with Java 8, used to delete and create dirs -->
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

retorch-orchestration/pom.xml

@@ -45,6 +45,18 @@
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

retorch-orchestration/retorchfiles/configurations/AggregatorUnitTestsSystemResources.json

@@ -0,0 +1,114 @@
+{
+  "mockElasticResource": {
+    "hierarchyParent": ["elasticParent"],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelmockElasticResource",
+      "elasticity": 50,
+      "elasticityCost": 0.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "mockElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 0.2
+      },
+      {
+        "name": "processor",
+        "quantity": 0.5
+      }
+    ],
+    "dockerImage": "someplaceholder1[IMG:]docker.someImage"
+  },
+  "lightElasticResource": {
+    "hierarchyParent": ["elasticParent"],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelLightElasticResource",
+      "elasticity": 35,
+      "elasticityCost": 15.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "lightElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 3.2
+      },
+      {
+        "name": "processor",
+        "quantity": 2
+      }
+    ],
+    "dockerImage": "someplaceholder2[IMG:]docker.someImage"
+  },
+  "heavyInElasticResource": {
+    "hierarchyParent": [
+      "parentAllInelastic"
+    ],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelHeavyInElasRest",
+      "elasticity": 1,
+      "elasticityCost": 50.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "heavyInElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 8
+      },
+      {
+        "name": "processor",
+        "quantity": 1
+      }
+    ],
+    "dockerImage": "someplaceholder3[IMG:]docker.someImage"
+  },
+  "mediumElasticResource": {
+    "hierarchyParent": ["elasticParent"],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelMediumElasticResource",
+      "elasticity": 15,
+      "elasticityCost": 55.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "mediumElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 3
+      },
+      {
+        "name": "processor",
+        "quantity": 2
+      }
+    ],
+    "dockerImage": "someplaceholder4[IMG:]docker.someImage"
+  },
+  "MedInElasRest": {
+    "hierarchyParent": [],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelMedInElasRest",
+      "elasticity": 2,
+      "elasticityCost": 15.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "MedInElasRest",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 8
+      },
+      {
+        "name": "processor",
+        "quantity": 1
+      }
+    ],
+    "dockerImage": "someplaceholder5[IMG:]docker.someImage"
+  }
+}

retorch-orchestration/retorchfiles/configurations/ClassifierUnitTestsSystemResources.json

@@ -1,7 +1,7 @@
 {
   "mockElasticResource": {
-    "hierarchyParent": [],
-    "replaceable": ["lightElasticResource","heavyInElasRest"],
+    "hierarchyParent": ["elasticParent"],
+    "replaceable": ["lightElasticResource","heavyInElasticResource"],
     "elasticityModel": {
       "elasticityID": "elasModelmockElasticResource",
       "elasticity": 50,
@@ -12,16 +12,16 @@
     "minimalCapacities": [
       {
         "name": "memory",
-        "quantity": 0.5
+        "quantity": 0.2
       },
       {
         "name": "processor",
-        "quantity": 2
+        "quantity": 0.5
       }
     ],
     "dockerImage": "someplaceholder1[IMG:]docker.someImage"
   },
-  "heavyInElasRest": {
+  "heavyInElasticResource": {
     "hierarchyParent": [
       "parentAllInelastic"
     ],
@@ -32,7 +32,7 @@
       "elasticityCost": 50.0
     },
     "resourceType": "LOGICAL",
-    "resourceID": "heavyInElasRest",
+    "resourceID": "heavyInElasticResource",
     "minimalCapacities": [
       {
         "name": "memory",
@@ -46,7 +46,7 @@
     "dockerImage": "someplaceholder2[IMG:]docker.someImage"
   },
   "lightElasticResource": {
-    "hierarchyParent": [],
+    "hierarchyParent": ["elasticParent"],
     "replaceable": [],
     "elasticityModel": {
       "elasticityID": "elasModelLightElasticResource",

retorch-orchestration/retorchfiles/configurations/SyntheticIntegrationSystemResources.json

@@ -0,0 +1,129 @@
+{
+  "heavyInElasticResource": {
+    "hierarchyParent": [
+      "parentAllInelastic"
+    ],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelHeavyInElasRest",
+      "elasticity": 1,
+      "elasticityCost": 50.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "heavyInElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 4
+      },
+      {
+        "name": "processor",
+        "quantity": 0.6
+      }
+    ],
+    "dockerImage": "database-docker.someImage"
+  },
+  "lightInElasticResource": {
+    "hierarchyParent": [
+      "parentAllInelastic"
+    ],
+    "replaceable": [
+      "lightElasticResource"
+    ],
+    "elasticityModel": {
+      "elasticityID": "elasModelLightInElasticResource",
+      "elasticity": 1,
+      "elasticityCost": 50
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "lightInElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 1
+      },
+      {
+        "name": "processor",
+        "quantity": 0.5
+      }
+    ],
+    "dockerImage": "docker.someImage"
+  },
+  "mockElasticResource": {
+    "hierarchyParent": [
+      "elasticParent"
+    ],
+    "replaceable": [
+      "lightInElasticResource",
+      "lightElasticResource",
+      "mediumElasticResource",
+      "heavyInElasticResource"
+    ],
+    "elasticityModel": {
+      "elasticityID": "elasModelmockElasticResource",
+      "elasticity": 50,
+      "elasticityCost": 0.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "mockElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 0.2
+      },
+      {
+        "name": "processor",
+        "quantity": 0.5
+      }
+    ],
+    "dockerImage": "someplaceholder1[IMG:]docker.someImage"
+  },
+  "lightElasticResource": {
+    "hierarchyParent": [
+      "elasticParent"
+    ],
+    "replaceable": ["lightInElasticResource"],
+    "elasticityModel": {
+      "elasticityID": "elasModelLightElasticResource",
+      "elasticity": 35,
+      "elasticityCost": 15.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "lightElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 1
+      },
+      {
+        "name": "processor",
+        "quantity": 0.5
+      }
+    ],
+    "dockerImage": "someplaceholder2[IMG:]docker.someImage"
+  },
+  "mediumElasticResource": {
+    "hierarchyParent": [
+      "elasticParent"
+    ],
+    "replaceable": [],
+    "elasticityModel": {
+      "elasticityID": "elasModelMediumElasticResource",
+      "elasticity": 10,
+      "elasticityCost": 35.0
+    },
+    "resourceType": "LOGICAL",
+    "resourceID": "mediumElasticResource",
+    "minimalCapacities": [
+      {
+        "name": "memory",
+        "quantity": 2.5
+      },
+      {
+        "name": "processor",
+        "quantity": 2.0
+      }
+    ],
+    "dockerImage": "someplaceholder3[IMG:]docker.someImage"
+  }
+}

retorch-orchestration/retorchfiles/configurations/retorchCI.properties

@@ -0,0 +1,8 @@
+agentCIName=any
+sut-wait-html=<title>FullTeaching</title>
+sut-location=$WORKSPACE
+docker-frontend-name=https://full-teaching-
+docker-frontend-port=5000
+external-binded-port=
+external-frontend-url=
+testsBasePath=somepath/somedir/