FIX unable to update route at restart in Actility Thingpark

Cumulocity-IoT · Jun 9, 2024 · b252434 · b252434
1 parent a0b0789
commit b252434
Show file tree

Hide file tree

Showing 32 changed files with 162 additions and 69 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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</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.0.1</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>lora-ns-actility</artifactId>

diff --git a/java/lora-ns-actility/src/main/java/lora/ns/actility/ActilityConnector.java b/java/lora-ns-actility/src/main/java/lora/ns/actility/ActilityConnector.java
@@ -46,6 +46,7 @@
 import lora.ns.actility.api.model.appserver.AppServerCustomHttpHeadersInner;
 import lora.ns.actility.api.model.appserver.AppServerHttpLorawanDestination;
 import lora.ns.actility.api.model.appserver.AppServerStrategy;
+import lora.ns.actility.api.model.appserver.AppServerUpdate;
 import lora.ns.actility.api.model.appserver.DownlinkSecurity;
 import lora.ns.actility.api.model.basestation.Bs;
 import lora.ns.actility.api.model.basestation.BsAppServersInner;
@@ -65,7 +66,6 @@
 import lora.ns.actility.api.model.device.DeviceProfiles;
 import lora.ns.actility.api.model.device.DeviceProfilesBriefsInner;
 import lora.ns.actility.common.RandomUtils;
-import lora.ns.actility.rest.ActilityAdminService;
 import lora.ns.actility.rest.ActilityServiceAccountService;
 import lora.ns.actility.rest.JwtInterceptor;
 import lora.ns.connector.LNSAbstractConnector;
