Skip to content

Commit 1fe4b84

Browse files
juancadavidjuancadavid
committed
Merge remote-tracking branch 'origin/main' into toscaCodeGen
1 parent 909336e commit 1fe4b84

File tree

6 files changed

+154
-147
lines changed

6 files changed

+154
-147
lines changed

‎ToscaDesigner/Generated TOSCA files/MyrtusSmartTrafficManagementTopologyTemplate.tosca‎

Lines changed: 124 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -18,133 +18,129 @@ topology_template:
1818
default: '25'
1919
groups:
2020
compute_nodes:
21-
node_templates:
22-
cloud_instance_1:
23-
type: .CloudInstance
24-
properties:
25-
memory: "128 GB DDR4"
26-
storageCapacity: "4000 GB SSD"
27-
processingCapabilities: "Intel Xeon Platinum 8358, 32 cores @ 2.60 GHz"
28-
maxNetworkBandwidth: "10 Gbps"
29-
highCpuThreshold: "0.7"
30-
fog_node_1:
31-
type: .FogNode
32-
properties:
33-
processingCapabilities: "Intel Xeon E-2224, 4 cores @ 3.40 GHz"
34-
memory: "16 GB DDR4"
35-
maxNetworkBandwidth: "1 Gbps"
36-
storageCapacity: "500 GB SSD"
37-
highCpuThreshold: "0.8"
38-
basic_edge_camera_1:
39-
type: .EdgeCamera
40-
properties:
41-
processingCapability: "ARM Cortex-A73, Quad-core 1.4 GHz"
42-
memory: "2 GB LPDDR4"
43-
maxNetworkBandwidth: "100 Mbps"
44-
cameraSensorSpec: "1/2.8-inch CMOS, 12 MP, 4K@30fps"
45-
location: "Intersection of Main St. and 1st Ave."
46-
maxPowerConsumptionThreshold: "11.5W"
47-
minPowerConsumptionThreshold: "3.5W"
48-
baselineAveragePowerConsumption: "4.5W"
49-
highCpuThreshold: "0.7"
50-
currentCpuUtilization: ""
51-
currentFrameRate: ""
52-
currentPowerConsumption: ""
53-
basic_edge_camera_2:
54-
type: .EdgeCamera
55-
properties:
56-
processingCapability: "ARM Cortex-A73, Quad-core 1.4 GHz"
57-
memory: "2 GB LPDDR4"
58-
maxNetworkBandwidth: "100 Mbps"
59-
cameraSensorSpec: "1/2.8-inch CMOS, 12 MP, 4K@30fps"
60-
location: "Intersection of Main St. and 1st Ave."
61-
baselineAveragePowerConsumption: "4.5W"
62-
minPowerConsumptionThreshold: "3.5W"
63-
maxPowerConsumptionThreshold: "11.5W"
64-
highCpuThreshold: "0.7"
65-
currentPowerConsumption: ""
66-
currentCpuUtilization: ""
67-
currentFrameRate: ""
68-
advanced_edge_camera_1:
69-
type: .EdgeCamera
70-
properties:
71-
processingCapability: "NVIDIA Jetson TX2"
72-
memory: "4 GB LPDDR4"
73-
maxNetworkBandwidth: "1 Gbps"
74-
cameraSensorSpec: "1/1.8-inch CMOS, 20 MP, 4K@60fps"
75-
location: "Intersection of Main St. and 1st Ave."
76-
maxPowerConsumptionThreshold: "20W"
77-
minPowerConsumptionThreshold: "5W"
78-
baselineAveragePowerConsumption: "8W"
79-
highCpuThreshold: "0.8"
80-
currentCpuUtilization: ""
81-
currentFrameRate: ""
82-
currentPowerConsumption: ""
83-
advanced_edge_camera_2:
84-
type: .EdgeCamera
85-
properties:
86-
processingCapability: "NVIDIA Jetson TX2"
87-
minPowerConsumptionThreshold: "5W"
88-
maxNetworkBandwidth: "1 Gbps"
89-
location: "Intersection of Main St. and 1st Ave."
90-
memory: "4 GB LPDDR4"
91-
cameraSensorSpec: "1/1.8-inch CMOS, 20 MP, 4K@60fps"
92-
maxPowerConsumptionThreshold: "20W"
93-
baselineAveragePowerConsumption: "8W"
94-
highCpuThreshold: "0.8"
95-
currentCpuUtilization: ""
96-
currentFrameRate: ""
97-
currentPowerConsumption: ""
21+
node_templates:
22+
cloud_instance_1:
23+
type: .CloudInstance
24+
properties:
25+
memory: "128 GB DDR4"
26+
storageCapacity: "4000 GB SSD"
27+
processingCapabilities: "Intel Xeon Platinum 8358, 32 cores @ 2.60 GHz"
28+
maxNetworkBandwidth: "10 Gbps"
29+
highCpuThreshold: "0.7"
30+
fog_node_1:
31+
type: .FogNode
32+
properties:
33+
processingCapabilities: "Intel Xeon E-2224, 4 cores @ 3.40 GHz"
34+
memory: "16 GB DDR4"
35+
maxNetworkBandwidth: "1 Gbps"
36+
storageCapacity: "500 GB SSD"
37+
highCpuThreshold: "0.8"
38+
basic_edge_camera_1:
39+
type: .EdgeCamera
40+
properties:
41+
processingCapability: "ARM Cortex-A73, Quad-core 1.4 GHz"
42+
memory: "2 GB LPDDR4"
43+
maxNetworkBandwidth: "100 Mbps"
44+
cameraSensorSpec: "1/2.8-inch CMOS, 12 MP, 4K@30fps"
45+
location: "Intersection of Main St. and 1st Ave."
46+
maxPowerConsumptionThreshold: "11.5W"
47+
minPowerConsumptionThreshold: "3.5W"
48+
baselineAveragePowerConsumption: "4.5W"
49+
highCpuThreshold: "0.7"
50+
basic_edge_camera_2:
51+
type: .EdgeCamera
52+
properties:
53+
processingCapability: "ARM Cortex-A73, Quad-core 1.4 GHz"
54+
memory: "2 GB LPDDR4"
55+
maxNetworkBandwidth: "100 Mbps"
56+
cameraSensorSpec: "1/2.8-inch CMOS, 12 MP, 4K@30fps"
57+
location: "Intersection of Main St. and 1st Ave."
58+
baselineAveragePowerConsumption: "4.5W"
59+
minPowerConsumptionThreshold: "3.5W"
60+
maxPowerConsumptionThreshold: "11.5W"
61+
highCpuThreshold: "0.7"
62+
advanced_edge_camera_1:
63+
type: .EdgeCamera
64+
properties:
65+
processingCapability: "NVIDIA Jetson TX2"
66+
memory: "4 GB LPDDR4"
67+
maxNetworkBandwidth: "1 Gbps"
68+
cameraSensorSpec: "1/1.8-inch CMOS, 20 MP, 4K@60fps"
69+
location: "Intersection of Main St. and 1st Ave."
70+
maxPowerConsumptionThreshold: "20W"
71+
minPowerConsumptionThreshold: "5W"
72+
baselineAveragePowerConsumption: "8W"
73+
highCpuThreshold: "0.8"
74+
advanced_edge_camera_2:
75+
type: .EdgeCamera
76+
properties:
77+
processingCapability: "NVIDIA Jetson TX2"
78+
minPowerConsumptionThreshold: "5W"
79+
maxNetworkBandwidth: "1 Gbps"
80+
location: "Intersection of Main St. and 1st Ave."
81+
memory: "4 GB LPDDR4"
82+
cameraSensorSpec: "1/1.8-inch CMOS, 20 MP, 4K@60fps"
83+
maxPowerConsumptionThreshold: "20W"
84+
baselineAveragePowerConsumption: "8W"
85+
highCpuThreshold: "0.8"
9886
software_component_nodes:
99-
node_templates:
100-
object_detection_1:
101-
type: .object_detection
102-
properties:
103-
dockerImage: "dockerHub/objectDetection"
104-
requirements:
105-
- host:
106-
node: basic_edge_camera_1
107-
relationship:
108-
capability:
109-
properties:
110-
processingRequirement: "0.4" memoryRequirement: "250MB" object_tracking_1:
111-
type: .object_tracking
112-
properties:
113-
dockerImage: "dockerHub/objectTracking"
114-
requirements:
115-
- host:
116-
node: basic_edge_camera_1
117-
relationship:
118-
capability:
119-
properties:
120-
processingRequirement: "0.5" memoryRequirement: "300MB" image_processing_1:
121-
type: .image_processing
122-
properties:
123-
dockerImage: "dockerHub/imageProcessing"
124-
requirements:
125-
- host:
126-
node: fog_node_1
127-
relationship:
128-
capability:
129-
properties:
130-
processingRequirement: "0.4" memoryRequirement: "250MB" traffic_data_analysis_1:
131-
type: .traffic_data_analysis
132-
properties:
133-
dockerImage: "dockerHub/trafficDataAnalysis"
134-
requirements:
135-
- host:
136-
node: cloud_instance_1
137-
relationship:
138-
capability:
139-
properties:
140-
memoryRequirement: "0.7" processingRequirement: "700MB" digital_signature_verification_1:
141-
type: .security_countermeasure
142-
encryption_decryption_1:
143-
type: .security_countermeasure
144-
key_exchange_mechanism_1:
145-
type: .security_countermeasure
146-
ai_malware_mechanism_1:
147-
type: .security_countermeasure
148-
side_channel_secure_library_1:
149-
type: .security_countermeasure
87+
node_templates:
88+
object_detection_1:
89+
type: .object_detection
90+
properties:
91+
dockerImage: "dockerHub/objectDetection"
92+
requirements:
93+
- host:
94+
node: basic_edge_camera_1
95+
relationship:
96+
capability:
97+
properties:
98+
processingRequirement: "0.4"
99+
memoryRequirement: "250MB"
100+
object_tracking_1:
101+
type: .object_tracking
102+
properties:
103+
dockerImage: "dockerHub/objectTracking"
104+
requirements:
105+
- host:
106+
node: basic_edge_camera_1
107+
relationship:
108+
capability:
109+
properties:
110+
processingRequirement: "0.5"
111+
memoryRequirement: "300MB"
112+
image_processing_1:
113+
type: .image_processing
114+
properties:
115+
dockerImage: "dockerHub/imageProcessing"
116+
requirements:
117+
- host:
118+
node: fog_node_1
119+
relationship:
120+
capability:
121+
properties:
122+
processingRequirement: "0.4"
123+
memoryRequirement: "250MB"
124+
traffic_data_analysis_1:
125+
type: .traffic_data_analysis
126+
properties:
127+
dockerImage: "dockerHub/trafficDataAnalysis"
128+
requirements:
129+
- host:
130+
node: cloud_instance_1
131+
relationship:
132+
capability:
133+
properties:
134+
memoryRequirement: "0.7"
135+
processingRequirement: "700MB"
136+
digital_signature_verification_1:
137+
type: .security_countermeasure
138+
encryption_decryption_1:
139+
type: .security_countermeasure
140+
key_exchange_mechanism_1:
141+
type: .security_countermeasure
142+
ai_malware_mechanism_1:
143+
type: .security_countermeasure
144+
side_channel_secure_library_1:
145+
type: .security_countermeasure
150146
relationship_templates:

