Skip to content

Commit e5316a3

Browse files
juancadavidjuancadavid
committed
Bug fixing in CSAR generation
1 parent 1fe4b84 commit e5316a3

File tree

14 files changed

+515
-206
lines changed

14 files changed

+515
-206
lines changed

‎ToscaDesigner/Generated TOSCA files/MobilityUseCase.csar‎

2.84 KB
Binary file not shown.

‎ToscaDesigner/Generated TOSCA files/MyrtusEdgeCamera.tosca‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
tosca_definitions_version: tosca_simple_yaml_1_3
2+
3+
imports:
4+
- file: .tosca
5+
namespace_uri:
6+
namespace_prefix: MYRTUS-
7+
8+
node_types:
9+
compute_nodes.EdgeCamera:
10+
11+
metadata:
12+
targetNamespace: ""
13+
abstract: ""
14+
final: ""
15+
properties:
16+
processingCapability:
17+
type: string
18+
description:
19+
20+
memory:
21+
type: string
22+
description:
23+
24+
networkBandwidth:
25+
type: string
26+
description:
27+
28+
cameraSensorSpec:
29+
type: string
30+
description:
31+
32+
location:
33+
type: string
34+
description:
35+
36+
cpuUtilization:
37+
type: float
38+
description:
39+
40+
frame_rate:
41+
type: integer
42+
description:
43+
44+
baselineAveragePowerConsumption:
45+
type: float
46+
description:
47+
48+
minPowerConsumptionThreshold:
49+
type: float
50+
description:
51+
52+
maxPowerConsumptionThreshold:
53+
type: float
54+
description:
55+
56+
lowPowerMode:
57+
type: boolean
58+
description:
59+
60+
61+
capabilities:
62+
host:
63+
occurrences: [ , 0 ]
64+
type: tosca.capabilities.Compute

‎ToscaDesigner/Generated TOSCA files/MyrtusSmartTrafficManagementTopologyTemplate.tosca‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,43 @@ topology_template:
144144
side_channel_secure_library_1:
145145
type: .security_countermeasure
146146
relationship_templates:
147+
policies:
148+
high_cpu_utilization_on_camera:
149+
type: tosca.policies.Placement
150+
description: Edge devices SHOULD maintain computational resource (CPU, GPU) utilization below 70% to ensure adequate headroom for handling unexpected traffic spikes or system events.
151+
targets: [basic_edge_camera_1,basic_edge_camera_2,advanced_edge_camera_1,advanced_edge_camera_2]
152+
triggers:
153+
high_cpu_utilization_on_camera_trigger:
154+
description: Edge devices SHOULD maintain computational resource (CPU, GPU) utilization below 70% to ensure adequate headroom for handling unexpected traffic spikes or system events.
155+
condition: 'for camera in targets: camera.cpu_utilization > edge_high_cpu_threshold'
156+
action: 'migrate: object_detection_service target: fog_node_1'
157+
high_cpu_utilization_on_fog:
158+
type: tosca.policies.Placement
159+
description: Fog nodes SHOULD maintain computational resource (CPU, GPU) utilization below 60% to accommodate dynamic workload fluctuations and support real-time traffic data processing.
160+
targets: [fog_node_1]
161+
triggers:
162+
high_cpu_utilization_on_fog_trigger:
163+
description: Edge devices SHOULD maintain computational resource (CPU, GPU) utilization below 60% to ensure adequate headroom for handling unexpected traffic spikes or system events.
164+
condition: 'for fog_node in targets: fog_node.cpu_utilization > fog_high_cpu_threshold'
165+
action: 'migrate: object_detection_service target: cloud_instance_1'
166+
edge_low_power_mode:
167+
type: tosca.policies.Placement
168+
targets: [basic_edge_camera_1,basic_edge_camera_2,advanced_edge_camera_1,advanced_edge_camera_2]
169+
triggers:
170+
edge_low_power_mode_trigger:
171+
condition: 'datetime.datetime.now().time() >= datetime.time(1, 0) and datetime.datetime.now().time() <= datetime.time(5, 0) and average_traffic_density_15min < low_traffic_threshold_15min'
172+
action: 'frame_rate: 10 else frame_rate: 30'
173+
high_traffic_scaling:
174+
type: tosca.policies.Scaling
175+
targets: [cloud_instance_1]
176+
triggers:
177+
high_traffic_scaling_trigger:
178+
condition: 'average_traffic_density_15min > high_traffic_threshold_15min'
179+
action: 'scale_up: 1 target: cloud_server_1'
180+
low_traffic_scaling:
181+
type: tosca.policies.Scaling
182+
targets: [cloud_instance_1]
183+
triggers:
184+
low_traffic_scaling_trigger:
185+
condition: 'average_traffic_density_15min < low_traffic_threshold_15min'
186+
action: 'scale_down: 1 target: cloud_server_1'

