diff --git a/java/github-proxy/pom.xml b/java/github-proxy/pom.xml index 8eca214cc..3f6054f0e 100644 --- a/java/github-proxy/pom.xml +++ b/java/github-proxy/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 github-proxy diff --git a/java/lora-codec-acs-switch/pom.xml b/java/lora-codec-acs-switch/pom.xml index 6366f0c72..290091411 100644 --- a/java/lora-codec-acs-switch/pom.xml +++ b/java/lora-codec-acs-switch/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-acs-switch diff --git a/java/lora-codec-atim-th/pom.xml b/java/lora-codec-atim-th/pom.xml index bbb96703a..31d1e9c2d 100644 --- a/java/lora-codec-atim-th/pom.xml +++ b/java/lora-codec-atim-th/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-atim-th diff --git a/java/lora-codec-atim-tm2d/pom.xml b/java/lora-codec-atim-tm2d/pom.xml index 9d5c2d545..f871891ff 100644 --- a/java/lora-codec-atim-tm2d/pom.xml +++ b/java/lora-codec-atim-tm2d/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-atim-tm2d diff --git a/java/lora-codec-atim-tmxd/pom.xml b/java/lora-codec-atim-tmxd/pom.xml index 114ad6b1b..ab8d23aae 100644 --- a/java/lora-codec-atim-tmxd/pom.xml +++ b/java/lora-codec-atim-tmxd/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-atim-tmxd diff --git a/java/lora-codec-axioma/pom.xml b/java/lora-codec-axioma/pom.xml index 9de2be0a2..f9d969296 100644 --- a/java/lora-codec-axioma/pom.xml +++ b/java/lora-codec-axioma/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-axioma diff --git a/java/lora-codec-c8y/pom.xml b/java/lora-codec-c8y/pom.xml index 4d936379c..20f9f83bb 100644 --- a/java/lora-codec-c8y/pom.xml +++ b/java/lora-codec-c8y/pom.xml @@ -8,7 +8,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-c8y diff --git a/java/lora-codec-cayennelpp/pom.xml b/java/lora-codec-cayennelpp/pom.xml index dd5249854..6c4e16ae6 100644 --- a/java/lora-codec-cayennelpp/pom.xml +++ b/java/lora-codec-cayennelpp/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-cayennelpp diff --git a/java/lora-codec-elsys/pom.xml b/java/lora-codec-elsys/pom.xml index 1f0ad2907..1fcb46081 100644 --- a/java/lora-codec-elsys/pom.xml +++ b/java/lora-codec-elsys/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-elsys diff --git a/java/lora-codec-example/pom.xml b/java/lora-codec-example/pom.xml index c403691b0..57eec8868 100644 --- a/java/lora-codec-example/pom.xml +++ b/java/lora-codec-example/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-example diff --git a/java/lora-codec-lansitec/pom.xml b/java/lora-codec-lansitec/pom.xml index 1db3be790..e0d171349 100644 --- a/java/lora-codec-lansitec/pom.xml +++ b/java/lora-codec-lansitec/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-lansitec diff --git a/java/lora-codec-ms/pom.xml b/java/lora-codec-ms/pom.xml index 9abd761d5..95f2ab2ca 100644 --- a/java/lora-codec-ms/pom.xml +++ b/java/lora-codec-ms/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-ms diff --git a/java/lora-codec-nke/pom.xml b/java/lora-codec-nke/pom.xml index 097d7dc9c..733f3ccd7 100644 --- a/java/lora-codec-nke/pom.xml +++ b/java/lora-codec-nke/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-nke diff --git a/java/lora-codec-pyrescom-classair/pom.xml b/java/lora-codec-pyrescom-classair/pom.xml index f7bbdfdc0..742aeab3f 100644 --- a/java/lora-codec-pyrescom-classair/pom.xml +++ b/java/lora-codec-pyrescom-classair/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-pyrescom diff --git a/java/lora-codec-semtech/pom.xml b/java/lora-codec-semtech/pom.xml index 0d04944c4..6f0c5957e 100644 --- a/java/lora-codec-semtech/pom.xml +++ b/java/lora-codec-semtech/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-semtech diff --git a/java/lora-codec-senlab/pom.xml b/java/lora-codec-senlab/pom.xml index edb04c713..5491ceef6 100644 --- a/java/lora-codec-senlab/pom.xml +++ b/java/lora-codec-senlab/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-codec-senlab diff --git a/java/lora-interface/pom.xml b/java/lora-interface/pom.xml index c7ca9329e..acc6e194e 100644 --- a/java/lora-interface/pom.xml +++ b/java/lora-interface/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-interface diff --git a/java/lora-ns-actility/pom.xml b/java/lora-ns-actility/pom.xml index 151d14411..425f975ed 100644 --- a/java/lora-ns-actility/pom.xml +++ b/java/lora-ns-actility/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-actility diff --git a/java/lora-ns-chirpstack/pom.xml b/java/lora-ns-chirpstack/pom.xml index 08f3eaf3e..19242ca68 100644 --- a/java/lora-ns-chirpstack/pom.xml +++ b/java/lora-ns-chirpstack/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-chirpstack diff --git a/java/lora-ns-generic/pom.xml b/java/lora-ns-generic/pom.xml index dcc26264c..4b541fc9e 100644 --- a/java/lora-ns-generic/pom.xml +++ b/java/lora-ns-generic/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-generic diff --git a/java/lora-ns-kerlink/pom.xml b/java/lora-ns-kerlink/pom.xml index 7f4541ecc..283b30086 100644 --- a/java/lora-ns-kerlink/pom.xml +++ b/java/lora-ns-kerlink/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-kerlink diff --git a/java/lora-ns-liveobjects/pom.xml b/java/lora-ns-liveobjects/pom.xml index dd8b66707..9f4625404 100644 --- a/java/lora-ns-liveobjects/pom.xml +++ b/java/lora-ns-liveobjects/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-liveobjects diff --git a/java/lora-ns-loriot/pom.xml b/java/lora-ns-loriot/pom.xml index 2a56a072a..f4950698f 100644 --- a/java/lora-ns-loriot/pom.xml +++ b/java/lora-ns-loriot/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-loriot diff --git a/java/lora-ns-ms/pom.xml b/java/lora-ns-ms/pom.xml index df44bcfc4..bce121a2c 100644 --- a/java/lora-ns-ms/pom.xml +++ b/java/lora-ns-ms/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-ms 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 index 225b3e5c0..65582189f 100644 --- 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 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 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 index e3ccf0d5b..77a68a822 100644 --- a/java/lora-ns-objenious/pom.xml +++ b/java/lora-ns-objenious/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-objenious diff --git a/java/lora-ns-orbiwise/pom.xml b/java/lora-ns-orbiwise/pom.xml index d5216cce3..12ddb259f 100644 --- a/java/lora-ns-orbiwise/pom.xml +++ b/java/lora-ns-orbiwise/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-orbiwise diff --git a/java/lora-ns-ttn/pom.xml b/java/lora-ns-ttn/pom.xml index cc2a31b42..fa2bc5097 100644 --- a/java/lora-ns-ttn/pom.xml +++ b/java/lora-ns-ttn/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.0 + 1.1.2 lora-ns-ttn diff --git a/java/pom.xml b/java/pom.xml index ba6c295d0..52e124ae3 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 com.softwareag lora - 1.1.0 + 1.1.2 pom UTF-8 diff --git a/java/pom.xml.versionsBackup b/java/pom.xml.versionsBackup deleted file mode 100644 index 4ec502254..000000000 --- a/java/pom.xml.versionsBackup +++ /dev/null @@ -1,182 +0,0 @@ - - - 4.0.0 - com.softwareag - lora - 1.1.0-SNAPSHOT - pom - - UTF-8 - 1015.0.278 - 17 - 17 - UTF-8 - 2.7.18 - 13.2.1 - - - - cumulocity - default - https://download.cumulocity.com/maven/repository - - - github - default - https://maven.pkg.github.com/cpoder/c8y-java-sdk - - - - - cumulocity - default - https://download.cumulocity.com/maven/repository - - - - - - com.nsn.cumulocity.clients-java - java-client - ${c8y.version} - - - com.nsn.cumulocity.model - device-capability-model - ${c8y.version} - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - io.github.openfeign - feign-core - ${feign.version} - - - io.github.openfeign - feign-jackson - ${feign.version} - - - io.github.openfeign - feign-slf4j - ${feign.version} - - - io.github.openfeign - feign-okhttp - ${feign.version} - - - io.github.openfeign.form - feign-form - 3.8.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.13.2 - - - org.junit.jupiter - junit-jupiter-engine - 5.7.2 - test - - - com.nsn.cumulocity.clients-java - microservice-dependencies - ${c8y.version} - pom - import - - - org.projectlombok - lombok - 1.18.30 - provided - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-dependencies.version} - - - - repackage - - - - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - ${c8y.version} - - - package - package - - package - - - false - ${project.parent.basedir}/docker - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.3.0 - - - - - - - - ci - - github-proxy - lora-interface - lora-codec-ms - lora-ns-ms - lora-codec-cayennelpp - lora-codec-nke - lora-codec-pyrescom-classair - lora-codec-senlab - lora-codec-semtech - lora-codec-axioma - lora-codec-atim-th - lora-codec-atim-tm2d - lora-codec-atim-tmxd - lora-codec-acs-switch - lora-codec-c8y - lora-ns-kerlink - lora-ns-objenious - lora-ns-orbiwise - lora-ns-loriot - lora-ns-ttn - lora-ns-actility - lora-codec-elsys - lora-codec-lansitec - lora-codec-example - lora-ns-generic - lora-ns-liveobjects - lora-ns-chirpstack - - - - \ No newline at end of file diff --git a/web/lora-package/package.json b/web/lora-package/package.json index 52db22ce6..2eb72f2b6 100644 --- a/web/lora-package/package.json +++ b/web/lora-package/package.json @@ -1,6 +1,6 @@ { "name": "lora-package", - "version": "1.1.1", + "version": "1.1.2", "description": "This is the Cumulocity LoRa plugin.", "scripts": { "start": "c8ycli server --env.extraWebpackConfig=./extra-webpack.config.js -u https://lora-dev.cumulocity.com --shell devicemanagement", diff --git a/web/lora-package/src/onboarding/gateways/gateways.component.html b/web/lora-package/src/onboarding/gateways/gateways.component.html index 1ec3af66a..f8c60435a 100644 --- a/web/lora-package/src/onboarding/gateways/gateways.component.html +++ b/web/lora-package/src/onboarding/gateways/gateways.component.html @@ -185,6 +185,13 @@

