From 1d0ec5b203d4762a005cef01ea356ffe03599c37 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Thu, 7 May 2020 12:48:13 -0400 Subject: [PATCH] pom file cleanup, properties and launch changes re connecting to AllCloudInOne testing --- opensync-ext-cloud/pom.xml | 48 ++++---- .../OpensyncExternalIntegrationCloud.java | 26 ++-- opensync-gateway-cloud-process/pom.xml | 116 ++++++++++++++++-- .../src/main/resources/application.properties | 4 +- ...yncProcess (local, KDC certs) cloud.launch | 2 +- 5 files changed, 148 insertions(+), 48 deletions(-) diff --git a/opensync-ext-cloud/pom.xml b/opensync-ext-cloud/pom.xml index 044ce8b..7ec3533 100644 --- a/opensync-ext-cloud/pom.xml +++ b/opensync-ext-cloud/pom.xml @@ -29,98 +29,98 @@ ${tip-wlan-cloud.release.version} - - webtoken-auth-service - com.telecominfraproject.wlan - ${tip-wlan-cloud.release.version} - + + + + + - - portal-services - com.telecominfraproject.wlan - ${tip-wlan-cloud.release.version} - + + + + + - customer-service-remote + customer-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - location-service-remote + location-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - equipment-service-remote + equipment-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - profile-service-remote + profile-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - portal-user-service-remote + portal-user-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - service-metric-service-remote + service-metric-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - system-event-service-remote + system-event-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - alarm-service-remote + alarm-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - status-service-remote + status-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - client-service-remote + client-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - routing-service-remote + routing-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - firmware-service-remote + firmware-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - manufacturer-service-remote + manufacturer-service-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} - cloud-event-dispatcher-remote + cloud-event-dispatcher-interface com.telecominfraproject.wlan ${tip-wlan-cloud.release.version} diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 3f446fa..a84698e 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -110,23 +110,23 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) { LOG.info("AP {} got connected to the gateway", apId); - Customer customer = null; - try { - customer = customerServiceInterface.get(autoProvisionedCustomerId); - LOG.debug("Got Customer {} for apId {}", customer.toPrettyString()); - } catch (Exception e) { - LOG.error("Caught exception getting customer for Id {} for apId {}", autoProvisionedCustomerId, apId, e); - } - Equipment ce = null; - try { - ce = getCustomerEquipment(apId); - LOG.debug("Got Equipment {} for apId {}", ce.toPrettyString()); - } catch (Exception e) { - LOG.error("Caught exception getting equipment for Id {} for apId {}", autoProvisionedEquipmentId, apId, e); + Customer customer = null; try { customer = + customerServiceInterface.get(autoProvisionedCustomerId); + LOG.debug("Got Customer {} for apId {}", customer.toPrettyString()); } catch + (Exception e) { + LOG.error("Caught exception getting customer for Id {} for apId {}", + autoProvisionedCustomerId, apId, e); } + + Equipment ce = null; try { ce = getCustomerEquipment(apId); + LOG.debug("Got Equipment {} for apId {}", ce.toPrettyString()); } catch + (Exception e) { + LOG.error("Caught exception getting equipment for Id {} for apId {}", + autoProvisionedEquipmentId, apId, e); } + try { OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId); ovsdbSession.setEquipmentId(2); diff --git a/opensync-gateway-cloud-process/pom.xml b/opensync-gateway-cloud-process/pom.xml index 303b975..b859ccf 100644 --- a/opensync-gateway-cloud-process/pom.xml +++ b/opensync-gateway-cloud-process/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 com.telecominfraproject.wlan @@ -15,18 +17,116 @@ - - com.telecominfraproject.wlan - opensync-gateway - ${tip-wlan-cloud.release.version} - + com.telecominfraproject.wlan opensync-ext-cloud ${tip-wlan-cloud.release.version} - - + + base-container + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + webtoken-auth-service + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + portal-services + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + customer-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + location-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + equipment-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + profile-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + portal-user-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + service-metric-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + system-event-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + alarm-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + status-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + client-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + routing-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + firmware-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + manufacturer-service-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + + cloud-event-dispatcher-remote + com.telecominfraproject.wlan + ${tip-wlan-cloud.release.version} + + + diff --git a/opensync-gateway-cloud-process/src/main/resources/application.properties b/opensync-gateway-cloud-process/src/main/resources/application.properties index 768d32a..15e931a 100644 --- a/opensync-gateway-cloud-process/src/main/resources/application.properties +++ b/opensync-gateway-cloud-process/src/main/resources/application.properties @@ -79,7 +79,7 @@ spring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConf #used by *-remote client classes when they authenticate their requests tip.wlan.httpClientConfig=classpath:httpClientConfig.json -tip.wlan.introspectTokenApi.host=localhost:9096 +tip.wlan.introspectTokenApi.host=localhost:9091 tip.wlan.introspectTokenApi.clientToken=token_placeholder #this user/password is used together with http_digest_auth and http_basic_auth spring profiles tip.wlan.serviceUser=user @@ -89,7 +89,7 @@ spring.main.show-banner=false server.port=9096 #this port is used by secondary server connector, it is protected by digest authentication, while primary server.port is protected by client certificate auth -tip.wlan.secondaryPort=7071 +tip.wlan.secondaryPort=9097 #this server only supports REST requests, CSRF would get in the way tip.wlan.csrf-enabled=false diff --git a/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch b/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch index 92d6dec..77a5020 100644 --- a/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch +++ b/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch @@ -20,5 +20,5 @@ - +