Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Melodic
morphemic-preprocessor
Commits
d062dade
Commit
d062dade
authored
Aug 27, 2021
by
Mohamed Khalil Labidi
Browse files
Merge branch 'purgesal-v2' into 'proactive-dev'
Add purging SAL's DB endpoint See merge request
!142
parents
3594473f
36c42f33
Pipeline
#15534
passed with stages
in 1 minute and 48 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
View file @
d062dade
...
...
@@ -197,7 +197,6 @@ public class PAGateway {
EmsDeploymentRequest
.
class
).
getResultList
();
}
/**
*
* Return the dot format of the application's graph
...
...
@@ -656,7 +655,6 @@ public class PAGateway {
}
/**
* Return the List of registered BYON nodes
* @param jobId A constructed job identifier, If "0" is passed as the JobId all the Byon Nodes will be returned
...
...
@@ -723,7 +721,6 @@ public class PAGateway {
return
0
;
}
/**
* Undeploy clouds
* @param cloudIDs List of cloud IDs to remove
...
...
@@ -1930,4 +1927,36 @@ public class PAGateway {
LOGGER
.
info
(
"Results of task: "
+
taskName
+
" fetched successfully: "
+
taskResultsMap
.
toString
());
return
taskResultsMap
;
}
public
void
cleanAll
()
{
EntityManagerHelper
.
begin
();
LOGGER
.
info
(
"Cleaning Jobs ..."
);
Job
.
clean
();
LOGGER
.
info
(
"Cleaning Tasks ..."
);
Task
.
clean
();
LOGGER
.
info
(
"Cleaning PAClouds ..."
);
PACloud
.
clean
();
LOGGER
.
info
(
"Cleaning Deployments ..."
);
Deployment
.
clean
();
LOGGER
.
info
(
"Cleaning Ports ..."
);
Port
.
clean
();
LOGGER
.
info
(
"Cleaning Credentials ..."
);
Credentials
.
clean
();
LOGGER
.
info
(
"Cleaning EmsDeploymentRequests ..."
);
EmsDeploymentRequest
.
clean
();
LOGGER
.
info
(
"Cleaning NodeCandidates ..."
);
NodeCandidate
.
clean
();
LOGGER
.
info
(
"Cleaning Clouds ..."
);
Cloud
.
clean
();
LOGGER
.
info
(
"Cleaning Images ..."
);
Image
.
clean
();
LOGGER
.
info
(
"Cleaning Hardwares ..."
);
Hardware
.
clean
();
LOGGER
.
info
(
"Cleaning Jobs ..."
);
Location
.
clean
();
LOGGER
.
info
(
"Cleaning ByonNodes ..."
);
ByonNode
.
clean
();
EntityManagerHelper
.
commit
();
LOGGER
.
info
(
"Done."
);
}
}
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/ByonNode.java
View file @
d062dade
...
...
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
org.hibernate.annotations.GenericGenerator
;
import
javax.persistence.*
;
...
...
@@ -68,6 +69,11 @@ public class ByonNode implements Serializable {
@JsonProperty
(
"jobId"
)
private
String
jobId
;
public
static
void
clean
()
{
List
<
ByonNode
>
allByonNodes
=
EntityManagerHelper
.
createQuery
(
"SELECT bn FROM ByonNode bn"
,
ByonNode
.
class
).
getResultList
();
allByonNodes
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
ByonNode
name
(
String
name
)
{
this
.
name
=
name
;
return
this
;
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Cloud.java
View file @
d062dade
...
...
@@ -5,9 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import
com.fasterxml.jackson.annotation.JsonValue
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Objects
;
...
...
@@ -49,6 +51,11 @@ public class Cloud implements Serializable {
@JsonProperty
(
"owner"
)
private
String
owner
=
null
;
public
static
void
clean
()
{
List
<
Cloud
>
allClouds
=
EntityManagerHelper
.
createQuery
(
"SELECT c FROM Cloud c"
,
Cloud
.
class
).
getResultList
();
allClouds
.
forEach
(
EntityManagerHelper:
:
remove
);
}
/**
* State of the cloud
*/
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Credentials.java
View file @
d062dade
package
org.activeeon.morphemic.model
;
import
lombok.*
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
@AllArgsConstructor
@NoArgsConstructor
...
...
@@ -32,4 +34,9 @@ public class Credentials implements Serializable {
@Column
(
name
=
"DOMAIN"
)
private
String
domain
;
public
static
void
clean
()
{
List
<
Credentials
>
allCredentials
=
EntityManagerHelper
.
createQuery
(
"SELECT c FROM Credentials c"
,
Credentials
.
class
).
getResultList
();
allCredentials
.
forEach
(
EntityManagerHelper:
:
remove
);
}
}
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Deployment.java
View file @
d062dade
...
...
@@ -4,9 +4,11 @@ import lombok.AllArgsConstructor;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
@AllArgsConstructor
@NoArgsConstructor
...
...
@@ -60,6 +62,12 @@ public class Deployment implements Serializable {
@OneToOne
(
fetch
=
FetchType
.
EAGER
,
cascade
=
CascadeType
.
REFRESH
)
private
ByonNode
byonNode
;
public
static
void
clean
()
{
List
<
Deployment
>
allDeployments
=
EntityManagerHelper
.
createQuery
(
"SELECT d FROM Deployment d"
,
Deployment
.
class
).
getResultList
();
allDeployments
.
forEach
(
EntityManagerHelper:
:
remove
);
}
@Override
public
String
toString
()
{
switch
(
deploymentType
)
{
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/EmsDeploymentRequest.java
View file @
d062dade
package
org.activeeon.morphemic.model
;
import
lombok.*
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
org.hibernate.annotations.GenericGenerator
;
import
org.ow2.proactive.scheduler.common.task.TaskVariable
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Map
;
...
...
@@ -19,6 +21,11 @@ import java.util.Map;
@Table
(
name
=
"EMSDEPLOYMENTREQUEST"
)
public
class
EmsDeploymentRequest
implements
Serializable
{
public
static
void
clean
()
{
List
<
EmsDeploymentRequest
>
allEmsDeploymentRequests
=
EntityManagerHelper
.
createQuery
(
"SELECT emsdr FROM EmsDeploymentRequest emsdr"
,
EmsDeploymentRequest
.
class
).
getResultList
();
allEmsDeploymentRequests
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
enum
TargetType
{
vm
(
"IAAS"
),
container
(
"PAAS"
),
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Hardware.java
View file @
d062dade
...
...
@@ -3,9 +3,11 @@ package org.activeeon.morphemic.model;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Objects
;
/**
...
...
@@ -54,6 +56,11 @@ public class Hardware implements Serializable {
@JsonProperty
(
"owner"
)
private
String
owner
=
null
;
public
static
void
clean
()
{
List
<
Hardware
>
allHardwares
=
EntityManagerHelper
.
createQuery
(
"SELECT h FROM Hardware h"
,
Hardware
.
class
).
getResultList
();
allHardwares
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
Hardware
id
(
String
id
)
{
this
.
id
=
id
;
return
this
;
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Image.java
View file @
d062dade
...
...
@@ -3,9 +3,11 @@ package org.activeeon.morphemic.model;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Objects
;
/**
...
...
@@ -46,6 +48,11 @@ public class Image implements Serializable {
@JsonProperty
(
"owner"
)
private
String
owner
=
null
;
public
static
void
clean
()
{
List
<
Image
>
allImages
=
EntityManagerHelper
.
createQuery
(
"SELECT i FROM Image i"
,
Image
.
class
).
getResultList
();
allImages
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
Image
id
(
String
id
)
{
this
.
id
=
id
;
return
this
;
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Job.java
View file @
d062dade
...
...
@@ -3,6 +3,7 @@ package org.activeeon.morphemic.model;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectWriter
;
import
lombok.*
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.IOException
;
...
...
@@ -40,6 +41,11 @@ public class Job implements Serializable {
@OneToMany
(
fetch
=
FetchType
.
EAGER
,
orphanRemoval
=
true
,
cascade
=
CascadeType
.
REFRESH
)
private
List
<
Task
>
tasks
;
public
static
void
clean
()
{
List
<
Job
>
allJobs
=
EntityManagerHelper
.
createQuery
(
"SELECT j FROM Job j"
,
Job
.
class
).
getResultList
();
allJobs
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
Task
findTask
(
String
taskName
)
{
return
tasks
.
stream
()
.
filter
(
task
->
task
.
getName
().
equals
(
taskName
)).
findAny
().
orElse
(
null
);
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Location.java
View file @
d062dade
...
...
@@ -5,9 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import
com.fasterxml.jackson.annotation.JsonValue
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Objects
;
...
...
@@ -32,6 +34,11 @@ public class Location implements Serializable {
@JsonProperty
(
"providerId"
)
private
String
providerId
=
null
;
public
static
void
clean
()
{
List
<
Location
>
allLocations
=
EntityManagerHelper
.
createQuery
(
"SELECT l FROM Location l"
,
Location
.
class
).
getResultList
();
allLocations
.
forEach
(
EntityManagerHelper:
:
remove
);
}
/**
* Scope of the location
*/
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/NodeCandidate.java
View file @
d062dade
...
...
@@ -31,6 +31,11 @@ public class NodeCandidate implements Serializable {
@JsonProperty
(
"id"
)
private
String
id
=
null
;
public
static
void
clean
()
{
List
<
NodeCandidate
>
allNodeCandidates
=
EntityManagerHelper
.
createQuery
(
"SELECT nc FROM NodeCandidate nc"
,
NodeCandidate
.
class
).
getResultList
();
allNodeCandidates
.
forEach
(
EntityManagerHelper:
:
remove
);
}
/**
* Gets or Sets nodeCandidateType
*/
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/PACloud.java
View file @
d062dade
...
...
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
...
...
@@ -68,6 +69,11 @@ public class PACloud implements Serializable {
@OneToOne
private
Credentials
credentials
;
public
static
void
clean
()
{
List
<
PACloud
>
allPAClouds
=
EntityManagerHelper
.
createQuery
(
"SELECT pac FROM PACloud pac"
,
PACloud
.
class
).
getResultList
();
allPAClouds
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
void
addDeployment
(
Deployment
deployment
)
{
if
(
deployments
==
null
){
deployments
=
new
LinkedList
<>();
...
...
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Port.java
View file @
d062dade
...
...
@@ -2,9 +2,11 @@ package org.activeeon.morphemic.model;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.*
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.List
;
@AllArgsConstructor
@NoArgsConstructor
...
...
@@ -34,4 +36,9 @@ public class Port implements Serializable {
throw
new
IllegalArgumentException
(
String
.
format
(
"Invalid port value provided: %d"
,
value
));
}
}
public
static
void
clean
()
{
List
<
Port
>
allPorts
=
EntityManagerHelper
.
createQuery
(
"SELECT p FROM Port p"
,
Port
.
class
).
getResultList
();
allPorts
.
forEach
(
EntityManagerHelper:
:
remove
);
}
}
scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Task.java
View file @
d062dade
...
...
@@ -4,6 +4,7 @@ import lombok.Getter;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
import
org.activeeon.morphemic.service.EntityManagerHelper
;
import
org.hibernate.annotations.Fetch
;
import
org.hibernate.annotations.FetchMode
;
...
...
@@ -60,6 +61,11 @@ public class Task implements Serializable {
@Column
(
name
=
"NEXT_DEPLOYMENT_ID"
)
private
Long
nextDeploymentID
=
0L
;
public
static
void
clean
()
{
List
<
Task
>
allTasks
=
EntityManagerHelper
.
createQuery
(
"SELECT t FROM Task t"
,
Task
.
class
).
getResultList
();
allTasks
.
forEach
(
EntityManagerHelper:
:
remove
);
}
public
void
addDeployment
(
Deployment
deployment
)
{
if
(
deployments
==
null
){
deployments
=
new
LinkedList
<>();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment