Incorrect DeploymentView.aadl with duplicated device
Using the old editors, a model with two instances of the same device type (e.g. generic_serial.raw) in the same node generates an incorrect DeploymentView.aadl that contains duplicate definitions.
DEVICE generic_serial
EXTENDS ocarina_drivers::generic_serial
FEATURES
link : REFINED TO REQUIRES BUS ACCESS ocarina_buses::serial.generic {
Taste::coordinates => "631 1221";
};
PROPERTIES
Deployment::Help => "Write your ASN.1 configuration here";
Deployment::Config => "/home/assert/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn";
Deployment::Version => "0.1beta";
-- DUPLICATES!!
Deployment::Help => "Write your ASN.1 configuration here";
Deployment::Config => "/home/assert/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn";
Deployment::Version => "0.1beta";
-- end of duplicates
END generic_serial;
The build produces the following error:
DeploymentView.aadl:31:03: "Deployment::Help" conflicts with declaration at line 28
DeploymentView.aadl:32:03: "Deployment::Config" conflicts with declaration at line 29
DeploymentView.aadl:33:03: "Deployment::Version" conflicts with declaration at line 30
[ERROR] Deployment view is incorrect
Failed while executing:
"buildsupport" -x 100 -g --keep-case --gw --glue -i "/home/assert/tmp/test-dev1/InterfaceView.aadl" -c "DeploymentView.aadl" ocarina_components.aadl -d D_view_aadlv2.aadl --polyorb-hi-c --smp2 /home/assert/tool-inst/share/config_ellidiss/TASTE_IV_Properties.aadl /home/assert/tool-inst/share/config_ellidiss/TASTE_DV_Properties.aadl
I could not build the same model once saved with the new editors, but with a different error message.
__dv_1_3.aadl:24:41: ocarina_buses::serial.generic (entity reference) qualified reference name not found in 'with' statements of deploymentview::DV::Node1 (package specification)
__dv_1_3.aadl:38:41: ocarina_buses::serial.generic (entity reference) qualified reference name not found in 'with' statements of deploymentview::DV::Node1 (package specification)
[ERROR] Deployment view is incorrect
Failed while executing:
"buildsupport" -x 100 -g --keep-case --gw --glue -i "/home/assert/tmp/test-dev2/InterfaceView.aadl" -c "__dv_1_3.aadl" ocarina_components.aadl -d D_view_aadlv2.aadl --polyorb-hi-c --smp2 /home/assert/tool-inst/share/config_ellidiss/TASTE_IV_Properties.aadl /home/assert/tool-inst/share/config_ellidiss/TASTE_DV_Properties.aadl
Model with old editors test-dev1.tgz and with new editors test-dev2.tgz.