@@ -78,13 +78,13 @@
 @Slf4j
 public class ActilityConnector extends LNSAbstractConnector {
 
+	private static final String THINGPARK_WIRELESS_REST = "/thingpark/wireless/rest";
 	private static final String AS_ID_PROPERTY = "asId";
 	private static final String AS_KEY_PROPERTY = "asKey";
 	private static final String AS_ID_PREFIX = "cumulocity-";
 	private static final String DEFAULT_AS_ID = "cumulocity";
 	private static final String DEFAULT_AS_KEY = "4e0ff46472fa1840f25368c066e94769";
 
-	private ActilityAdminService actilityAdminService;
 	private ActilityServiceAccountService actilityServiceAccountService;
 
 	private DeviceApi deviceApi;
@@ -108,12 +108,7 @@ public DXAdminJWTInterceptor(String clientId, String clientSecret) {
 		protected String getToken() {
 			Token token = null;
 			try {
-				if (this.clientId.contains("/")) {
-					token = actilityServiceAccountService.getToken("client_credentials", this.clientId,
-									this.clientSecret);
-				} else {
-					token = actilityAdminService.getToken("client_credentials", this.clientId, this.clientSecret);
-				}
+				token = actilityServiceAccountService.getToken("client_credentials", this.clientId, this.clientSecret);
 			} catch (Exception e) {
 				throw new LoraException("Couldn't get JWT", e);
 			}
@@ -176,14 +171,8 @@ protected void init() {
 		final ch.qos.logback.classic.Logger serviceLogger = (ch.qos.logback.classic.Logger) LoggerFactory
 						.getLogger("lora.ns.actility");
 		serviceLogger.setLevel(ch.qos.logback.classic.Level.DEBUG);
-		var feignBuilder = Feign.builder().client(new Client.Default(getSSLSocketFactory(), getHostnameVerifier()))
-						.decoder(new JacksonDecoder(objectMapper)).encoder(new FormEncoder())
-						.logger(new Slf4jLogger("lora.ns.actility")).logLevel(Level.FULL)
-						.requestInterceptor(template -> template.header("Content-Type",
-										"application/x-www-form-urlencoded"));
 		String url = properties.getProperty("url");
-		actilityAdminService = feignBuilder.target(ActilityAdminService.class, url + "/thingpark/dx/admin/latest/api/");
-		feignBuilder = Feign.builder().client(new Client.Default(getSSLSocketFactory(), getHostnameVerifier()))
+		var feignBuilder = Feign.builder().client(new Client.Default(getSSLSocketFactory(), getHostnameVerifier()))
 						.decoder(new JacksonDecoder(objectMapper)).encoder(new FormEncoder())
 						.logger(new Slf4jLogger("lora.ns.actility")).logLevel(Level.FULL)
 						.requestInterceptor(template -> template.header("Content-Type",
@@ -199,9 +188,9 @@ protected void init() {
 		feignBuilder = feignBuilder.requestInterceptor(new DXAdminJWTInterceptor(properties.getProperty("username"),
 						properties.getProperty("password")));
 
-		deviceApi = feignBuilder.target(DeviceApi.class, url + "/thingpark/wireless/rest");
-		appServerApi = feignBuilder.target(AppServerApi.class, url + "/thingpark/wireless/rest");
-		baseStationApi = feignBuilder.target(BaseStationApi.class, url + "/thingpark/wireless/rest");
+		deviceApi = feignBuilder.target(DeviceApi.class, url + THINGPARK_WIRELESS_REST);
+		appServerApi = feignBuilder.target(AppServerApi.class, url + THINGPARK_WIRELESS_REST);
+		baseStationApi = feignBuilder.target(BaseStationApi.class, url + THINGPARK_WIRELESS_REST);
 		downlinkV2Api = feignBuilder.target(DownlinkApi.class, url + "/thingpark/lrc/rest");
 	}
 
@@ -244,25 +233,30 @@ public void provisionDevice(DeviceProvisioning deviceProvisioning) {
 
 	@Override
 	public void configureRoutings(String url, String tenant, String login, String password) {
-		log.info("Configuring routings to: {} with credentials: {}:{}", url, login, password);
+		String domain = properties.getProperty("domain");
+		String group = properties.getProperty("group");
+		log.info("Configuring routings to: {} with credentials: {}:{} and domain {}:{}", url, login, password, domain,
+						group);
 
 		var appServers = appServerApi.getAppServersByName(tenant + "-" + getId());
 		if (!appServers.getBriefs().isEmpty()) {
 			// Update appserver
-			this.appServerId = appServers.getBriefs().iterator().next().getID();
-			String uid = appServers.getBriefs().iterator().next().getID().split("\\.")[1];
-			var appServer = new AppServer();
-			appServer.setType(null);
-			appServer.setContentType(ContentTypeEnum.JSON);
+			var currentAppServer = appServers.getBriefs().iterator().next();
+			this.appServerId = currentAppServer.getID();
+			String uid = currentAppServer.getID().split("\\.")[1];
+			var appServer = new AppServerUpdate();
 			appServer.setCustomHttpHeaders(new ArrayList<>());
 			appServer.addCustomHttpHeadersItem(new AppServerCustomHttpHeadersInner().name("Authentication")
 							.value("Basic " + Base64.getEncoder()
 											.encodeToString((tenant + "/" + login + ":" + password).getBytes())));
 			appServer.setDestinations(new ArrayList<>());
 			appServer.addDestinationsItem(new AppServerHttpLorawanDestination().addAddressesItem(url + "/uplink")
 							.strategy(AppServerStrategy.SEQUENTIAL).ports("*"));
-			appServer.downlinkSecurity(new DownlinkSecurity(getAsId(), getAsKey()));
-			// appServerApi.updateAppServer(uid, appServer); <- doesn't work, 403
+			if (properties.containsKey("domain")) {
+				appServer.addDomainsItem(new Domain().name(properties.getProperty("domain"))
+								.group(new DomainGroup().name(properties.getProperty("group"))));
+			}
+			appServerApi.updateAppServer(uid, appServer);
 		} else {
 			// Create appserver
 			var appServer = new AppServer().contentType(ContentTypeEnum.JSON)
@@ -287,7 +281,7 @@ public void removeRoutings() {
 
 	@Override
 	public void deprovisionDevice(String deveui) {
-		deviceApi.deleteDevice("e" + deveui);
+		deviceApi.deleteDevice("e" + deveui.toUpperCase());
 	}
 
 	@Override

diff --git a/java/lora-ns-actility/src/main/java/lora/ns/actility/api/AppServerApi.java b/java/lora-ns-actility/src/main/java/lora/ns/actility/api/AppServerApi.java
@@ -3,6 +3,7 @@
 import feign.Param;
 import feign.RequestLine;
 import lora.ns.actility.api.model.appserver.AppServer;
+import lora.ns.actility.api.model.appserver.AppServerUpdate;
 import lora.ns.actility.api.model.appserver.AppServers;
 
 public interface AppServerApi {
@@ -16,5 +17,5 @@ public interface AppServerApi {
     AppServer createAppServer(AppServer appServer);
 
     @RequestLine("PUT /subscriptions/mine/appServers/{appServerUID}")
-    AppServer updateAppServer(@Param("appServerUID") String appServerUID, AppServer appServer);
+    AppServer updateAppServer(@Param("appServerUID") String appServerUID, AppServerUpdate appServer);
 }