Merge remote-tracking branch 'refs/remotes/basyx/main' into feature/getAllAASParams

Author: FriedJannik

.github/workflows/basyx_test.yml

@@ -461,6 +461,9 @@ jobs:
             exit 1;
           fi
 
+      - name: Test Submodel Service IT
+        run: mvn verify -f "basyx.submodelservice" -Ddocker.namespace=test -DskipSurefire=true
+
       - name: Stop environment
         if: always()
         run: docker compose --project-directory ./ci down

basyx.common/basyx.authorization.rules.rbac.backend.submodel/src/main/java/org/eclipse/digitaltwin/basyx/authorization/rules/rbac/backend/submodel/SubmodelAuthorizationRbacStorage.java

@@ -65,11 +65,17 @@ public void addRule(RbacRule rbacRule) {
 				.map(rule -> ruleAdapter.adapt(rule, createKey(rule))).collect(Collectors.toList());
 
 		rbacRulesSMC.stream().forEach(rule -> {
-			try {
-				smService.createSubmodelElement(rule);
+			try{
+				smService.getSubmodelElement(rule.getIdShort());
+				LOGGER.warn("Rule with key " + rule.getIdShort() + " already exists. Skipping creation.");
 			} catch (Exception e) {
-				LOGGER.error("Exception while creating SubmodelElement for rule: " + rule.getIdShort() + ". Error: " + e.getMessage());
+				try {
+					smService.createSubmodelElement(rule);
+				} catch (Exception e2) {
+					LOGGER.error("Exception while creating SubmodelElement for rule: " + rule.getIdShort() + ". Error: " + e2.getMessage());
+				}
 			}
+
 		});
 	}
 

examples/BaSyxDynamicRBAC/basyx/aas-env.properties

@@ -1,5 +1,6 @@
 server.port=8081
-basyx.backend=InMemory
+basyx.backend=MongoDB
+spring.data.mongodb.uri = mongodb://mongoAdmin:mongoPassword@mongo:27017/aas-env?authSource=admin
 basyx.environment=file:aas
 basyx.cors.allowed-origins=*
 basyx.cors.allowed-methods=GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD

examples/BaSyxDynamicRBAC/docker-compose.yaml

@@ -30,6 +30,8 @@ services:
       - '8081:8081'
     restart: always
     depends_on:
+      keycloak:
+        condition: service_healthy
       aas-registry:
         condition: service_healthy
       sm-registry: