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
483fa864
Commit
483fa864
authored
Mar 20, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed status. It is now set as current state
parent
98c7bd7a
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
106 additions
and
186 deletions
+106
-186
.nodes.yaml.kate-swp
TOSCA/types/.nodes.yaml.kate-swp
+0
-0
nodes.yaml
TOSCA/types/nodes.yaml
+4
-0
ToscaHelper.java
.../main/java/nl/uva/sne/drip/commons/utils/ToscaHelper.java
+0
-10
ToscaHelperTest.java
...t/java/nl/uva/sne/drip/commons/utils/ToscaHelperTest.java
+0
-19
DRIPService.java
...er/src/main/java/nl/uva/sne/drip/service/DRIPService.java
+0
-1
CloudStormService.java
...n/java/nl/uva/sne/drip/provisioner/CloudStormService.java
+1
-1
CloudStormServiceTest.java
...va/nl/uva/sne/drip/provisioner/CloudStormServiceTest.java
+101
-155
No files found.
TOSCA/types/.nodes.yaml.kate-swp
deleted
100644 → 0
View file @
98c7bd7a
File deleted
TOSCA/types/nodes.yaml
View file @
483fa864
...
...
@@ -155,6 +155,10 @@ node_types:
ssh_keys
:
type
:
tosca.datatypes.ARTICONF.Credential
required
:
false
artifacts
:
provisioned_files
:
type
:
string
required
:
false
interfaces
:
CloudsStorm
:
type
:
tosca.interfaces.ARTICONF.CloudsStorm
...
...
commons/src/main/java/nl/uva/sne/drip/commons/utils/ToscaHelper.java
View file @
483fa864
...
...
@@ -290,16 +290,6 @@ public class ToscaHelper {
return
"vm_user"
;
}
public
CloudsStormSubTopology
.
StatusEnum
getVMTopologyTemplateStatus
(
NodeTemplateMap
nodeTemplateMap
)
throws
TypeExeption
{
NodeTemplate
nodeTemplate
=
nodeTemplateMap
.
getNodeTemplate
();
if
(
nodeTemplate
.
getType
().
equals
(
VM_TOPOLOGY
))
{
String
status
=
(
String
)
nodeTemplate
.
getAttributes
().
get
(
"status"
);
return
CloudsStormSubTopology
.
StatusEnum
.
fromValue
(
status
);
}
else
{
throw
new
TypeExeption
(
"NodeTemplateMap is not of type: "
+
VM_TOPOLOGY
+
" it is of type: "
+
nodeTemplate
.
getType
());
}
}
public
NODE_STATES
getNodeCurrentState
(
NodeTemplateMap
node
)
{
return
getNodeState
(
node
,
"current_state"
);
}
...
...
commons/src/test/java/nl/uva/sne/drip/commons/utils/ToscaHelperTest.java
View file @
483fa864
...
...
@@ -420,25 +420,6 @@ public class ToscaHelperTest {
}
}
/**
* Test of getVMTopologyTemplateStatus method, of class ToscaHelper.
*/
@Test
public
void
testGetVMTopologyTemplateStatus
()
throws
Exception
{
if
(
serviceUp
)
{
System
.
out
.
println
(
"getVMTopologyTemplateStatus"
);
toscaTemplateWithCredentials
=
null
;
instance
.
uploadToscaTemplate
(
provisionedToscaTemplate
);
List
<
NodeTemplateMap
>
vmTopologies
=
instance
.
getVMTopologyTemplates
();
for
(
NodeTemplateMap
vmTopology
:
vmTopologies
)
{
CloudsStormSubTopology
.
StatusEnum
status
=
instance
.
getVMTopologyTemplateStatus
(
vmTopology
);
assertEquals
(
CloudsStormSubTopology
.
StatusEnum
.
RUNNING
,
status
);
}
}
}
/**
* Test of getKeyPairsFromVM method, of class ToscaHelper.
...
...
manager/src/main/java/nl/uva/sne/drip/service/DRIPService.java
View file @
483fa864
...
...
@@ -160,7 +160,6 @@ public class DRIPService {
if
(
nodeNames
==
null
||
nodeNames
.
isEmpty
())
{
List
<
NodeTemplateMap
>
vmTopologies
=
helper
.
getVMTopologyTemplates
();
for
(
NodeTemplateMap
vmTopology
:
vmTopologies
)
{
CloudsStormSubTopology
.
StatusEnum
status
=
helper
.
getVMTopologyTemplateStatus
(
vmTopology
);
toscaTemplate
=
setDesieredSate
(
toscaTemplate
,
vmTopologies
,
NODE_STATES
.
DELETED
);
}
return
execute
(
toscaTemplate
,
provisionerQueueName
);
...
...
provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java
View file @
483fa864
...
...
@@ -113,7 +113,7 @@ class CloudStormService {
}
public
ToscaTemplate
execute
()
throws
FileNotFoundException
,
JSchException
,
IOException
,
ApiException
,
Exception
{
String
tempInputDirPath
=
System
.
getProperty
(
"java.io.tmpdir"
)
+
File
.
separator
+
"Input-"
+
Long
.
toString
(
System
.
nanoTime
())
+
File
.
separator
;
File
tempInputDir
=
new
File
(
tempInputDirPath
);
if
(!(
tempInputDir
.
mkdirs
()))
{
...
...
provisioner/src/test/java/nl/uva/sne/drip/provisioner/CloudStormServiceTest.java
View file @
483fa864
This diff is collapsed.
Click to expand it.
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