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
af86bc77
Commit
af86bc77
authored
Apr 16, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added dummy keys to pass tests
parent
467f35da
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
32 deletions
+37
-32
message_delete_request.json
example_messages/message_delete_request.json
+8
-8
message_delete_response.json
example_messages/message_delete_response.json
+8
-8
message_deploy_request.json
example_messages/message_deploy_request.json
+8
-8
message_example_provisioned.json
example_messages/message_example_provisioned.json
+8
-8
CloudStormService.java
...n/java/nl/uva/sne/drip/provisioner/CloudStormService.java
+1
-0
CloudStormServiceTest.java
...va/nl/uva/sne/drip/provisioner/CloudStormServiceTest.java
+4
-0
No files found.
example_messages/message_delete_request.json
View file @
af86bc77
This diff is collapsed.
Click to expand it.
example_messages/message_delete_response.json
View file @
af86bc77
This diff is collapsed.
Click to expand it.
example_messages/message_deploy_request.json
View file @
af86bc77
This diff is collapsed.
Click to expand it.
example_messages/message_example_provisioned.json
View file @
af86bc77
...
...
@@ -22,8 +22,8 @@
"user_key_pair"
:
{
"protocol"
:
"ssh"
,
"keys"
:
{
"public_key"
:
"
XXXXXXXXXXXXXXXXXXX
"
,
"private_key"
:
"
XXXXXXXXXXX
"
"public_key"
:
"
c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFBZ1FDYUVhemZ3c003cEc4MTRnUnpaRktHeUxCcVlzVXlSNEd2SXVBQ3d0dmpQN3hDNGVZMDloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGdMbUR2OHJSU3g1TytkU1lycjdWNGs3L1VJdWxMYlhEb2p6T3NZYkpjYlZlODRGM0tnTGJTcG4yeDJRPT0gZ2VuZXJhdGVkIHVzZXIgYWNjZWVzIGtleXMK
"
,
"private_key"
:
"
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUNhRWF6ZndzTTdwRzgxNGdSelpGS0d5TEJxWXNVeVI0R3ZJdUFDd3R2alA3eEM0ZVkwCjloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGcKTG1EdjhyUlN4NU8rZFNZcnI3VjRrNy9VSXVsTGJYRG9qek9zWWJKY2JWZTg0RjNLZ0xiU3BuMngyUUlEQVFBQgpBbjhyVk0xS0lYekhTWGY5cjVPUTRLWlZRaHhiejJ1bXVIWEF6QTQwdUprZlVNMmlBZWE4L25qbWRpL2NxdFJZCnNBRWZzdXowQkV2Z3IrUjBKREJtUmxIQWRKckJ0Tyt6b3VTVVJVekQzQVBCOGd3VTJIVWNXL1EzeFVZZWQvOWoKV3RDNDVma2hUc1NGN08wK2sxTDY0UnpESWc1YW53N0Z3ZDc5OFpCdVk3Z0JBa0VBem8yM2tCYVpIZ1BiZmx1UgpvbGcvUUxBTlZYeDZTMFIzaUxJWWlEc0lVclk4RjdvbEFDNm12VGxaZ2xpendqWXRPNDlsODllTjJsOFZHZUtNCkdJYnpJUUpCQUw3emlIblNXTGIxYUVTOHNzUWZhclZrMytzRGxNTGhoNTJYOUEwbmNWTjk0bU83T2JCZ0FFUVcKYzdBdkhyNXdqSCtyNWRnSmN6eVlmU3YyZjV1bkg3a0NRUUNOV2R4QnhjVTVEaWk2T3czWnpJeFV4MllJbDJ2VgpjR0JnOG9mcFNvU3luYlZZQTNIb3d3UW1RRVhwOXF2bGYwL0xENklVa2ZHb2ZDTWptSzZJNW1raEFrRUFrUml1CndKcmtqSW5uNUN0YXo0cHI1RkExa2ZnVHB3NEdwZXFjS1E2cW4xM05sQ2psU2k5NHBFUkhQajVmNXlmUXF3YnMKelA5SlVHY3kzaUFka1NJcUNRSkFZc29JUHZZZStjMUZlbkdtWjZFZDl0VjM5QzFNRjhOWGQ5dnFYWmJLazdvZwp2OGZtaGtnRVlVc0ZnbW13NzZiRllOMFNQVkVlbk1INUh1MEQwcnZKUFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
"
}
},
"public_ip"
:
"3.124.193.148"
,
...
...
@@ -32,8 +32,8 @@
"root_key_pair"
:
{
"protocol"
:
"ssh"
,
"keys"
:
{
"public_key"
:
"
XXXXXXXXXXXXXXXXXXX
"
,
"private_key"
:
"
XXXXXXXXXXXXXXX
"
"public_key"
:
"
c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFBZ1FDYUVhemZ3c003cEc4MTRnUnpaRktHeUxCcVlzVXlSNEd2SXVBQ3d0dmpQN3hDNGVZMDloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGdMbUR2OHJSU3g1TytkU1lycjdWNGs3L1VJdWxMYlhEb2p6T3NZYkpjYlZlODRGM0tnTGJTcG4yeDJRPT0gZ2VuZXJhdGVkIHVzZXIgYWNjZWVzIGtleXMK
"
,
"private_key"
:
"
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUNhRWF6ZndzTTdwRzgxNGdSelpGS0d5TEJxWXNVeVI0R3ZJdUFDd3R2alA3eEM0ZVkwCjloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGcKTG1EdjhyUlN4NU8rZFNZcnI3VjRrNy9VSXVsTGJYRG9qek9zWWJKY2JWZTg0RjNLZ0xiU3BuMngyUUlEQVFBQgpBbjhyVk0xS0lYekhTWGY5cjVPUTRLWlZRaHhiejJ1bXVIWEF6QTQwdUprZlVNMmlBZWE4L25qbWRpL2NxdFJZCnNBRWZzdXowQkV2Z3IrUjBKREJtUmxIQWRKckJ0Tyt6b3VTVVJVekQzQVBCOGd3VTJIVWNXL1EzeFVZZWQvOWoKV3RDNDVma2hUc1NGN08wK2sxTDY0UnpESWc1YW53N0Z3ZDc5OFpCdVk3Z0JBa0VBem8yM2tCYVpIZ1BiZmx1UgpvbGcvUUxBTlZYeDZTMFIzaUxJWWlEc0lVclk4RjdvbEFDNm12VGxaZ2xpendqWXRPNDlsODllTjJsOFZHZUtNCkdJYnpJUUpCQUw3emlIblNXTGIxYUVTOHNzUWZhclZrMytzRGxNTGhoNTJYOUEwbmNWTjk0bU83T2JCZ0FFUVcKYzdBdkhyNXdqSCtyNWRnSmN6eVlmU3YyZjV1bkg3a0NRUUNOV2R4QnhjVTVEaWk2T3czWnpJeFV4MllJbDJ2VgpjR0JnOG9mcFNvU3luYlZZQTNIb3d3UW1RRVhwOXF2bGYwL0xENklVa2ZHb2ZDTWptSzZJNW1raEFrRUFrUml1CndKcmtqSW5uNUN0YXo0cHI1RkExa2ZnVHB3NEdwZXFjS1E2cW4xM05sQ2psU2k5NHBFUkhQajVmNXlmUXF3YnMKelA5SlVHY3kzaUFka1NJcUNRSkFZc29JUHZZZStjMUZlbkdtWjZFZDl0VjM5QzFNRjhOWGQ5dnFYWmJLazdvZwp2OGZtaGtnRVlVc0ZnbW13NzZiRllOMFNQVkVlbk1INUh1MEQwcnZKUFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
"
}
},
"host_name"
:
"vm0"
...
...
@@ -57,8 +57,8 @@
"user_key_pair"
:
{
"protocol"
:
"ssh"
,
"keys"
:
{
"public_key"
:
"
XXXXXXXXXXXXXXXXXXXX
"
,
"private_key"
:
"
XXXXXXXXXXXXXXX
"
"public_key"
:
"
cHVibGljS2V5LTVhMDU5ZDE3LTQwZDEtNGE4ZC04MDI4LTQzOGEyNTE3MjczMQ==
"
,
"private_key"
:
"
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUNhRWF6ZndzTTdwRzgxNGdSelpGS0d5TEJxWXNVeVI0R3ZJdUFDd3R2alA3eEM0ZVkwCjloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGcKTG1EdjhyUlN4NU8rZFNZcnI3VjRrNy9VSXVsTGJYRG9qek9zWWJKY2JWZTg0RjNLZ0xiU3BuMngyUUlEQVFBQgpBbjhyVk0xS0lYekhTWGY5cjVPUTRLWlZRaHhiejJ1bXVIWEF6QTQwdUprZlVNMmlBZWE4L25qbWRpL2NxdFJZCnNBRWZzdXowQkV2Z3IrUjBKREJtUmxIQWRKckJ0Tyt6b3VTVVJVekQzQVBCOGd3VTJIVWNXL1EzeFVZZWQvOWoKV3RDNDVma2hUc1NGN08wK2sxTDY0UnpESWc1YW53N0Z3ZDc5OFpCdVk3Z0JBa0VBem8yM2tCYVpIZ1BiZmx1UgpvbGcvUUxBTlZYeDZTMFIzaUxJWWlEc0lVclk4RjdvbEFDNm12VGxaZ2xpendqWXRPNDlsODllTjJsOFZHZUtNCkdJYnpJUUpCQUw3emlIblNXTGIxYUVTOHNzUWZhclZrMytzRGxNTGhoNTJYOUEwbmNWTjk0bU83T2JCZ0FFUVcKYzdBdkhyNXdqSCtyNWRnSmN6eVlmU3YyZjV1bkg3a0NRUUNOV2R4QnhjVTVEaWk2T3czWnpJeFV4MllJbDJ2VgpjR0JnOG9mcFNvU3luYlZZQTNIb3d3UW1RRVhwOXF2bGYwL0xENklVa2ZHb2ZDTWptSzZJNW1raEFrRUFrUml1CndKcmtqSW5uNUN0YXo0cHI1RkExa2ZnVHB3NEdwZXFjS1E2cW4xM05sQ2psU2k5NHBFUkhQajVmNXlmUXF3YnMKelA5SlVHY3kzaUFka1NJcUNRSkFZc29JUHZZZStjMUZlbkdtWjZFZDl0VjM5QzFNRjhOWGQ5dnFYWmJLazdvZwp2OGZtaGtnRVlVc0ZnbW13NzZiRllOMFNQVkVlbk1INUh1MEQwcnZKUFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
"
}
},
"public_ip"
:
"18.197.132.48"
,
...
...
@@ -67,8 +67,8 @@
"root_key_pair"
:
{
"protocol"
:
"ssh"
,
"keys"
:
{
"public_key"
:
"
XXXXXXXXXXXX
"
,
"private_key"
:
"
XXXXXXXXXXXXX
"
"public_key"
:
"
cHVibGljS2V5LTVhMDU5ZDE3LTQwZDEtNGE4ZC04MDI4LTQzOGEyNTE3MjczMQ==
"
,
"private_key"
:
"
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUNhRWF6ZndzTTdwRzgxNGdSelpGS0d5TEJxWXNVeVI0R3ZJdUFDd3R2alA3eEM0ZVkwCjloVDFHVEx0dER4K1NGdkdEbVhmeTQzWTFJUU9WNTVlRitPbjNQNXk3Ris2K3FTeWtPTVBvaUQ0Q3JpVCswNGcKTG1EdjhyUlN4NU8rZFNZcnI3VjRrNy9VSXVsTGJYRG9qek9zWWJKY2JWZTg0RjNLZ0xiU3BuMngyUUlEQVFBQgpBbjhyVk0xS0lYekhTWGY5cjVPUTRLWlZRaHhiejJ1bXVIWEF6QTQwdUprZlVNMmlBZWE4L25qbWRpL2NxdFJZCnNBRWZzdXowQkV2Z3IrUjBKREJtUmxIQWRKckJ0Tyt6b3VTVVJVekQzQVBCOGd3VTJIVWNXL1EzeFVZZWQvOWoKV3RDNDVma2hUc1NGN08wK2sxTDY0UnpESWc1YW53N0Z3ZDc5OFpCdVk3Z0JBa0VBem8yM2tCYVpIZ1BiZmx1UgpvbGcvUUxBTlZYeDZTMFIzaUxJWWlEc0lVclk4RjdvbEFDNm12VGxaZ2xpendqWXRPNDlsODllTjJsOFZHZUtNCkdJYnpJUUpCQUw3emlIblNXTGIxYUVTOHNzUWZhclZrMytzRGxNTGhoNTJYOUEwbmNWTjk0bU83T2JCZ0FFUVcKYzdBdkhyNXdqSCtyNWRnSmN6eVlmU3YyZjV1bkg3a0NRUUNOV2R4QnhjVTVEaWk2T3czWnpJeFV4MllJbDJ2VgpjR0JnOG9mcFNvU3luYlZZQTNIb3d3UW1RRVhwOXF2bGYwL0xENklVa2ZHb2ZDTWptSzZJNW1raEFrRUFrUml1CndKcmtqSW5uNUN0YXo0cHI1RkExa2ZnVHB3NEdwZXFjS1E2cW4xM05sQ2psU2k5NHBFUkhQajVmNXlmUXF3YnMKelA5SlVHY3kzaUFka1NJcUNRSkFZc29JUHZZZStjMUZlbkdtWjZFZDl0VjM5QzFNRjhOWGQ5dnFYWmJLazdvZwp2OGZtaGtnRVlVc0ZnbW13NzZiRllOMFNQVkVlbk1INUh1MEQwcnZKUFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
"
}
},
"host_name"
:
"vm1"
...
...
provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java
View file @
af86bc77
...
...
@@ -388,6 +388,7 @@ class CloudStormService {
for
(
NodeTemplateMap
nodeTemplateMap
:
vmTopologyTemplatesMap
)
{
List
<
NodeTemplateMap
>
vmTemplatesMap
=
getHelper
().
getTemplateVMsForVMTopology
(
nodeTemplateMap
);
for
(
NodeTemplateMap
vmMap
:
vmTemplatesMap
)
{
Logger
.
getLogger
(
CloudStormService
.
class
.
getName
()).
log
(
Level
.
INFO
,
"Getting ssh keys for: {0}"
,
vmMap
.
getName
())
;
keyPair
=
getHelper
().
getKeyPairsFromVM
(
vmMap
.
getNodeTemplate
());
break
;
}
...
...
provisioner/src/test/java/nl/uva/sne/drip/provisioner/CloudStormServiceTest.java
View file @
af86bc77
...
...
@@ -19,6 +19,7 @@ import java.nio.file.Files;
import
java.nio.file.Paths
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.logging.Level
;
import
static
nl
.
uva
.
sne
.
drip
.
commons
.
utils
.
Constants
.*;
import
nl.uva.sne.drip.commons.utils.Converter
;
import
nl.uva.sne.drip.commons.utils.ToscaHelper
;
...
...
@@ -45,6 +46,7 @@ import org.junit.Before;
import
org.junit.BeforeClass
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
import
java.util.logging.Logger
;
/**
*
...
...
@@ -124,6 +126,7 @@ public class CloudStormServiceTest {
}
private
CloudStormService
getService
(
String
messagefilePath
)
throws
IOException
,
JsonProcessingException
,
ApiException
{
Logger
.
getLogger
(
CloudStormServiceTest
.
class
.
getName
()).
log
(
Level
.
INFO
,
"Reterning CloudStormService for file: {0}"
,
new
File
(
messagefilePath
).
getAbsolutePath
());
Message
message
=
objectMapper
.
readValue
(
new
File
(
messagefilePath
),
Message
.
class
);
return
new
CloudStormService
(
RPCServer
.
getProp
(),
message
.
getToscaTemplate
());
}
...
...
@@ -217,6 +220,7 @@ public class CloudStormServiceTest {
CloudStormService
instance
=
getService
(
messageExampleProvisioneRequestFilePath
);
KeyPair
result
=
instance
.
getKeyPair
();
assertNull
(
result
);
instance
=
getService
(
messageExampleDeleteRequestFilePath
);
result
=
instance
.
getKeyPair
();
assertNotNull
(
result
);
...
...
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