‎ToscaDesigner/src/main/resources/fr/softeam/templates/TGroup.hbs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{{name}}:
22
{{#unless (noStereotypeApplications this "TNodeTemplate")}}node_templates:{{/unless}}
3-
{{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}{{> (lookup this.name) ../this}}{{/eq}}{{/extension}}{{/ownedElement}}
3+
{{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}{{> (lookup this.name) ../this}}
4+
{{/eq}}{{/extension}}{{/ownedElement}}

‎ToscaDesigner/src/main/resources/fr/softeam/templates/TNodeTemplate.hbs‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,19 @@
99
{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TPropertyDef"}}
1010
{{../name}}: "{{../value}}"
1111
{{/eq}}{{/extension}}{{/each}}
12-
{{/unless}}{{#unless (noStereotypeApplications this "RequirementsType")}}
12+
{{/unless}}
13+
{{#unless (noStereotypeApplications this "RequirementsType")}}
1314
requirements:
1415
{{#each ../ownedElement}}{{#extension}}{{#eq name "RequirementsType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TRequirement"}}
15-
- {{../name}}:
16-
node: {{getProperty ../this "node"}}
17-
relationship: {{getProperty ../this "relationship"}}
18-
capability: {{getProperty ../this "capability"}}
19-
{{#unless (noStereotypeApplications ../this "TPropertyDef")}}
20-
properties:
21-
{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TPropertyDef"}}
22-
{{../name}}: "{{../value}}"
23-
{{~/eq}}{{/extension}}{{/each}}
24-
{{/unless}}
16+
{{> (lookup this.name) ../this}}
2517
{{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}
26-
{{/unless}}{{#unless (noStereotypeApplications this "TDeploymentArtifacts")}}
18+
{{/unless}}
19+
{{#unless (noStereotypeApplications this "TDeploymentArtifacts")}}
2720
artifacts:
2821
{{#each ../ownedElement}}{{#extension}}{{#eq name "TDeploymentArtifacts"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TDeploymentArtifact"}}
2922
{{../name}}:
3023
type: {{getProperty ../this "type"}}
3124
deploy_path: {{getProperty ../this "deploy_path"}}
3225
file: {{getProperty ../this "file"}}
3326
{{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}
34-
{{/unless}}
27+
{{/unless}}

‎ToscaDesigner/src/main/resources/fr/softeam/templates/TPolicy.hbs‎

Whitespace-only changes.

‎ToscaDesigner/src/main/resources/fr/softeam/templates/TRequirement.hbs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- {{name}}:
2+
node: {{getProperty this "node"}}
3+
relationship: {{getProperty this "relationship"}}
4+
capability: {{getProperty this "capability"}}
5+
{{#unless (noStereotypeApplications this "TPropertyDef")}}properties:
6+
{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TPropertyDef"}}
7+
{{../name}}: "{{../value}}"
8+
{{/eq}}{{/extension}}{{/each}}
9+
{{/unless}}

‎ToscaDesigner/src/main/resources/fr/softeam/templates/TTopologyTemplate.hbs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,24 @@ topology_template:
1111
{{/eq}}{{/extension}}{{/ownedAttribute}}{{/eq}}{{/extension}}{{/ownedElement}}
1212
{{/unless}}{{#unless (noStereotypeApplications this "TNodeTemplate")}}
1313
node_templates:
14-
{{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}
14+
{{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}
1515
{{> (lookup this.name) ../this}}
16-
{{/eq}}{{/extension}}{{/ownedElement}}{{/unless}}{{#unless (noStereotypeApplications this "TGroup")}}
16+
{{/eq}}{{/extension}}{{/ownedElement}}
17+
{{/unless}}
18+
{{#unless (noStereotypeApplications this "TGroup")}}
1719
groups:
1820
{{#ownedElement}}{{#extension}}{{#eq name "TGroup"}}
1921
{{> (lookup this.name) ../this}}
2022
{{/eq}}{{/extension}}{{/ownedElement}}
21-
{{/unless}}
23+
{{/unless}}
2224
relationship_templates:
23-
{{#ownedElement}}{{#targetingEnd}}{{#association}}{{#extension}}{{#eq name "TRelationshipTemplate"}}
25+
{{#ownedElement}}{{#targetingEnd}}{{#association}}{{#extension}}{{#eq name "TRelationshipTemplate"}}
2426
{{../name}}:
2527
type: {{getProperty ../this "type"}}
26-
{{/eq}}{{/extension}}{{/association}}{{/targetingEnd}}{{/ownedElement}}
28+
{{/eq}}{{/extension}}{{/association}}{{/targetingEnd}}{{/ownedElement}}
29+
{{#unless (noStereotypeApplications this "PoliciesType")}}
30+
policies:
31+
{{#ownedElement}}{{#extension}}{{#eq name "PoliciesType"}}{{#ownedElement}}{{#extension}}{{#eq name "TPolicy"}}
32+
{{> (lookup this.name) ../this}}
33+
{{/eq}}{{/extension}}{{/ownedElement}}{{/eq}}{{/extension}}{{/ownedElement}}
34+
{{/unless}}

0 commit comments

Comments
 (0)