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
4290235d
Commit
4290235d
authored
Oct 11, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
passed all tests
parent
a5d45408
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
117 additions
and
19 deletions
+117
-19
.gitignore
.gitignore
+2
-1
application_example_updated.yaml
TOSCA/application_example_updated.yaml
+84
-0
NOTES
docs/NOTES
+2
-2
pom.xml
drip-api/pom.xml
+2
-2
ToscaTemplateServiceTest.java
...ava/nl/uva/sne/drip/service/ToscaTemplateServiceTest.java
+5
-14
workspace.xml
drip_planner2/.idea/workspace.xml
+22
-0
No files found.
.gitignore
View file @
4290235d
...
...
@@ -32,4 +32,5 @@
/tosca_service/src/winery/__pycache__/
/drip-deployer/venv/
/drip/target/
/drip-manager/target/
\ No newline at end of file
/drip-manager/target/
/drip-manager/nbproject/
\ No newline at end of file
TOSCA/application_example_updated.yaml
0 → 100644
View file @
4290235d
tosca_definitions_version
:
tosca_simple_yaml_1_0
imports
:
-
nodes
:
https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/nodes.yaml
-
capabilities
:
https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/capabilities.yaml
-
policies
:
https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/policies.yaml
repositories
:
docker_hub
:
https://hub.docker.com/
description
:
>
TOSCA example
topology_template
:
node_templates
:
wordpress
:
type
:
tosca.nodes.ARTICONF.Container.Application.Docker
requirements
:
-
service
:
node
:
mysql
relationship
:
#type: tosca.relationships.ConnectsTo
type
:
tosca.relationships.DependsOn
artifacts
:
image
:
file
:
wordpress:latest
type
:
tosca.artifacts.Deployment.Image.Container.Docker
repository
:
docker_hub
properties
:
ports
:
-
"
8000:80"
environment
:
WORDPRESS_DB_HOST
:
mysql:3306
WORDPRESS_DB_USER
:
wordpress
WORDPRESS_DB_PASSWORD
:
wordpress
WORDPRESS_DB_NAME
:
wordpress
mysql
:
type
:
tosca.nodes.ARTICONF.Container.Application.Docker
properties
:
ports
:
-
"
3306:3306"
volumes
:
-
db_data:/var/lib/mysql
environment
:
MYSQL_ROOT_PASSWORD
:
somewordpress
MYSQL_DATABASE
:
wordpress
MYSQL_USER
:
wordpress
MYSQL_PASSWORD
:
wordpress
artifacts
:
image
:
type
:
tosca.artifacts.Deployment.Image.Container.Docker
file
:
mysql:5.7
repository
:
docker_hub
logspout
:
type
:
tosca.nodes.ARTICONF.Container.Application.Docker
properties
:
ports
:
-
"
8000:80"
volumes
:
-
/etc/hostname:/etc/host_hostname:ro
-
/var/run/docker.sock:/var/run/docker.sock
environment
:
publish
:
"
127.0.0.1:8000:80"
artifacts
:
image
:
type
:
tosca.artifacts.Deployment.Image.Container.Docker
file
:
gliderlabs/logspout:latest
repository
:
docker_hub
policies
:
-
scalability
:
type
:
tosca.policies.ARTICONF.Performance
targets
:
[
wordpress
]
docs/NOTES
View file @
4290235d
#-------------------------Dockers--------------------------------------------
docker run --hostname my-rabbit --name some-rabbit -p 127.0.0.1:15672:15672 -p 127.0.0.1:4369:4369 -p 127.0.0.1:5671-5672:5671-5672 -p 127.0.0.1:15671:15671 -d rabbitmq:3-management
docker run --name mongo-inst -p 127.0.0.1:27017:27017 -d mongo:
3
docker run --hostname my-rabbit --name some-rabbit -p 127.0.0.1:15672:15672 -p 127.0.0.1:4369:4369 -p 127.0.0.1:5671-5672:5671-5672 -p 127.0.0.1:15671:15671 -d rabbitmq:3
.8
-management
docker run --name mongo-inst -p 127.0.0.1:27017:27017 -d mongo:
4
docker run --name drip-inst -p 127.0.0.1:8080:8080 -d drip-manager
docker run --hostname my-proxy --name some-myproxy -p 7512:7512 -p 7513:7513 -p 10022:22 agaveapi/myproxy
...
...
drip-api/pom.xml
View file @
4290235d
...
...
@@ -169,8 +169,8 @@
<artifactId>
maven-compiler-plugin
</artifactId>
<version>
2.3.2
</version>
<configuration>
<source>
1.8
</source>
<target>
1.8
</target>
<source>
9
</source>
<target>
9
</target>
<compilerArguments>
<endorseddirs>
${endorsed.dir}
</endorseddirs>
</compilerArguments>
...
...
drip-manager/src/test/java/nl/uva/sne/drip/service/ToscaTemplateServiceTest.java
View file @
4290235d
...
...
@@ -150,25 +150,16 @@ public class ToscaTemplateServiceTest {
* Test of updateToscaTemplateByID method, of class ToscaTemplateService.
*/
@Test
public
void
testUpdateToscaTemplateByID_Exception_MultipartFile
()
{
public
void
testUpdateToscaTemplateByID_Exception_MultipartFile
()
throws
FileNotFoundException
,
IOException
{
FileInputStream
in
=
null
;
in
=
new
FileInputStream
(
testUpdatedApplicationExampleToscaFilePath
);
MultipartFile
file
=
new
MockMultipartFile
(
"file"
,
in
);
try
{
in
=
new
FileInputStream
(
testUpdatedApplicationExampleToscaFilePath
);
MultipartFile
file
=
new
MockMultipartFile
(
"file"
,
in
);
String
result
=
instance
.
updateToscaTemplateByID
(
"0"
,
file
);
}
catch
(
FileNotFoundException
ex
)
{
Logger
.
getLogger
(
ToscaTemplateServiceTest
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
}
catch
(
IOException
|
ApiException
ex
)
{
}
catch
(
Exception
ex
)
{
if
(!(
ex
instanceof
NoSuchElementException
))
{
fail
(
ex
.
getMessage
());
Logger
.
getLogger
(
ToscaTemplateServiceTest
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
}
}
finally
{
try
{
in
.
close
();
}
catch
(
IOException
ex
)
{
fail
(
ex
.
getMessage
());
Logger
.
getLogger
(
ToscaTemplateServiceTest
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
}
}
}
...
...
drip_planner2/.idea/workspace.xml
View file @
4290235d
...
...
@@ -2,6 +2,28 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"462ede19-adfe-472b-975e-fefefa973fe0"
name=
"Default Changelist"
comment=
"slolved cap error"
>
<change
beforePath=
"$PROJECT_DIR$/../docs/NOTES"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../docs/NOTES"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/nb-configuration.xml"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/Swagger2SpringBoot.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/Swagger2SpringBoot.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiException.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiException.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiOriginFilter.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiOriginFilter.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiResponseMessage.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/ApiResponseMessage.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/NotFoundException.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/NotFoundException.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/TopologTemplateApi.java"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/TopologTemplateApiController.java"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/UserApi.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/UserApi.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/UserApiController.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/api/UserApiController.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/CustomInstantDeserializer.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/CustomInstantDeserializer.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/MongoConfig.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/MongoConfig.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/SwaggerDocumentationConfig.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/configuration/SwaggerDocumentationConfig.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/dao/TopologTemplateDAO.java"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/ToscaTemplate.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/ToscaTemplate.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/User.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/model/User.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/service/TopologTemplateService.java"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/setuptools-40.8.0-py3.6.egg"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/setuptools-40.8.0-py3.6.egg"
afterDir=
"false"
/>
</list>
...
...
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