Skip to content

Commit 5154acf

Browse files
committed
Fixing identation problems in generated .tosca files
1 parent 31d6ed0 commit 5154acf

File tree

4 files changed

+339
-330
lines changed

4 files changed

+339
-330
lines changed

ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca

Lines changed: 60 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
tosca_definitions_version: tosca_simple_yaml_1_3
22

3-
3+
metadata:
4+
targetNamespace: "example.eu.myrtus.servicetemplates"
5+
name: "MyrtusFace_Application"
46
imports:
57
- file: MyrtusFaceDetectionService_0.tosca
68
namespace_uri: example.eu.myrtus.nodetypes
@@ -16,78 +18,66 @@ imports:
1618
namespace_prefix: MYRTUS-
1719

1820
topology_template:
19-
20-
node_templates:
21-
Myrtus_Workstation_1:
22-
type: example.eu.myrtus.nodetypes.Myrtus-Workstation
23-
metadata:
24-
displayName: "Myrtus-Workstation"
25-
26-
27-
28-
MyrtusFaceDetectionService_0:
29-
type: example.eu.myrtus.nodetypes.MyrtusFaceDetectionService
30-
metadata:
31-
displayName: "FaceDetection"
32-
properties:
33-
dockerImage: "thebigpotatoe/face-recognition-docker"
34-
requirements:
35-
- host:
36-
node: Myrtus_Workstation_1
37-
relationship: con_HostedOn_0
38-
capability: host
39-
40-
41-
Myrtus_Proxy_0:
42-
type: example.eu.myrtus.nodetypes.MyrtusProxy
43-
metadata:
44-
displayName: "Proxy"
45-
properties:
46-
dockerImage: "nginx:alpine"
47-
port: "443"
48-
requirements:
49-
- egress1:
50-
node: MyrtusCameraFeed_0
51-
relationship: con_ConnectsTo_0
52-
capability: CameraFeed.WebService
53-
54-
- egress2:
55-
node: MyrtusFaceDetectionService_0
56-
relationship: con_ConnectsTo_1
57-
capability: FaceDetectionService
58-
59-
- host:
60-
node: Myrtus_Workstation_1
61-
relationship: con_HostedOn_2
62-
capability: host
63-
64-
artifacts:
21+
node_templates:
22+
Myrtus_Workstation_1:
23+
type: example.eu.myrtus.nodetypes.Myrtus-Workstation
24+
metadata:
25+
displayName: "Myrtus-Workstation"
26+
MyrtusFaceDetectionService_0:
27+
type: example.eu.myrtus.nodetypes.MyrtusFaceDetectionService
28+
metadata:
29+
displayName: "FaceDetection"
30+
properties:
31+
dockerImage: "thebigpotatoe/face-recognition-docker"
32+
requirements:
33+
- host:
34+
node: Myrtus_Workstation_1
35+
relationship: con_HostedOn_0
36+
capability: host
37+
Myrtus_Proxy_0:
38+
type: example.eu.myrtus.nodetypes.MyrtusProxy
39+
metadata:
40+
displayName: "Proxy"
41+
properties:
42+
dockerImage: "nginx:alpine"
43+
port: "443"
44+
requirements:
45+
- egress1:
46+
node: MyrtusCameraFeed_0
47+
relationship: con_ConnectsTo_0
48+
capability: CameraFeed.WebService
49+
- egress2:
50+
node: MyrtusFaceDetectionService_0
51+
relationship: con_ConnectsTo_1
52+
capability: FaceDetectionService
53+
- host:
54+
node: Myrtus_Workstation_1
55+
relationship: con_HostedOn_2
56+
capability: host
57+
artifacts:
6558
fullchain.pem:
66-
type:
67-
deploy_path:
68-
file:
59+
type: File
60+
deploy_path: /certs/fullchain.pem
61+
file: /home/hesi/cert/fullchain.pem
6962
key:
70-
type:
71-
deploy_path:
72-
file:
63+
type: File
64+
deploy_path: /certs/privkey.pem
65+
file: /home/hesi/cert/privkey.pem
7366
nginx.conf:
74-
type:
75-
deploy_path:
76-
file:
77-
MyrtusCameraFeed_0:
78-
type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
79-
metadata:
80-
displayName: "CameraFeed"
81-
properties:
82-
dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
83-
requirements:
84-
- host:
85-
node: Myrtus_Workstation_1
86-
relationship: con_HostedOn_1
87-
capability: host
88-
89-
90-
67+
type: File
68+
deploy_path: /etc/nginx/conf.d/default.conf
69+
file: /servicetemplates/example.eu.myrtus.servicetemplates/MyrtusFace_Application_w1-wip2/files/MyrtusProxy_w1-wip1_0/nginx.conf/nginx.conf
70+
MyrtusCameraFeed_0:
71+
type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
72+
metadata:
73+
displayName: "CameraFeed"
74+
properties:
75+
dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
76+
requirements:
77+
- host:
78+
node: Myrtus_Workstation_1
79+
relationship: con_HostedOn_1
80+
capability: host
9181
relationship_templates:
9282
con_HostedOn_2:
9383
type: hostedOn

0 commit comments

Comments
 (0)