Upload a CSV file

}} + + + {{ context.value }} + + {{ diff --git a/web/lora-package/src/onboarding/gateways/gateways.component.ts b/web/lora-package/src/onboarding/gateways/gateways.component.ts index a35a91963..998ce7745 100644 --- a/web/lora-package/src/onboarding/gateways/gateways.component.ts +++ b/web/lora-package/src/onboarding/gateways/gateways.component.ts @@ -5,7 +5,8 @@ import { Column, ColumnDataRecordClassName, Pagination, - DataGridComponent, DataSourceModifier, FilteringActionType, ServerSideDataResult, _ + DataGridComponent, DataSourceModifier, FilteringActionType, ServerSideDataResult, _, + DeviceStatusComponent } from '@c8y/ngx-components'; import { Component, EventEmitter, Output, TemplateRef, ViewChild } from '@angular/core'; import { FetchClient, InventoryService, IdentityService, IManagedObject, QueriesUtil } from '@c8y/client'; @@ -62,6 +63,11 @@ export class LoraGatewaysComponent { deleteGatewaysModalRef: BsModalRef; queriesUtil: QueriesUtil; columns: Column[] = [ + { + name: 'status', + header: 'Status', + path: 'c8y_Availability.status' + }, { name: 'id', header: 'GW Id', path: 'id' }, { name: 'name', @@ -75,11 +81,6 @@ export class LoraGatewaysComponent { header: 'Type', path: 'c8y_Hardware.model' }, - { - name: 'status', - header: 'Status', - path: 'gatewayAvailability' - }, { name: 'lnstype', header: 'LNS Type', path: 'lnsConnectorId' }, { name: 'lnsname', header: 'LNS Name', path: 'lnsConnectorId' } ];