Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
2aa14bfd
Commit
2aa14bfd
authored
Sep 30, 2019
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'integrate-someip' into 'master'
Integrate someip See merge request
!44
parents
231f6e4c
d1979e3a
Pipeline
#189040
passed with stages
in 29 minutes and 56 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
125 additions
and
2 deletions
+125
-2
.gitlab-ci.yml
.gitlab-ci.yml
+8
-0
pom.xml
pom.xml
+9
-2
src/main/java/de/monticore/lang/monticar/generator/middleware/cli/DistributedTargetGeneratorCli.java
...nerator/middleware/cli/DistributedTargetGeneratorCli.java
+10
-0
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/SomeIPGenImpl.java
...ng/monticar/generator/middleware/impls/SomeIPGenImpl.java
+45
-0
src/test/bash/integrationTestSomeIP.sh
src/test/bash/integrationTestSomeIP.sh
+8
-0
src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java
...g/monticar/generator/middleware/SomeIPGenerationTest.java
+45
-0
No files found.
.gitlab-ci.yml
View file @
2aa14bfd
...
...
@@ -50,6 +50,14 @@ RosIntegrationJob:
script
:
-
./src/test/bash/integrationTestRos.sh
SomeIPIntegrationJob
:
stage
:
integration
image
:
registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2someip:v2
dependencies
:
-
CompileJobLinux
script
:
-
./src/test/bash/integrationTestSomeIP.sh
Ros2IntegrationJob
:
stage
:
integration
image
:
registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emam2middleware/ema-ros-crystal
...
...
pom.xml
View file @
2aa14bfd
...
...
@@ -10,7 +10,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-middleware-generator
</artifactId>
<version>
0.0.3
0
-SNAPSHOT
</version>
<version>
0.0.3
1
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -20,11 +20,12 @@
<!-- .. SE-Libraries .................................................. -->
<se-commons.version>
1.7.7
</se-commons.version>
<embedded-montiarc.version>
0.1.1
6
-SNAPSHOT
</embedded-montiarc.version>
<embedded-montiarc.version>
0.1.1
9
-SNAPSHOT
</embedded-montiarc.version>
<Embedded-montiarc-math-generator.version>
0.1.14-SNAPSHOT
</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>
0.1.8-SNAPSHOT
</Embedded-montiarc-math-roscpp-generator.version>
<EMADL2CPP.version>
0.3.6-SNAPSHOT
</EMADL2CPP.version>
<EMADL.version>
0.2.10-SNAPSHOT
</EMADL.version>
<SOMEIP.version>
1.2-SNAPSHOT
</SOMEIP.version>
<MQTT.version>
1.5-SNAPSHOT
</MQTT.version>
<embedded-montiarc-component-clustering.version>
0.0.2-SNAPSHOT
</embedded-montiarc-component-clustering.version>
...
...
@@ -108,6 +109,12 @@
<version>
${Embedded-montiarc-math-roscpp-generator.version}
</version>
</dependency>
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-emam2someip-generator
</artifactId>
<version>
${SOMEIP.version}
</version>
</dependency>
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-mqtt-generator
</artifactId>
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/cli/DistributedTargetGeneratorCli.java
View file @
2aa14bfd
...
...
@@ -5,12 +5,14 @@ import com.google.gson.Gson;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.tagging.middleware.ros.RosToEmamTagSchema
;
import
de.monticore.lang.embeddedmontiarc.tagging.middleware.mqtt.MqttToEmamTagSchema
;
import
de.monticore.lang.embeddedmontiarc.tagging.middleware.someip.SomeIPToEmamTagSchema
;
import
de.monticore.lang.monticar.emadl.generator.EMADLAbstractSymtab
;
import
de.monticore.lang.monticar.generator.middleware.DistributedTargetGenerator
;
import
de.monticore.lang.monticar.generator.middleware.impls.*
;
import
de.monticore.lang.monticar.generator.order.simulator.AbstractSymtab
;
import
de.monticore.lang.monticar.generator.roscpp.helper.TagHelper
;
import
de.monticore.lang.monticar.generator.mqtt.helper.MqttTagHelper
;
import
de.monticore.lang.monticar.generator.someip.helper.SomeIPTagHelper
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
de.se_rwth.commons.logging.Log
;
...
...
@@ -49,6 +51,7 @@ public final class DistributedTargetGeneratorCli {
//ros2cpp is an alias for rclcpp
public
static
final
String
GENERATOR_RCLCPP
=
"rclcpp"
;
public
static
final
String
GENERATOR_ROS2CPP
=
"ros2cpp"
;
public
static
final
String
GENERATOR_SOMEIP
=
"someip"
;
private
DistributedTargetGeneratorCli
()
{}
...
...
@@ -88,6 +91,7 @@ public final class DistributedTargetGeneratorCli {
res
.
add
(
GENERATOR_ODV
);
res
.
add
(
GENERATOR_ROS2CPP
);
res
.
add
(
GENERATOR_RCLCPP
);
res
.
add
(
GENERATOR_SOMEIP
);
return
res
;
}
...
...
@@ -184,6 +188,12 @@ public final class DistributedTargetGeneratorCli {
generator
.
add
(
new
ODVGenImpl
(),
"odv"
);
}
if
(
generators
.
contains
(
GENERATOR_SOMEIP
))
{
generator
.
add
(
new
SomeIPGenImpl
(),
"someip"
);
SomeIPToEmamTagSchema
.
registerTagTypes
(
taggingResolver
);
SomeIPTagHelper
.
resolveTags
(
taggingResolver
,
componentInstanceSymbol
);
}
if
(
cliParameters
.
getClusteringParameters
().
isPresent
())
{
ClusteringParameters
clusteringParameters
=
cliParameters
.
getClusteringParameters
().
get
();
generator
.
setClusteringParameters
(
clusteringParameters
);
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/SomeIPGenImpl.java
0 → 100644
View file @
2aa14bfd
package
de.monticore.lang.monticar.generator.middleware.impls
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAPortInstanceSymbol
;
import
de.monticore.lang.monticar.generator.someip.GeneratorSomeIP
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
de.se_rwth.commons.logging.Log
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.List
;
public
class
SomeIPGenImpl
implements
GeneratorImpl
{
private
String
generationTargetPath
;
private
GeneratorSomeIP
generatorSomeIP
;
public
SomeIPGenImpl
(){
generatorSomeIP
=
new
GeneratorSomeIP
();
}
public
void
setGeneratorSomeIP
(
GeneratorSomeIP
generatorSomeIP
)
{
this
.
generatorSomeIP
=
generatorSomeIP
;
}
@Override
public
List
<
File
>
generate
(
EMAComponentInstanceSymbol
componentInstanceSymbol
,
TaggingResolver
taggingResolver
)
throws
IOException
{
generatorSomeIP
.
setGenerationTargetPath
(
generationTargetPath
);
return
generatorSomeIP
.
generateSomeIPAdapter
(
componentInstanceSymbol
);
}
@Override
public
void
setGenerationTargetPath
(
String
path
)
{
this
.
generationTargetPath
=
path
;
}
@Override
public
boolean
willAccept
(
EMAComponentInstanceSymbol
componentInstanceSymbol
)
{
boolean
result
=
componentInstanceSymbol
.
getPortInstanceList
().
stream
().
anyMatch
(
EMAPortInstanceSymbol:
:
isSomeIPPort
);
if
(!
result
){
Log
.
warn
(
"GeneratorSomeIP: No SomeIP Ports found! Ignoring component "
+
componentInstanceSymbol
.
getName
());
}
return
result
;
}
}
src/test/bash/integrationTestSomeIP.sh
0 → 100755
View file @
2aa14bfd
#!/bin/bash
set
-e
baseDir
=
$(
readlink
-f
`
dirname
$0
`
/../../..
)
for
f
in
`
find
$baseDir
/target/generated-sources-someip/
-name
compile.sh
`
do
bash
-H
$f
done
src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java
0 → 100644
View file @
2aa14bfd
package
de.monticore.lang.monticar.generator.middleware
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.tagging.middleware.someip.SomeIPToEmamTagSchema
;
import
de.monticore.lang.embeddedmontiarc.tagging.middleware.someip.SomeIPConnectionSymbol
;
import
de.monticore.lang.monticar.generator.middleware.impls.CPPGenImpl
;
import
de.monticore.lang.monticar.generator.someip.GeneratorSomeIP
;
import
de.monticore.lang.monticar.generator.middleware.impls.SomeIPGenImpl
;
import
de.monticore.lang.monticar.generator.someip.helper.SomeIPTagHelper
;
import
de.monticore.lang.tagging._symboltable.TagSymbol
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
org.junit.Test
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.Collection
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
public
class
SomeIPGenerationTest
extends
AbstractSymtabTest
{
private
static
final
String
TEST_PATH
=
"src/test/resources/"
;
private
static
final
String
OUT_BASE
=
"./target/generated-sources-someip/"
;
@Test
public
void
testSomeIPGeneration
()
throws
IOException
{
TaggingResolver
taggingResolver
=
createSymTabAndTaggingResolver
(
TEST_PATH
);
EMAComponentInstanceSymbol
componentInstanceSymbol
=
taggingResolver
.<
EMAComponentInstanceSymbol
>
resolve
(
"tests.a.addComp"
,
EMAComponentInstanceSymbol
.
KIND
).
orElse
(
null
);
SomeIPToEmamTagSchema
.
registerTagTypes
(
taggingResolver
);
assertNotNull
(
componentInstanceSymbol
);
SomeIPTagHelper
.
resolveTags
(
taggingResolver
,
componentInstanceSymbol
);
DistributedTargetGenerator
distributedTargetGenerator
=
new
DistributedTargetGenerator
();
distributedTargetGenerator
.
setGenerationTargetPath
(
OUT_BASE
+
"addComp/src"
);
distributedTargetGenerator
.
add
(
new
CPPGenImpl
(
TEST_PATH
),
"cpp"
);
distributedTargetGenerator
.
add
(
new
SomeIPGenImpl
(),
"someip"
);
List
<
File
>
files
=
distributedTargetGenerator
.
generate
(
componentInstanceSymbol
,
taggingResolver
);
}
}
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