more accurate handling of gateways status

Cumulocity-IoT · Sep 26, 2024 · b36e375 · b36e375
1 parent 64fc06f
commit b36e375
Show file tree

Hide file tree

Showing 33 changed files with 64 additions and 220 deletions.
diff --git a/java/github-proxy/pom.xml b/java/github-proxy/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>github-proxy</artifactId>

diff --git a/java/lora-codec-acs-switch/pom.xml b/java/lora-codec-acs-switch/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-acs-switch</artifactId>

diff --git a/java/lora-codec-atim-th/pom.xml b/java/lora-codec-atim-th/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-atim-th</artifactId>

diff --git a/java/lora-codec-atim-tm2d/pom.xml b/java/lora-codec-atim-tm2d/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-atim-tm2d</artifactId>

diff --git a/java/lora-codec-atim-tmxd/pom.xml b/java/lora-codec-atim-tmxd/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-atim-tmxd</artifactId>

diff --git a/java/lora-codec-axioma/pom.xml b/java/lora-codec-axioma/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-axioma</artifactId>

diff --git a/java/lora-codec-c8y/pom.xml b/java/lora-codec-c8y/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-c8y</artifactId>

diff --git a/java/lora-codec-cayennelpp/pom.xml b/java/lora-codec-cayennelpp/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-cayennelpp</artifactId>

diff --git a/java/lora-codec-elsys/pom.xml b/java/lora-codec-elsys/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-elsys</artifactId>

diff --git a/java/lora-codec-example/pom.xml b/java/lora-codec-example/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-example</artifactId>

diff --git a/java/lora-codec-lansitec/pom.xml b/java/lora-codec-lansitec/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-lansitec</artifactId>

diff --git a/java/lora-codec-ms/pom.xml b/java/lora-codec-ms/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-ms</artifactId>

diff --git a/java/lora-codec-nke/pom.xml b/java/lora-codec-nke/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-nke</artifactId>

diff --git a/java/lora-codec-pyrescom-classair/pom.xml b/java/lora-codec-pyrescom-classair/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-pyrescom</artifactId>

diff --git a/java/lora-codec-semtech/pom.xml b/java/lora-codec-semtech/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-semtech</artifactId>

diff --git a/java/lora-codec-senlab/pom.xml b/java/lora-codec-senlab/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-codec-senlab</artifactId>

diff --git a/java/lora-interface/pom.xml b/java/lora-interface/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-interface</artifactId>

diff --git a/java/lora-ns-actility/pom.xml b/java/lora-ns-actility/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-actility</artifactId>

diff --git a/java/lora-ns-chirpstack/pom.xml b/java/lora-ns-chirpstack/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-chirpstack</artifactId>

diff --git a/java/lora-ns-generic/pom.xml b/java/lora-ns-generic/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-generic</artifactId>

diff --git a/java/lora-ns-kerlink/pom.xml b/java/lora-ns-kerlink/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-kerlink</artifactId>

diff --git a/java/lora-ns-liveobjects/pom.xml b/java/lora-ns-liveobjects/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-liveobjects</artifactId>

diff --git a/java/lora-ns-loriot/pom.xml b/java/lora-ns-loriot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-loriot</artifactId>

diff --git a/java/lora-ns-ms/pom.xml b/java/lora-ns-ms/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-ms</artifactId>

diff --git a/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java b/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java
@@ -6,6 +6,8 @@
 import org.joda.time.DateTime;
 import org.springframework.stereotype.Service;
 
+import com.cumulocity.microservice.context.ContextService;
+import com.cumulocity.microservice.context.credentials.MicroserviceCredentials;
 import com.cumulocity.model.event.CumulocityAlarmStatuses;
 import com.cumulocity.rest.representation.alarm.AlarmRepresentation;
 import com.cumulocity.rest.representation.event.EventRepresentation;
@@ -18,6 +20,7 @@
 import com.cumulocity.sdk.client.inventory.InventoryApi;
 import com.cumulocity.sdk.client.measurement.MeasurementApi;
 
+import c8y.ConnectionState;
 import c8y.Hardware;
 import c8y.IsDevice;
 import c8y.Position;
@@ -43,8 +46,21 @@ public class LNSGatewayService {
     private final MeasurementApi measurementApi;
     private final LNSConnectorService lnsConnectorManager;
     private final LoraContextService loraContextService;
+	private final ContextService<MicroserviceCredentials> contextService;
     public static final String GATEWAY_ID_TYPE = "LoRa Gateway Id";
 
+	private MicroserviceCredentials createContextWithoutApiKey(MicroserviceCredentials source) {
+		return new MicroserviceCredentials(
+				source.getTenant(),
+				source.getUsername(),
+				source.getPassword(),
+				source.getOAuthAccessToken(),
+				"NOT_EXISTING", // added to replace context, check:
+								// com.cumulocity.microservice.context.annotation.EnableContextSupportConfiguration.contextScopeConfigurer
+				source.getTfaToken(),
+				null);
+	}
+
     public void upsertGateways(LNSConnector connector) {
         List<Gateway> gateways = connector.getGateways();
         for (Gateway gateway : gateways) {
@@ -73,6 +89,10 @@ public void upsertGateways(LNSConnector connector) {
             }
             inventoryApi.update(mor);
             loraContextService.log("Processing data for gateway {}", gateway.getName());
+            MicroserviceCredentials noAppKeyContext = createContextWithoutApiKey(contextService.getContext());
+            if (gateway.getStatus() == ConnectionState.AVAILABLE) {
+                contextService.runWithinContext(noAppKeyContext, () -> processData(mor, gateway.getData()));
+            }
             processData(mor, gateway.getData());
         }
     }

diff --git a/java/lora-ns-objenious/pom.xml b/java/lora-ns-objenious/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-objenious</artifactId>

diff --git a/java/lora-ns-orbiwise/pom.xml b/java/lora-ns-orbiwise/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-orbiwise</artifactId>

diff --git a/java/lora-ns-ttn/pom.xml b/java/lora-ns-ttn/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.softwareag</groupId>
 		<artifactId>lora</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.2</version>
 	</parent>
 
 	<artifactId>lora-ns-ttn</artifactId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.softwareag</groupId>
   <artifactId>lora</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>