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
6c746bf4
Commit
6c746bf4
authored
Jun 21, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added exogeni support
parent
c04ca632
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
MessageParsing.java
...l/uva/sne/drip/drip/provisioner/utils/MessageParsing.java
+4
-1
Consumer.java
...in/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
+6
-3
dum_planner.py
drip_planner2/src/planner/dum_planner.py
+4
-4
No files found.
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/utils/MessageParsing.java
View file @
6c746bf4
...
...
@@ -211,8 +211,11 @@ public class MessageParsing {
if
(
att
!=
null
&&
att
.
containsKey
(
"keystore"
))
{
String
javaKeyStoreEncoded
=
(
String
)
att
.
get
(
"keystore"
);
byte
[]
decoded
=
Base64
.
getDecoder
().
decode
(
javaKeyStoreEncoded
);
FileUtils
.
writeByteArrayToFile
(
new
File
(
tempInputDirPath
+
File
.
separator
+
"user.jks"
),
decoded
);
File
keyStoreFile
=
new
File
(
tempInputDirPath
+
File
.
separator
+
"user.jks"
);
FileUtils
.
writeByteArrayToFile
(
keyStoreFile
,
decoded
);
exoGeniCredential
.
userKeyPath
=
keyStoreFile
.
getAbsolutePath
();
}
credential
=
exoGeniCredential
;
}
...
...
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
View file @
6c746bf4
...
...
@@ -58,6 +58,7 @@ import provisioning.credential.SSHKeyPair;
import
provisioning.credential.UserCredential
;
import
provisioning.database.EC2.EC2Database
;
import
provisioning.database.EGI.EGIDatabase
;
import
provisioning.database.ExoGENI.ExoGENIDatabase
;
import
provisioning.database.UserDatabase
;
import
provisioning.engine.TEngine.TEngine
;
import
provisioning.request.RecoverRequest
;
...
...
@@ -481,6 +482,8 @@ public class Consumer extends DefaultConsumer {
if
(
userDatabase
.
databases
==
null
)
{
userDatabase
.
databases
=
new
HashMap
<>();
}
ExoGENIDatabase
exoGENIDB
=
new
ExoGENIDatabase
();
userDatabase
.
databases
.
put
(
"exogeni"
,
exoGENIDB
);
userDatabase
.
databases
.
put
(
"ec2"
,
ec2Database
);
userDatabase
.
databases
.
put
(
"egi"
,
egiDatabase
);
return
userDatabase
;
...
...
@@ -500,8 +503,8 @@ public class Consumer extends DefaultConsumer {
if
(
cred
instanceof
EGICredential
)
{
userCredential
.
cloudAccess
.
put
(
"egi"
,
cred
);
}
if
(
cred
instanceof
ExoGENICredential
)
{
userCredential
.
cloudAccess
.
put
(
"e
g
i"
,
cred
);
if
(
cred
instanceof
ExoGENICredential
)
{
userCredential
.
cloudAccess
.
put
(
"e
xogen
i"
,
cred
);
}
}
return
userCredential
;
...
...
@@ -641,7 +644,7 @@ public class Consumer extends DefaultConsumer {
paramValue
+=
sub
.
userName
+
" "
;
// paramValue += tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa";
paramValue
+=
vm
.
role
+
"\n"
;
}
}
// else if (vm == null || !sub.status.equals("running")) {
// throw new Exception("A VM failed to start. Deleteing all topology");
// }
...
...
drip_planner2/src/planner/dum_planner.py
View file @
6c746bf4
...
...
@@ -113,8 +113,8 @@ class DumpPlanner:
host
[
'disk_size'
]
=
'10GB'
vm
[
'host'
]
=
host
os
=
{}
os
[
'os_version'
]
=
1
6
.04
os
[
'distribution'
]
=
'
u
buntu'
os
[
'os_version'
]
=
1
4
.04
os
[
'distribution'
]
=
'
U
buntu'
os
[
'type'
]
=
'linux'
os
[
'architecture'
]
=
'x86_64'
vm
[
'os'
]
=
os
...
...
@@ -145,8 +145,8 @@ class DumpPlanner:
vm
[
'host'
]
=
host
if
'os'
not
in
vm
:
os
=
{}
os
[
'os_version'
]
=
1
6
.04
os
[
'distribution'
]
=
'
u
buntu'
os
[
'os_version'
]
=
1
4
.04
os
[
'distribution'
]
=
'
U
buntu'
os
[
'type'
]
=
'linux'
os
[
'architecture'
]
=
'x86_64'
vm
[
'os'
]
=
os
...
...
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