‎ToscaDesigner/src/main/conf/module.xml‎

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="5.4.01" version="0.0.1" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
2+
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="5.4.01" version="0.1.0" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
<PathEntry path="lib/handlebars-4.3.1.jar"/>
@@ -202,6 +202,16 @@
202202
<Stereotype name="PropertyDefinitionType" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.PropertyDefinitionType.label" uid="34943474-c962-4064-b5f1-c6008ebb3c9d" is-abstract="false">
203203
<Icon path="res/icon/gui/PropertyDefinitionType24.png"/>
204204
<Image path="res/icon/gui/PropertyDefinitionType48.png"/>
205+
<PropertyTable id="PropertyDefinitionTypeTable" label="%propertytable.PropertyDefinitionTypeTable.label" uid="10a88662-c943-4c1c-92a8-9212d97d684d">
206+
<PropertyDefinition id="description" label="%propertydefinition.PropertyDefinitionTypeTable.description.label" default-value="" is-editable="true" uid="d7bd8dcf-45a6-4906-95f9-a874b3a36709">
207+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
208+
<Description>%propertydefinition.PropertyDefinitionTypeTable.description.description</Description>
209+
</PropertyDefinition>
210+
<PropertyDefinition id="required" label="%propertydefinition.PropertyDefinitionTypeTable.required.label" default-value="" is-editable="true" uid="f35e9a83-e034-47a1-95bf-a2e1a1203952">
211+
<TypeRef id="mref#'Boolean' {01a40888-0000-002b-0000-000000000000} Infrastructure.PropertyType"/>
212+
<Description>%propertydefinition.PropertyDefinitionTypeTable.required.description</Description>
213+
</PropertyDefinition>
214+
</PropertyTable>
205215
</Stereotype>
206216
<Stereotype name="PropertyMappingsType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.PropertyMappingsType.label" uid="3d7421b3-1723-4400-8e4f-48176ac40c34" is-abstract="false">
207217
<Icon path=""/>
@@ -356,10 +366,6 @@
356366
<TypeRef id="mref#'Integer' {01a40888-0000-002d-0000-000000000000} Infrastructure.PropertyType"/>
357367
<Description>%propertydefinition.TCapabilityDefinitionTable.upperBound.description</Description>
358368
</PropertyDefinition>
359-
<PropertyDefinition id="validSourceType" label="%propertydefinition.TCapabilityDefinitionTable.validSourceType.label" default-value="" is-editable="true" uid="58a9cdcd-b57e-4a9e-bbd1-d353e9f42b56">
360-
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
361-
<Description>%propertydefinition.TCapabilityDefinitionTable.validSourceType.description</Description>
362-
</PropertyDefinition>
363369
</PropertyTable>
364370
</Stereotype>
365371
<Stereotype name="TCapabilityDefinitionsType" metaclass="Standard.Class" owner-stereotype="mref#'' {fecd81a5-da41-4a07-a507-6bfaf5bbadd2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TCapabilityDefinitionsType.label" uid="ac0418b1-a726-46e6-ac59-310f0055050f" is-abstract="false">
@@ -701,13 +707,9 @@
701707
<Icon path="res/icon/gui/TInterface24.png"/>
702708
<Image path="res/icon/gui/TInterface48.IMAGE.png"/>
703709
<PropertyTable id="TInterfaceTable" label="%propertytable.TInterfaceTable.label" uid="204ebc96-ec6b-46d3-9f88-bcec349cadc7">
704-
<PropertyDefinition id="name" label="%propertydefinition.TInterfaceTable.name.label" default-value="" is-editable="true" uid="abc12b37-e245-4073-9a9f-ebeeb2f4426d">
710+
<PropertyDefinition id="notifications" label="%propertydefinition.TInterfaceTable.notifications.label" default-value="" is-editable="true" uid="1c86cfbe-dda6-4b27-b5aa-59b0433d0603">
705711
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
706-
<Description>%propertydefinition.TInterfaceTable.name.description</Description>
707-
</PropertyDefinition>
708-
<PropertyDefinition id="PropertyTypeDefinition2" label="%propertydefinition.TInterfaceTable.PropertyTypeDefinition2.label" default-value="" is-editable="true" uid="d060b91b-e90c-48fb-8017-56a04caf352b">
709-
<TypeRef id="mref#'Acceptance' {01ec152c-0000-3152-0000-000000000000} Infrastructure.EnumeratedPropertyType"/>
710-
<Description>%propertydefinition.TInterfaceTable.PropertyTypeDefinition2.description</Description>
712+
<Description>%propertydefinition.TInterfaceTable.notifications.description</Description>
711713
</PropertyDefinition>
712714
</PropertyTable>
713715
</Stereotype>
@@ -741,19 +743,27 @@
741743
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
742744
<Description>%propertydefinition.TOperationTable.name.description</Description>
743745
</PropertyDefinition>
744-
<PropertyDefinition id="inputParameters" label="%propertydefinition.TOperationTable.inputParameters.label" default-value="" is-editable="true" uid="7e07cefa-0db7-4a6c-99f5-099c223834eb">
745-
<TypeRef id="mref#'MultiElement' {1bdf9f87-e9ad-4849-ab22-c25147e8d00c} Infrastructure.PropertyType"/>
746-
<Description>%propertydefinition.TOperationTable.inputParameters.description</Description>
746+
<PropertyDefinition id="description" label="%propertydefinition.TOperationTable.description.label" default-value="" is-editable="true" uid="7e07cefa-0db7-4a6c-99f5-099c223834eb">
747+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
748+
<Description>%propertydefinition.TOperationTable.description.description</Description>
747749
</PropertyDefinition>
748-
<PropertyDefinition id="outputParameters" label="%propertydefinition.TOperationTable.outputParameters.label" default-value="" is-editable="true" uid="d3330a11-ae5b-464f-862b-e587feba80ac">
749-
<TypeRef id="mref#'MultiElement' {1bdf9f87-e9ad-4849-ab22-c25147e8d00c} Infrastructure.PropertyType"/>
750-
<Description>%propertydefinition.TOperationTable.outputParameters.description</Description>
750+
<PropertyDefinition id="implementation" label="%propertydefinition.TOperationTable.implementation.label" default-value="" is-editable="true" uid="d3330a11-ae5b-464f-862b-e587feba80ac">
751+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
752+
<Description>%propertydefinition.TOperationTable.implementation.description</Description>
753+
</PropertyDefinition>
754+
<PropertyDefinition id="inputs" label="%propertydefinition.TOperationTable.inputs.label" default-value="" is-editable="true" uid="30a6aef6-f577-4f54-a2eb-9df4e6bc46dd">
755+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
756+
<Description>%propertydefinition.TOperationTable.inputs.description</Description>
757+
</PropertyDefinition>
758+
<PropertyDefinition id="outputs" label="%propertydefinition.TOperationTable.outputs.label" default-value="" is-editable="true" uid="d75d43de-20d1-4375-8764-f8048532f746">
759+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
760+
<Description>%propertydefinition.TOperationTable.outputs.description</Description>
751761
</PropertyDefinition>
752762
</PropertyTable>
753763
</Stereotype>
754764
<Stereotype name="TParameter" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TParameter.label" uid="88f765a0-a1fe-42d8-9b52-f45ff541469f" is-abstract="false">
755-
<Icon path=""/>
756-
<Image path=""/>
765+
<Icon path="res/icon/gui/PropertyDefinitionType48.ICON.png"/>
766+
<Image path="res/icon/gui/PropertyDefinitionType48.png"/>
757767
<PropertyTable id="TParameterTable" label="%propertytable.TParameterTable.label" uid="89a85a1d-2631-4b47-b94b-dfe632ffc5be">
758768
<PropertyDefinition id="name" label="%propertydefinition.TParameterTable.name.label" default-value="" is-editable="true" uid="ae68e1f0-3464-42e1-a2d5-d8d14a7aa4fe">
759769
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
@@ -767,6 +777,26 @@
767777
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
768778
<Description>%propertydefinition.TParameterTable.type.description</Description>
769779
</PropertyDefinition>
780+
<PropertyDefinition id="description" label="%propertydefinition.TParameterTable.description.label" default-value="" is-editable="true" uid="73c42be6-f152-4cd9-96e7-811cbdc19855">
781+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
782+
<Description>%propertydefinition.TParameterTable.description.description</Description>
783+
</PropertyDefinition>
784+
<PropertyDefinition id="value" label="%propertydefinition.TParameterTable.value.label" default-value="" is-editable="true" uid="b90789da-89e2-4e67-95f5-afaeae60527f">
785+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
786+
<Description>%propertydefinition.TParameterTable.value.description</Description>
787+
</PropertyDefinition>
788+
<PropertyDefinition id="default" label="%propertydefinition.TParameterTable.default.label" default-value="" is-editable="true" uid="77d5b3fc-e752-44d0-a52c-3d3b6fa2755a">
789+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
790+
<Description>%propertydefinition.TParameterTable.default.description</Description>
791+
</PropertyDefinition>
792+
<PropertyDefinition id="status" label="%propertydefinition.TParameterTable.status.label" default-value="" is-editable="true" uid="af62ecb0-8deb-4e68-bb5f-c38a90d1ddc6">
793+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
794+
<Description>%propertydefinition.TParameterTable.status.description</Description>
795+
</PropertyDefinition>
796+
<PropertyDefinition id="constraints" label="%propertydefinition.TParameterTable.constraints.label" default-value="" is-editable="true" uid="5e5812ea-e124-41ef-8d85-dc46d49636a9">
797+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
798+
<Description>%propertydefinition.TParameterTable.constraints.description</Description>
799+
</PropertyDefinition>
770800
</PropertyTable>
771801
</Stereotype>
772802
<Stereotype name="TPlan" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TPlan.label" uid="182e3894-ba54-49ce-bfdc-c97d06294a29" is-abstract="false">
@@ -1086,6 +1116,7 @@
10861116
</Handler>
10871117
</Tool>
10881118
<Tool id="CapabilityDefinition" label="%tool.CapabilityDefinition.label" tooltip="%tool.CapabilityDefinition.tooltip" image="res/icon/gui/capabilityDefinition24.png">
1119+
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TCapabilityDefinitionsType"/>
10891120
<Handler class="Box">
10901121
<HParameter name="stereotype" value="ToscaDesigner#TCapabilityDefinition"/>
10911122
<HParameter name="metaclass" value="Standard.Class"/>
@@ -1294,6 +1325,14 @@
12941325
<HParameter name="name" value="Capabilities Type"/>
12951326
</Handler>
12961327
</Tool>
1328+
<Tool id="Interface" label="%tool.Interface.label" tooltip="%tool.Interface.tooltip" image="res/icon/gui/TInterface48.ICON.png">
1329+
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TNodeTemplate"/>
1330+
<Handler class="Box">
1331+
<HParameter name="stereotype" value="ToscaDesigner#TInterface"/>
1332+
<HParameter name="metaclass" value="Standard.Class"/>
1333+
<HParameter name="name" value="Interface"/>
1334+
</Handler>
1335+
</Tool>
12971336
</Tools>
12981337
<ContextualMenu>
12991338
<CommandRef refid="Export" group="" group-image=""/>
@@ -1353,6 +1392,7 @@
13531392
<ToolRef refid="Policies_Type" group="%group.Attributes.label"/>
13541393
<ToolRef refid="Constraint" group="%group.Attributes.label"/>
13551394
<ToolRef refid="Constraints" group="%group.Attributes.label"/>
1395+
<ToolRef refid="Interface" group="%group.Attributes.label"/>
13561396
<ToolRef refid="Capability" group="%group.Capabilities.label"/>
13571397
<ToolRef refid="Capabilities_Type" group="%group.Capabilities.label"/>
13581398
</Palette>

0 commit comments

Comments
 (0)