Skip to content

Commit 7851186

Browse files
augustocristianaugustocristian
committed
Improving more the code
1 parent d21a456 commit 7851186

14 files changed

+146
-307
lines changed

‎retorch-orchestration/outputTestIntegration

-125
This file was deleted.

‎retorch-orchestration/retorchfiles/configurations/AggregatorUnitTestsSystemResources.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mockElasticResource": {
3-
"hierarchyParent": [],
3+
"hierarchyParent": ["elasticParent"],
44
"replaceable": [],
55
"elasticityModel": {
66
"elasticityID": "elasModelmockElasticResource",
@@ -22,7 +22,7 @@
2222
"dockerImage": "someplaceholder1[IMG:]docker.someImage"
2323
},
2424
"lightElasticResource": {
25-
"hierarchyParent": [],
25+
"hierarchyParent": ["elasticParent"],
2626
"replaceable": [],
2727
"elasticityModel": {
2828
"elasticityID": "elasModelLightElasticResource",
@@ -43,7 +43,7 @@
4343
],
4444
"dockerImage": "someplaceholder2[IMG:]docker.someImage"
4545
},
46-
"heavyInElasRest": {
46+
"heavyInElasticResource": {
4747
"hierarchyParent": [
4848
"parentAllInelastic"
4949
],
@@ -54,7 +54,7 @@
5454
"elasticityCost": 50.0
5555
},
5656
"resourceType": "LOGICAL",
57-
"resourceID": "heavyInElasRest",
57+
"resourceID": "heavyInElasticResource",
5858
"minimalCapacities": [
5959
{
6060
"name": "memory",
@@ -68,7 +68,7 @@
6868
"dockerImage": "someplaceholder3[IMG:]docker.someImage"
6969
},
7070
"mediumElasticResource": {
71-
"hierarchyParent": [],
71+
"hierarchyParent": ["elasticParent"],
7272
"replaceable": [],
7373
"elasticityModel": {
7474
"elasticityID": "elasModelMediumElasticResource",

‎retorch-orchestration/retorchfiles/configurations/ClassifierUnitTestsSystemResources.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"mockElasticResource": {
3-
"hierarchyParent": [],
4-
"replaceable": ["lightElasticResource","heavyInElasRest"],
3+
"hierarchyParent": ["elasticParent"],
4+
"replaceable": ["lightElasticResource","heavyInElasticResource"],
55
"elasticityModel": {
66
"elasticityID": "elasModelmockElasticResource",
77
"elasticity": 50,
@@ -12,16 +12,16 @@
1212
"minimalCapacities": [
1313
{
1414
"name": "memory",
15-
"quantity": 0.5
15+
"quantity": 0.2
1616
},
1717
{
1818
"name": "processor",
19-
"quantity": 2
19+
"quantity": 0.5
2020
}
2121
],
2222
"dockerImage": "someplaceholder1[IMG:]docker.someImage"
2323
},
24-
"heavyInElasRest": {
24+
"heavyInElasticResource": {
2525
"hierarchyParent": [
2626
"parentAllInelastic"
2727
],
@@ -32,7 +32,7 @@
3232
"elasticityCost": 50.0
3333
},
3434
"resourceType": "LOGICAL",
35-
"resourceID": "heavyInElasRest",
35+
"resourceID": "heavyInElasticResource",
3636
"minimalCapacities": [
3737
{
3838
"name": "memory",
@@ -46,7 +46,7 @@
4646
"dockerImage": "someplaceholder2[IMG:]docker.someImage"
4747
},
4848
"lightElasticResource": {
49-
"hierarchyParent": [],
49+
"hierarchyParent": ["elasticParent"],
5050
"replaceable": [],
5151
"elasticityModel": {
5252
"elasticityID": "elasModelLightElasticResource",

‎retorch-orchestration/retorchfiles/configurations/SyntheticIntegrationSystemResources.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"HeavyInElasticResource": {
2+
"heavyInElasticResource": {
33
"hierarchyParent": [
44
"parentAllInelastic"
55
],
66
"replaceable": [],
77
"elasticityModel": {
8-
"elasticityID": "elasModelHeavyInElasticResource",
8+
"elasticityID": "elasModelHeavyInElasRest",
99
"elasticity": 1,
1010
"elasticityCost": 50.0
1111
},
1212
"resourceType": "LOGICAL",
13-
"resourceID": "HeavyInElasticResource",
13+
"resourceID": "heavyInElasticResource",
1414
"minimalCapacities": [
1515
{
1616
"name": "memory",
17-
"quantity": 10
17+
"quantity": 4
1818
},
1919
{
2020
"name": "processor",
21-
"quantity": 2
21+
"quantity": 0.6
2222
}
2323
],
2424
"dockerImage": "database-docker.someImage"
@@ -57,12 +57,12 @@
5757
"lightInElasticResource",
5858
"lightElasticResource",
5959
"mediumElasticResource",
60-
"HeavyInElasticResource"
60+
"heavyInElasticResource"
6161
],
6262
"elasticityModel": {
6363
"elasticityID": "elasModelmockElasticResource",
64-
"elasticity": 55,
65-
"elasticityCost": 1.0
64+
"elasticity": 50,
65+
"elasticityCost": 0.0
6666
},
6767
"resourceType": "LOGICAL",
6868
"resourceID": "mockElasticResource",
@@ -97,7 +97,7 @@
9797
},
9898
{
9999
"name": "processor",
100-
"quantity": 1
100+
"quantity": 0.5
101101
}
102102
],
103103
"dockerImage": "someplaceholder2[IMG:]docker.someImage"

‎retorch-orchestration/src/test/java/giis/retorch/orchestration/ClassifierUtils.java

+18-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,23 @@ public System generateSystemPackage() {
4444
return expectedSystem;
4545
}
4646

47+
@Override
48+
public Resource getLightElasticResource() {
49+
Resource light = super.getLightElasticResource();
50+
light.setReplaceable(new LinkedList<>());
51+
return light;
52+
}
53+
54+
@Override
55+
public Resource getMockElasticResource() {
56+
Resource light = super.getMockElasticResource();
57+
LinkedList<String> listResources = new LinkedList<>();
58+
listResources.add("heavyInElasticResource");
59+
listResources.add("lightElasticResource");
60+
light.setReplaceable(listResources);
61+
return light;
62+
}
63+
4764
public System generateSystemFromClass() {
4865
generateSystemResources();
4966
System expectedSystem = new System("ClassifierUnitTests");
@@ -96,7 +113,7 @@ private Resource getJSONSavedInelasticResource() {
96113
ElasticityModel modelJSON = outputResource.getElasticityModel();
97114
modelJSON.setElasticityID("elasModelHeavyInElasRest");
98115
outputResource.setElasticityModel(modelJSON);
99-
outputResource.setResourceID("heavyInElasRest");
116+
outputResource.setResourceID(HEAVY_INELASTIC_ID);
100117
LinkedList<String> parentsList = new LinkedList<>();
101118
parentsList.add("parentAllInelastic");
102119
outputResource.setHierarchyParent(parentsList);

‎retorch-orchestration/src/test/java/giis/retorch/orchestration/GenericUtils.java

+44-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public class GenericUtils {
1515
protected static final String MOCK_ELASTIC_ID = "mockElasticResource";
1616
protected static final String MEDIUM_ELASTIC_ID = "mediumElasticResource";
1717
protected static final String LIGHT_ELASTIC_ID = "lightElasticResource";
18-
protected static final String HEAVY_INELASTIC_ID = "heavyInElasRest";
18+
protected static final String HEAVY_INELASTIC_ID = "heavyInElasticResource";
19+
protected static final String LIGHT_INELASTIC_ID = "lightInElasticResource";
1920

2021
public AccessMode getAccessModeHeavyInElasticResource() {
2122
return new AccessMode(new AccessModeTypes(READWRITE), false, 1, this.getHeavyInelasticResource());
@@ -79,20 +80,32 @@ public Resource getLightElasticResource() {
7980
List<Capacity> requiredCapacities = new LinkedList<>();
8081
requiredCapacities.add(new Capacity("memory", 1));
8182
requiredCapacities.add(new Capacity("processor", 0.5));
82-
return new Resource(LIGHT_ELASTIC_ID, new LinkedList<>(), new LinkedList<>(), getElasticityModelLightElasticResource(),
83+
List<String> hierarchy = new LinkedList<>();
84+
hierarchy.add("elasticParent");
85+
List<String> rep=new LinkedList<>();
86+
rep.add("lightInElasticResource");
87+
return new Resource(LIGHT_ELASTIC_ID, hierarchy, rep, getElasticityModelLightElasticResource(),
8388
Resource.type.LOGICAL, requiredCapacities, "someplaceholder2[IMG:]someimage");
8489
}
8590

8691
public Resource getMockElasticResource() {
8792
List<Capacity> requiredCapacities = new LinkedList<>();
88-
requiredCapacities.add(new Capacity("memory", 0.5));
89-
requiredCapacities.add(new Capacity("processor", 2.0));
93+
requiredCapacities.add(new Capacity("memory", 0.2));
94+
requiredCapacities.add(new Capacity("processor", 0.5));
9095

9196
List<String> replaceableResources = new LinkedList<>();
9297
replaceableResources.add(LIGHT_ELASTIC_ID);
9398
replaceableResources.add(HEAVY_INELASTIC_ID);
99+
replaceableResources.add(MEDIUM_ELASTIC_ID);
100+
replaceableResources.add(LIGHT_INELASTIC_ID);
101+
102+
103+
104+
List<String> hierarchy = new LinkedList<>();
105+
hierarchy.add("elasticParent");
94106

95-
return new Resource("mockElasticResource", new LinkedList<>(), replaceableResources, this.getElasticityModelMockResource(),
107+
108+
return new Resource(MOCK_ELASTIC_ID, hierarchy, replaceableResources, this.getElasticityModelMockResource(),
96109
Resource.type.LOGICAL, requiredCapacities, "someplaceholder1[IMG:]someimage");
97110
}
98111

@@ -109,9 +122,17 @@ public Resource getMediumInelasticResource() {
109122

110123
public Resource getMediumElasticResource() {
111124
ElasticityModel mediumElasModel = getElasticityModelMockResource();
112-
mediumElasModel.setElasticityCost(5);
113-
return new Resource(MEDIUM_ELASTIC_ID, new LinkedList<>(), new LinkedList<>(), mediumElasModel,
114-
Resource.type.LOGICAL, new LinkedList<>(), "someplaceholder2[IMG:]someimage");
125+
mediumElasModel.setElasticityID("elasModelMediumElasticResource");
126+
mediumElasModel.setElasticity(10);
127+
mediumElasModel.setElasticityCost(35.0);
128+
List<String> hierarchy = new LinkedList<>();
129+
hierarchy.add("elasticParent");
130+
List<Capacity> listCapacities= new LinkedList<>();
131+
listCapacities.add(new Capacity("memory", 2.5));
132+
listCapacities.add(new Capacity("processor", 2));
133+
134+
return new Resource(MEDIUM_ELASTIC_ID, hierarchy, new LinkedList<>(), mediumElasModel,
135+
Resource.type.LOGICAL, listCapacities, "someplaceholder2[IMG:]someimage");
115136
}
116137

117138
public Resource getHeavyInelasticResource() {
@@ -124,6 +145,21 @@ public Resource getHeavyInelasticResource() {
124145
return new Resource(HEAVY_INELASTIC_ID, hierarchyParents, new LinkedList<>(), getElasticityModelHeavyInelasticResource(),
125146
Resource.type.LOGICAL, requiredCapacities, "someplaceholder2[IMG:]someimage");
126147
}
148+
public Resource getLightInelasticResource() {
149+
Resource res = new Resource(this.getHeavyInelasticResource());
150+
res.setResourceID(LIGHT_INELASTIC_ID);
151+
ElasticityModel elasLight = new ElasticityModel("elasModelLightInElasticResource");
152+
elasLight.setElasticity(1);
153+
elasLight.setElasticityCost(50);
154+
res.setElasticityModel(elasLight);
155+
res.setReplaceable(new LinkedList<>());
156+
res.addReplaceableResource(LIGHT_ELASTIC_ID);
157+
List<Capacity> requiredCap=new LinkedList<>();
158+
requiredCap.add(new Capacity("processor",0.5));
159+
requiredCap.add(new Capacity("memory",1));
160+
res.setMinimalCapacities(requiredCap);
161+
return res;
162+
}
127163

128164
public Resource getNewMockElasticResource() {
129165
Resource mockElasticResource = new Resource(this.getMediumElasticResource());

0 commit comments

Comments
 (0)