Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
4cdf1a3d
Commit
4cdf1a3d
authored
Oct 18, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set time on creation
parent
11cfec9a
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
12 additions
and
33 deletions
+12
-33
AnsibleOutputService.java
...ava/nl/uva/sne/drip/api/service/AnsibleOutputService.java
+1
-1
BenchmarkResultService.java
...a/nl/uva/sne/drip/api/service/BenchmarkResultService.java
+1
-1
CloudCredentialsService.java
.../nl/uva/sne/drip/api/service/CloudCredentialsService.java
+1
-1
ConfigurationService.java
...ava/nl/uva/sne/drip/api/service/ConfigurationService.java
+1
-1
DeployService.java
.../main/java/nl/uva/sne/drip/api/service/DeployService.java
+1
-3
KeyPairService.java
...main/java/nl/uva/sne/drip/api/service/KeyPairService.java
+1
-1
MonitorringMessageService.java
...l/uva/sne/drip/api/service/MonitorringMessageService.java
+1
-1
PlannerService.java
...main/java/nl/uva/sne/drip/api/service/PlannerService.java
+1
-3
ProvisionService.java
...in/java/nl/uva/sne/drip/api/service/ProvisionService.java
+1
-2
ScriptService.java
.../main/java/nl/uva/sne/drip/api/service/ScriptService.java
+1
-1
SimplePlannerService.java
...ava/nl/uva/sne/drip/api/service/SimplePlannerService.java
+0
-2
ToscaService.java
...c/main/java/nl/uva/sne/drip/api/service/ToscaService.java
+1
-1
CloudConfigurationController0.java
...a/sne/drip/api/v0/rest/CloudConfigurationController0.java
+0
-5
ProvisionController0.java
...ava/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java
+0
-1
CloudCredentialsController.java
.../uva/sne/drip/api/v1/rest/CloudCredentialsController.java
+0
-1
KeyPairController.java
...n/java/nl/uva/sne/drip/api/v1/rest/KeyPairController.java
+0
-1
Converter.java
...rc/main/java/nl/uva/sne/drip/commons/utils/Converter.java
+0
-1
OwnedObject.java
...a/sne/drip/drip/commons/data/v1/external/OwnedObject.java
+1
-6
No files found.
drip-api/src/main/java/nl/uva/sne/drip/api/service/AnsibleOutputService.java
View file @
4cdf1a3d
...
...
@@ -70,7 +70,7 @@ public class AnsibleOutputService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
ansibleOutputDao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/BenchmarkResultService.java
View file @
4cdf1a3d
...
...
@@ -66,7 +66,7 @@ public class BenchmarkResultService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
benchmarkResultDao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/CloudCredentialsService.java
View file @
4cdf1a3d
...
...
@@ -43,7 +43,7 @@ public class CloudCredentialsService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ConfigurationService.java
View file @
4cdf1a3d
...
...
@@ -109,7 +109,7 @@ public class ConfigurationService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
View file @
4cdf1a3d
...
...
@@ -127,7 +127,7 @@ public class DeployService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
deployDao
.
save
(
ownedObject
);
}
...
...
@@ -335,7 +335,6 @@ public class DeployService {
private
DeployResponse
handleResponse
(
List
<
MessageParameter
>
params
,
DeployRequest
deployInfo
)
throws
KeyException
,
IOException
,
Exception
{
DeployResponse
deployResponse
=
new
DeployResponse
();
deployResponse
.
setTimestamp
(
System
.
currentTimeMillis
());
for
(
MessageParameter
p
:
params
)
{
String
name
=
p
.
getName
();
...
...
@@ -346,7 +345,6 @@ public class DeployService {
k
.
setKey
(
value
);
k
.
setType
(
Key
.
KeyType
.
PRIVATE
);
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
pair
.
setPrivateKey
(
k
);
deployResponse
.
setKey
(
pair
);
save
(
deployResponse
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/KeyPairService.java
View file @
4cdf1a3d
...
...
@@ -61,7 +61,7 @@ public class KeyPairService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/MonitorringMessageService.java
View file @
4cdf1a3d
...
...
@@ -68,7 +68,7 @@ public class MonitorringMessageService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
}
drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
View file @
4cdf1a3d
...
...
@@ -94,7 +94,6 @@ public class PlannerService {
SimplePlanContainer
simplePlan
=
P2PConverter
.
transfer
(
jsonArrayString
.
toString
(),
"vm_user"
,
domainName
,
cloudProvider
);
PlanResponse
topLevel
=
new
PlanResponse
();
topLevel
.
setTimestamp
(
System
.
currentTimeMillis
());
topLevel
.
setLevel
(
0
);
topLevel
.
setToscaID
(
toscaId
);
topLevel
.
setName
(
"planner_output_all.yml"
);
...
...
@@ -103,7 +102,6 @@ public class PlannerService {
Set
<
String
>
loweLevelPlansIDs
=
new
HashSet
<>();
for
(
String
lowLevelNames
:
map
.
keySet
())
{
PlanResponse
lowLevelPlan
=
new
PlanResponse
();
lowLevelPlan
.
setTimestamp
(
System
.
currentTimeMillis
());
lowLevelPlan
.
setLevel
(
1
);
lowLevelPlan
.
setToscaID
(
toscaId
);
lowLevelPlan
.
setName
(
lowLevelNames
);
...
...
@@ -195,7 +193,7 @@ public class PlannerService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
planDao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
View file @
4cdf1a3d
...
...
@@ -93,7 +93,7 @@ public class ProvisionService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
provisionDao
.
save
(
ownedObject
);
}
...
...
@@ -637,7 +637,6 @@ public class ProvisionService {
ProvisionRequest
provisionRequest
,
ProvisionResponse
provisionResponse
,
boolean
saveUserKeys
,
boolean
saveDeployerKeyI
)
throws
Exception
{
if
(
provisionResponse
==
null
)
{
provisionResponse
=
new
ProvisionResponse
();
provisionResponse
.
setTimestamp
(
System
.
currentTimeMillis
());
}
List
<
DeployParameter
>
deployParameters
=
new
ArrayList
<>();
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ScriptService.java
View file @
4cdf1a3d
...
...
@@ -42,7 +42,7 @@ public class ScriptService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/SimplePlannerService.java
View file @
4cdf1a3d
...
...
@@ -64,7 +64,6 @@ public class SimplePlannerService {
Message
plannerReturnedMessage
=
(
planner
.
call
(
plannerInvokationMessage
));
List
<
MessageParameter
>
planFiles
=
plannerReturnedMessage
.
getParameters
();
topLevel
=
new
PlanResponse
();
topLevel
.
setTimestamp
(
System
.
currentTimeMillis
());
Set
<
String
>
ids
=
topLevel
.
getLoweLevelPlanIDs
();
if
(
ids
==
null
)
{
ids
=
new
HashSet
<>();
...
...
@@ -84,7 +83,6 @@ public class SimplePlannerService {
topLevel
.
setKvMap
(
Converter
.
ymlString2Map
(
p
.
getValue
()));
}
else
{
lowerLevelPlan
=
new
PlanResponse
();
lowerLevelPlan
.
setTimestamp
(
System
.
currentTimeMillis
());
lowerLevelPlan
.
setName
(
name
);
lowerLevelPlan
.
setKvMap
(
Converter
.
ymlString2Map
(
p
.
getValue
()));
lowerLevelPlan
.
setLevel
(
1
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java
View file @
4cdf1a3d
...
...
@@ -134,7 +134,7 @@ public class ToscaService {
User
user
=
(
User
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
owner
=
user
.
getUsername
();
ownedObject
.
setOwner
(
owner
);
ownedObject
.
setTimestamp
(
System
.
currentTimeMillis
());
return
dao
.
save
(
ownedObject
);
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/CloudConfigurationController0.java
View file @
4cdf1a3d
...
...
@@ -70,7 +70,6 @@ public class CloudConfigurationController0 {
throw
new
NullKeyIDException
();
}
CloudCredentials
cloudCredentials
=
new
CloudCredentials
();
cloudCredentials
.
setTimestamp
(
System
.
currentTimeMillis
());
cloudCredentials
.
setAccessKeyId
(
configure
.
keyid
);
cloudCredentials
.
setSecretKey
(
configure
.
key
);
...
...
@@ -80,7 +79,6 @@ public class CloudConfigurationController0 {
try
{
nl
.
uva
.
sne
.
drip
.
drip
.
commons
.
data
.
v1
.
external
.
Key
key1
=
new
nl
.
uva
.
sne
.
drip
.
drip
.
commons
.
data
.
v1
.
external
.
Key
();
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
key1
.
setKey
(
key0
.
content
);
Map
<
String
,
String
>
attributes
=
new
HashMap
<>();
attributes
.
put
(
"domain_name"
,
key0
.
domain_name
);
...
...
@@ -110,7 +108,6 @@ public class CloudConfigurationController0 {
throw
new
NullKeyIDException
();
}
CloudCredentials
cloudCredentials
=
new
CloudCredentials
();
cloudCredentials
.
setTimestamp
(
System
.
currentTimeMillis
());
// cloudCredentials.setKeyIdAlias(configure.geniKeyAlias);
cloudCredentials
.
setAccessKeyId
(
configure
.
geniKey
);
cloudCredentials
.
setSecretKey
(
configure
.
geniKeyPass
);
...
...
@@ -123,7 +120,6 @@ public class CloudConfigurationController0 {
key1
.
setKey
(
key0
.
content
);
key1
.
setType
(
Key
.
KeyType
.
PUBLIC
);
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
pair
.
setPublicKey
(
key1
);
pair
=
keyService
.
save
(
pair
);
loginKeyIDs
.
add
(
pair
.
getId
());
...
...
@@ -138,7 +134,6 @@ public class CloudConfigurationController0 {
key1
.
setKey
(
key0
.
content
);
key1
.
setType
(
Key
.
KeyType
.
PRIVATE
);
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
pair
.
setPrivateKey
(
key1
);
pair
=
keyService
.
save
(
pair
);
loginKeyIDs
.
add
(
pair
.
getId
());
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java
View file @
4cdf1a3d
...
...
@@ -84,7 +84,6 @@ public class ProvisionController0 {
String
provision
(
@RequestBody
Upload
upload
)
{
ProvisionResponse
resp
=
new
ProvisionResponse
();
resp
.
setTimestamp
(
System
.
currentTimeMillis
());
CloudCredentials
cloudCred
=
cloudCredentialsService
.
findAll
().
get
(
0
);
String
cloudCredID
=
cloudCred
.
getId
();
List
<
String
>
idList
=
new
ArrayList
<>();
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/CloudCredentialsController.java
View file @
4cdf1a3d
...
...
@@ -138,7 +138,6 @@ public class CloudCredentialsController {
attributes
.
put
(
"domain_name"
,
FilenameUtils
.
removeExtension
(
originalFileName
));
key
.
setAttributes
(
attributes
);
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
pair
.
setPrivateKey
(
key
);
pair
=
keyService
.
save
(
pair
);
// loginKeyIDs.add(pair.getId());
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/KeyPairController.java
View file @
4cdf1a3d
...
...
@@ -139,7 +139,6 @@ public class KeyPairController {
KeyPair
geta
()
throws
Exception
{
try
{
KeyPair
pair
=
new
KeyPair
();
pair
.
setTimestamp
(
System
.
currentTimeMillis
());
Key
pk
=
new
Key
();
Map
<
String
,
String
>
attributes
=
new
HashMap
<>();
attributes
.
put
(
"domain_name"
,
"Virginia"
);
...
...
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
View file @
4cdf1a3d
...
...
@@ -206,7 +206,6 @@ public class Converter {
public
static
PlanResponse
File2Plan1
(
Attribute
p0
)
{
PlanResponse
p1
=
new
PlanResponse
();
p1
.
setTimestamp
(
System
.
currentTimeMillis
());
p1
.
setLevel
(
Integer
.
valueOf
(
p0
.
level
));
p1
.
setName
(
p0
.
name
);
String
yaml
=
p0
.
content
.
replaceAll
(
"\\\\n"
,
"\n"
);
...
...
drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/OwnedObject.java
View file @
4cdf1a3d
...
...
@@ -34,7 +34,7 @@ public class OwnedObject {
@Id
private
String
id
;
private
Long
timestamp
;
private
Long
timestamp
=
System
.
currentTimeMillis
()
;
@NotNull
private
String
owner
;
...
...
@@ -77,9 +77,4 @@ public class OwnedObject {
return
timestamp
;
}
public
void
setTimestamp
(
Long
timestamp
)
{
this
.
timestamp
=
timestamp
;
}
}
Write
Preview
Markdown
is supported
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