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
a812ba2c
Commit
a812ba2c
authored
Apr 24, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed to timestamp
parent
b59b6e78
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
25 additions
and
27 deletions
+25
-27
DeployService.java
.../main/java/nl/uva/sne/drip/api/service/DeployService.java
+2
-2
PlannerService.java
...main/java/nl/uva/sne/drip/api/service/PlannerService.java
+2
-2
ProvisionService.java
...in/java/nl/uva/sne/drip/api/service/ProvisionService.java
+1
-1
SimplePlannerService.java
...ava/nl/uva/sne/drip/api/service/SimplePlannerService.java
+2
-2
CloudConfigurationController0.java
...a/sne/drip/api/v0/rest/CloudConfigurationController0.java
+5
-5
ProvisionController0.java
...ava/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java
+1
-1
CloudCredentialsController.java
.../uva/sne/drip/api/v1/rest/CloudCredentialsController.java
+2
-2
KeyPairController.java
...n/java/nl/uva/sne/drip/api/v1/rest/KeyPairController.java
+1
-1
Converter.java
...rc/main/java/nl/uva/sne/drip/commons/utils/Converter.java
+1
-1
OwnedObject.java
...in/java/nl/uva/sne/drip/data/v1/external/OwnedObject.java
+7
-9
BenchmarkResult.java
...va/sne/drip/data/v1/external/ansible/BenchmarkResult.java
+1
-1
No files found.
drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
View file @
a812ba2c
...
...
@@ -232,7 +232,7 @@ public class DeployService {
private
DeployResponse
handleResponse
(
List
<
MessageParameter
>
params
,
DeployRequest
deployInfo
)
throws
KeyException
,
IOException
{
DeployResponse
deployResponse
=
new
DeployResponse
();
deployResponse
.
set
CreationDate
(
System
.
currentTimeMillis
());
deployResponse
.
set
Timestamp
(
System
.
currentTimeMillis
());
for
(
MessageParameter
p
:
params
)
{
String
name
=
p
.
getName
();
...
...
@@ -243,7 +243,7 @@ public class DeployService {
k
.
setKey
(
value
);
k
.
setType
(
Key
.
KeyType
.
PRIVATE
);
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
System
.
currentTimeMillis
());
pair
.
setPrivateKey
(
k
);
deployResponse
.
setKey
(
pair
);
save
(
deployResponse
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
View file @
a812ba2c
...
...
@@ -86,7 +86,7 @@ public class PlannerService {
SimplePlanContainer
simplePlan
=
P2PConverter
.
convert
(
jsonArrayString
.
toString
(),
"vm_user"
,
"Ubuntu 16.04"
,
"swarm"
);
PlanResponse
topLevel
=
new
PlanResponse
();
topLevel
.
set
CreationDate
(
System
.
currentTimeMillis
());
topLevel
.
set
Timestamp
(
System
.
currentTimeMillis
());
topLevel
.
setLevel
(
0
);
topLevel
.
setToscaID
(
toscaId
);
topLevel
.
setName
(
"planner_output_all.yml"
);
...
...
@@ -95,7 +95,7 @@ public class PlannerService {
Set
<
String
>
loweLevelPlansIDs
=
new
HashSet
<>();
for
(
String
lowLevelNames
:
map
.
keySet
())
{
PlanResponse
lowLevelPlan
=
new
PlanResponse
();
lowLevelPlan
.
set
CreationDate
(
System
.
currentTimeMillis
());
lowLevelPlan
.
set
Timestamp
(
System
.
currentTimeMillis
());
lowLevelPlan
.
setLevel
(
1
);
lowLevelPlan
.
setToscaID
(
toscaId
);
lowLevelPlan
.
setName
(
lowLevelNames
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
View file @
a812ba2c
...
...
@@ -128,7 +128,7 @@ public class ProvisionService {
// + File.separator + "ec2_provisioner_provisoned3.json");
List
<
MessageParameter
>
params
=
response
.
getParameters
();
ProvisionResponse
provisionResponse
=
new
ProvisionResponse
();
provisionResponse
.
set
CreationDate
(
System
.
currentTimeMillis
());
provisionResponse
.
set
Timestamp
(
System
.
currentTimeMillis
());
for
(
MessageParameter
p
:
params
)
{
String
name
=
p
.
getName
();
if
(
name
.
toLowerCase
().
contains
(
"exception"
))
{
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/SimplePlannerService.java
View file @
a812ba2c
...
...
@@ -64,7 +64,7 @@ public class SimplePlannerService {
Message
plannerReturnedMessage
=
(
planner
.
call
(
plannerInvokationMessage
));
List
<
MessageParameter
>
planFiles
=
plannerReturnedMessage
.
getParameters
();
topLevel
=
new
PlanResponse
();
topLevel
.
set
CreationDate
(
System
.
currentTimeMillis
());
topLevel
.
set
Timestamp
(
System
.
currentTimeMillis
());
Set
<
String
>
ids
=
topLevel
.
getLoweLevelPlanIDs
();
if
(
ids
==
null
)
{
ids
=
new
HashSet
<>();
...
...
@@ -84,7 +84,7 @@ public class SimplePlannerService {
topLevel
.
setKvMap
(
Converter
.
ymlString2Map
(
p
.
getValue
()));
}
else
{
lowerLevelPlan
=
new
PlanResponse
();
lowerLevelPlan
.
set
CreationDate
(
System
.
currentTimeMillis
());
lowerLevelPlan
.
set
Timestamp
(
System
.
currentTimeMillis
());
lowerLevelPlan
.
setName
(
name
);
lowerLevelPlan
.
setKvMap
(
Converter
.
ymlString2Map
(
p
.
getValue
()));
lowerLevelPlan
.
setLevel
(
1
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/CloudConfigurationController0.java
View file @
a812ba2c
...
...
@@ -70,7 +70,7 @@ public class CloudConfigurationController0 {
throw
new
NullKeyIDException
();
}
CloudCredentials
cloudCredentials
=
new
CloudCredentials
();
cloudCredentials
.
set
CreationDate
(
System
.
currentTimeMillis
());
cloudCredentials
.
set
Timestamp
(
System
.
currentTimeMillis
());
cloudCredentials
.
setAccessKeyId
(
configure
.
keyid
);
cloudCredentials
.
setSecretKey
(
configure
.
key
);
...
...
@@ -80,7 +80,7 @@ public class CloudConfigurationController0 {
try
{
nl
.
uva
.
sne
.
drip
.
data
.
v1
.
external
.
Key
key1
=
new
nl
.
uva
.
sne
.
drip
.
data
.
v1
.
external
.
Key
();
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
System
.
currentTimeMillis
());
key1
.
setKey
(
key0
.
content
);
Map
<
String
,
String
>
attributes
=
new
HashMap
<>();
attributes
.
put
(
"domain_name"
,
key0
.
domain_name
);
...
...
@@ -110,7 +110,7 @@ public class CloudConfigurationController0 {
throw
new
NullKeyIDException
();
}
CloudCredentials
cloudCredentials
=
new
CloudCredentials
();
cloudCredentials
.
set
CreationDate
(
System
.
currentTimeMillis
());
cloudCredentials
.
set
Timestamp
(
System
.
currentTimeMillis
());
// cloudCredentials.setKeyIdAlias(configure.geniKeyAlias);
cloudCredentials
.
setAccessKeyId
(
configure
.
geniKey
);
cloudCredentials
.
setSecretKey
(
configure
.
geniKeyPass
);
...
...
@@ -123,7 +123,7 @@ public class CloudConfigurationController0 {
key1
.
setKey
(
key0
.
content
);
key1
.
setType
(
Key
.
KeyType
.
PUBLIC
);
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
System
.
currentTimeMillis
());
pair
.
setPublicKey
(
key1
);
pair
=
keyService
.
save
(
pair
);
loginKeyIDs
.
add
(
pair
.
getId
());
...
...
@@ -138,7 +138,7 @@ public class CloudConfigurationController0 {
key1
.
setKey
(
key0
.
content
);
key1
.
setType
(
Key
.
KeyType
.
PRIVATE
);
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
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 @
a812ba2c
...
...
@@ -84,7 +84,7 @@ public class ProvisionController0 {
String
provision
(
@RequestBody
Upload
upload
)
{
ProvisionResponse
resp
=
new
ProvisionResponse
();
resp
.
set
CreationDate
(
System
.
currentTimeMillis
());
resp
.
set
Timestamp
(
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 @
a812ba2c
...
...
@@ -132,7 +132,7 @@ public class CloudCredentialsController {
attributes
.
put
(
"domain_name"
,
FilenameUtils
.
removeExtension
(
originalFileName
));
key
.
setAttributes
(
attributes
);
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
System
.
currentTimeMillis
());
pair
.
setPrivateKey
(
key
);
pair
=
keyService
.
save
(
pair
);
loginKeyIDs
.
add
(
pair
.
getId
());
...
...
@@ -208,7 +208,7 @@ public class CloudCredentialsController {
public
@ResponseBody
CloudCredentials
geta
()
{
CloudCredentials
cloudCredentials
=
new
CloudCredentials
();
cloudCredentials
.
set
CreationDate
(
System
.
currentTimeMillis
());
cloudCredentials
.
set
Timestamp
(
System
.
currentTimeMillis
());
cloudCredentials
.
setAccessKeyId
(
"AKIAITY3KHZUQ6M7YBSQ"
);
cloudCredentials
.
setCloudProviderName
(
"ec2"
);
cloudCredentials
.
setSecretKey
(
"6J7uo99ifrff45sa6Gsy5vgb3bmrtwY6hBxtYt9y"
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/KeyPairController.java
View file @
a812ba2c
...
...
@@ -139,7 +139,7 @@ public class KeyPairController {
KeyPair
geta
()
{
try
{
KeyPair
pair
=
new
KeyPair
();
pair
.
set
CreationDate
(
System
.
currentTimeMillis
());
pair
.
set
Timestamp
(
System
.
currentTimeMillis
());
Key
pk
=
new
Key
();
Map
<
String
,
String
>
attributes
=
new
HashMap
<>();
attributes
.
put
(
"domain_name"
,
"Virginia"
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
View file @
a812ba2c
...
...
@@ -200,7 +200,7 @@ public class Converter {
public
static
PlanResponse
File2Plan1
(
Attribute
p0
)
{
PlanResponse
p1
=
new
PlanResponse
();
p1
.
set
CreationDate
(
System
.
currentTimeMillis
());
p1
.
set
Timestamp
(
System
.
currentTimeMillis
());
p1
.
setLevel
(
Integer
.
valueOf
(
p0
.
level
));
p1
.
setName
(
p0
.
name
);
String
yaml
=
p0
.
content
.
replaceAll
(
"\\\\n"
,
"\n"
);
...
...
drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/OwnedObject.java
View file @
a812ba2c
...
...
@@ -32,7 +32,7 @@ public class OwnedObject {
@Id
private
String
id
;
private
Long
creationDate
;
private
Long
timestamp
;
@NotNull
private
String
owner
;
...
...
@@ -67,17 +67,15 @@ public class OwnedObject {
}
/**
* @return the
creationDate
* @return the
timestamp
*/
public
Long
get
CreationDate
()
{
return
creationDate
;
public
Long
get
Timestamp
()
{
return
timestamp
;
}
/**
* @param creationDate the creationDate to set
*/
public
void
setCreationDate
(
Long
creationDate
)
{
this
.
creationDate
=
creationDate
;
public
void
setTimestamp
(
Long
timestamp
)
{
this
.
timestamp
=
timestamp
;
}
}
drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/ansible/BenchmarkResult.java
View file @
a812ba2c
/*
/*
* Copyright 2017 S. Koulouzis, Wang Junchao, Huan Zhou, Yang Hu
*
* Licensed under the Apache License, Version 2.0 (the "License");
...
...
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