scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-03 03:57:54 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

TW-749: Change reference of ConnectUs to TIP (#4)

Browse Source 
* ConnectUs Reference Changes

Removed Loggers

* ConnectUs Reference Changes

Changed
-all properties (shell files and launcher file), -profile ssidnames,
-launcher certificates,
-removed connectus.ai componentscan package

* Changed Docker Connectus References

* Changed Java ConnectUs References

* Changed json ssid Connectus references

* Minor changes

* ConnectUs Reference Changes

Removed Loggers

* ConnectUs Reference Changes

Changed
-all properties (shell files and launcher file), -profile ssidnames,
-launcher certificates,
-removed connectus.ai componentscan package

* Changed Docker Connectus References

* Changed Java ConnectUs References

* Changed json ssid Connectus references

* Minor changes

* Reference changes in Junit

* Changed OvsdbRedirector to TipWlanOvsdbRedirector
This commit is contained in:
AkshayJagadish-ne
2020-07-09 19:24:21 -04:00
committed by GitHub
parent 56e8af9227
commit b9c0a6d88a
28 changed files with 149 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -167,19 +167,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
@Autowired @Autowired
private OpensyncCloudGatewayController gatewayController; private OpensyncCloudGatewayController gatewayController;
@Value("${connectus.ovsdb.autoProvisionedCustomerId:1970}") @Value("${tip.wlan.ovsdb.autoProvisionedCustomerId:1970}")
private int autoProvisionedCustomerId; private int autoProvisionedCustomerId;
@Value("${connectus.ovsdb.autoProvisionedLocationId:8}") @Value("${tip.wlan.ovsdb.autoProvisionedLocationId:8}")
private int autoProvisionedLocationId; private int autoProvisionedLocationId;
@Value("${connectus.ovsdb.autoProvisionedProfileId:1}") @Value("${tip.wlan.ovsdb.autoProvisionedProfileId:1}")
private int autoProvisionedProfileId; private int autoProvisionedProfileId;
@Value("${connectus.ovsdb.autoProvisionedSsid:DefaultSsid-}") @Value("${tip.wlan.ovsdb.autoProvisionedSsid:DefaultSsid-}")
private String autoProvisionedSsid; private String autoProvisionedSsid;
@Value("${connectus.ovsdb.autoprovisionedSsidKey:12345678}") @Value("${tip.wlan.ovsdb.autoprovisionedSsidKey:12345678}")
private String autoprovisionedSsidKey; private String autoprovisionedSsidKey;
@Value("${connectus.ovsdb.isAutoconfigEnabled:true}") @Value("${tip.wlan.ovsdb.isAutoconfigEnabled:true}")
private boolean isAutoconfigEnabled; private boolean isAutoconfigEnabled;
@Value("${connectus.ovsdb.defaultFwVersion:r10947-65030d81f3}") @Value("${tip.wlan.ovsdb.defaultFwVersion:r10947-65030d81f3}")
private String defaultFwVersion; private String defaultFwVersion;
@Autowired @Autowired

10
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java vendored
View File

@@ -41,7 +41,7 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStartDebugEngine
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand; import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand;
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse; import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse;
import com.telecominfraproject.wlan.equipmentgateway.models.GatewayDefaults; import com.telecominfraproject.wlan.equipmentgateway.models.GatewayDefaults;
import com.telecominfraproject.wlan.opensync.external.integration.ConnectusOvsdbClientInterface; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbClientInterface;
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
import com.telecominfraproject.wlan.routing.RoutingServiceInterface; import com.telecominfraproject.wlan.routing.RoutingServiceInterface;
@@ -75,7 +75,7 @@ public class OpensyncCloudGatewayController {
private ServiceInstanceInformation serviceInstanceInfo; private ServiceInstanceInformation serviceInstanceInfo;
@Autowired @Autowired
private ConnectusOvsdbClientInterface connectusOvsdbClient; private OvsdbClientInterface tipwlanOvsdbClient;
/** /**
* Flag indicates if this gateway has registered with routing service * Flag indicates if this gateway has registered with routing service
@@ -265,14 +265,14 @@ public class OpensyncCloudGatewayController {
registeredGateway.getHostname(), registeredGateway.getPort()); registeredGateway.getHostname(), registeredGateway.getPort());
if (command instanceof CEGWConfigChangeNotification) { if (command instanceof CEGWConfigChangeNotification) {
connectusOvsdbClient.processConfigChanged(inventoryId); tipwlanOvsdbClient.processConfigChanged(inventoryId);
} else if (command instanceof CEGWStartDebugEngine) { } else if (command instanceof CEGWStartDebugEngine) {
// dtop: we will be using CEGWStartDebugEngine command to deliver // dtop: we will be using CEGWStartDebugEngine command to deliver
// request to // request to
// change redirector // change redirector
// TODO: after the demo introduce a specialized command for this! // TODO: after the demo introduce a specialized command for this!
String newRedirectorAddress = ((CEGWStartDebugEngine) command).getGatewayHostname(); String newRedirectorAddress = ((CEGWStartDebugEngine) command).getGatewayHostname();
connectusOvsdbClient.changeRedirectorAddress(inventoryId, newRedirectorAddress); tipwlanOvsdbClient.changeRedirectorAddress(inventoryId, newRedirectorAddress);
// TODO: add support for additional commands below // TODO: add support for additional commands below
} else if (command instanceof CEGWFirmwareDownloadRequest) { } else if (command instanceof CEGWFirmwareDownloadRequest) {
@@ -283,7 +283,7 @@ public class OpensyncCloudGatewayController {
String username = dlRequest.getUsername(); String username = dlRequest.getUsername();
String validationCode = dlRequest.getValidationCode(); String validationCode = dlRequest.getValidationCode();
connectusOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username, tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username,
validationCode); validationCode);
} else if (command instanceof CEGWRadioResetRequest) { } else if (command instanceof CEGWRadioResetRequest) {

2
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/ConnectusOvsdbClientInterface.java → opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java vendored
View File

@@ -2,7 +2,7 @@ package com.telecominfraproject.wlan.opensync.external.integration;
import java.util.Set; import java.util.Set;
public interface ConnectusOvsdbClientInterface { public interface OvsdbClientInterface {
Set<String> getConnectedClientIds(); Set<String> getConnectedClientIds();

10
opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java vendored
View File

@@ -31,19 +31,19 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
private static final Logger LOG = LoggerFactory.getLogger(OpensyncExternalIntegrationSimple.class); private static final Logger LOG = LoggerFactory.getLogger(OpensyncExternalIntegrationSimple.class);
@Value("${connectus.ovsdb.customerEquipmentFileName:/app/config/EquipmentExample.json}") @Value("${tip.wlan.ovsdb.customerEquipmentFileName:/app/config/EquipmentExample.json}")
private String customerEquipmentFileName; private String customerEquipmentFileName;
@Value("${connectus.ovsdb.apProfileFileName:/app/config/ProfileAPExample.json}") @Value("${tip.wlan.ovsdb.apProfileFileName:/app/config/ProfileAPExample.json}")
private String apProfileFileName; private String apProfileFileName;
@Value("${connectus.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}") @Value("${tip.wlan.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}")
private String ssidProfileFileName; private String ssidProfileFileName;
@Value("${connectus.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}") @Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}")
private String radiusProfileFileName; private String radiusProfileFileName;
@Value("${connectus.ovsdb.locationFileName:/app/config/LocationBuildingExample.json}") @Value("${tip.wlan.ovsdb.locationFileName:/app/config/LocationBuildingExample.json}")
private String locationFileName; private String locationFileName;
private String serialNumber = ""; private String serialNumber = "";

4
opensync-ext-static/src/main/resources/config_2_ssids.json
View File

@@ -10,7 +10,7 @@
"ssidConfigs" : [ { "ssidConfigs" : [ {
"model_type" : "OpensyncAPSsidConfig", "model_type" : "OpensyncAPSsidConfig",
"radioType" : "is2dot4GHz", "radioType" : "is2dot4GHz",
"ssid" : "Connectus-local", "ssid" : "Tip-wlan-local",
"encryption" : "WPA-PSK", "encryption" : "WPA-PSK",
"key" : "12345678", "key" : "12345678",
"mode" : "2", "mode" : "2",
@@ -18,7 +18,7 @@
}, { }, {
"model_type" : "OpensyncAPSsidConfig", "model_type" : "OpensyncAPSsidConfig",
"radioType" : "is5GHzL", "radioType" : "is5GHzL",
"ssid" : "Connectus-local-5l", "ssid" : "Tip-wlan-local-5l",
"encryption" : "WPA-PSK", "encryption" : "WPA-PSK",
"key" : "12345678", "key" : "12345678",
"mode" : "2", "mode" : "2",

2
opensync-gateway-cloud-docker/src/main/docker/Dockerfile
View File

@@ -1,5 +1,5 @@
FROM adoptopenjdk/openjdk13:alpine-jre FROM adoptopenjdk/openjdk13:alpine-jre
MAINTAINER ConnectUs MAINTAINER TipWlan
# Update the package list and upgrade installed packages # Update the package list and upgrade installed packages
RUN apk update && apk upgrade && apk add bash RUN apk update && apk upgrade && apk add bash

1
opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml
View File

@@ -63,7 +63,6 @@
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/> <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
<logger name="com.telecominfraproject.wlan" level="DEBUG"/> <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
<logger name="ai.connectus" level="DEBUG"/>
<logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/> <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/> <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/> <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>

30
opensync-gateway-cloud-docker/src/main/docker/app/run.sh
View File

@@ -10,24 +10,24 @@ CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStore=/opt/tip-wlan/certs/client_key
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStorePassword=mypassword" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStorePassword=mypassword"
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStore=/opt/tip-wlan/certs/truststore.jks" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStore=/opt/tip-wlan/certs/truststore.jks"
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStorePassword=mypassword" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStorePassword=mypassword"
CLIENT_MQTT_SSL_PROPS+=" -Dconnectus.mqttBroker.password=admin" CLIENT_MQTT_SSL_PROPS+=" -Dtip.wlan.mqttBroker.password=admin"
OVSDB_MANAGER_HOST=${OVSDB_MANAGER} OVSDB_MANAGER_HOST=${OVSDB_MANAGER}
MQTT_BROKER_HOST="${MQTT_SERVER}" MQTT_BROKER_HOST="${MQTT_SERVER}"
BACKEND_SERVER="${BACKEND_SERVER}" BACKEND_SERVER="${BACKEND_SERVER}"
OVSDB_PROPS=" " OVSDB_PROPS=" "
OVSDB_PROPS+=" -Dconnectus.ovsdb.managerAddr=$OVSDB_MANAGER_HOST" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
OVSDB_PROPS+=" -Dconnectus.ovsdb.listenPort=6640 " OVSDB_PROPS+=" -Dtip.wlan.ovsdb.listenPort=6640 "
OVSDB_PROPS+=" -Dconnectus.ovsdb.redirector.listenPort=6643" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.redirector.listenPort=6643"
OVSDB_PROPS+=" -Dconnectus.ovsdb.timeoutSec=30" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.timeoutSec=30"
OVSDB_PROPS+=" -Dconnectus.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
OVSDB_PROPS+=" -Dconnectus.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
OVSDB_PROPS+=" -Dconnectus.ovsdb.configFileName=/app/opensync/config_2_ssids.json" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.configFileName=/app/opensync/config_2_ssids.json"
MQTT_PROPS=" " MQTT_PROPS=" "
MQTT_PROPS+=" -Dconnectus.mqttBroker.address=$MQTT_BROKER_HOST" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address=$MQTT_BROKER_HOST"
MQTT_PROPS+=" -Dconnectus.mqttBroker.listenPort=1883" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883"
LOGBACK_CONFIG_FILE="${LOGBACK_CONFIG_FILE:=/app/opensync/logback.xml}" LOGBACK_CONFIG_FILE="${LOGBACK_CONFIG_FILE:=/app/opensync/logback.xml}"
LOGGING_PROPS=" -Dlogging.config=file:$LOGBACK_CONFIG_FILE" LOGGING_PROPS=" -Dlogging.config=file:$LOGBACK_CONFIG_FILE"
@@ -77,12 +77,12 @@ DEFAULT_LAN_NAME="${DEFAULT_LAN_NAME:=lan}"
AUTO_PROV_CUSTOMER_ID="${AUTO_PROV_CUSTOMER_ID:=2}" AUTO_PROV_CUSTOMER_ID="${AUTO_PROV_CUSTOMER_ID:=2}"
PROV_PROPS=" " PROV_PROPS=" "
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_bridge=$DEFAULT_BRIDGE" PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_bridge=$DEFAULT_BRIDGE"
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE" PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE"
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_type=$DEFAULT_LAN_TYPE" PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$DEFAULT_LAN_TYPE"
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_name=$DEFAULT_LAN_NAME" PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$DEFAULT_LAN_NAME"
PROV_PROPS+=" -Dconnectus.ovsdb.autoProvisionedCustomerId=$AUTO_PROV_CUSTOMER_ID" PROV_PROPS+=" -Dtip.wlan.ovsdb.autoProvisionedCustomerId=$AUTO_PROV_CUSTOMER_ID"
export ALL_PROPS="$PROFILES $SSL_PROPS $CLIENT_MQTT_SSL_PROPS $OVSDB_PROPS $MQTT_PROPS $LOGGING_PROPS $RESTAPI_PROPS $SPRING_EXTRA_PROPS $HOST_PROPS $PROV_PROPS" export ALL_PROPS="$PROFILES $SSL_PROPS $CLIENT_MQTT_SSL_PROPS $OVSDB_PROPS $MQTT_PROPS $LOGGING_PROPS $RESTAPI_PROPS $SPRING_EXTRA_PROPS $HOST_PROPS $PROV_PROPS"

2
opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch
View File

@@ -21,5 +21,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-cloud-process"/> <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-cloud-process"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-cloud-process"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-cloud-process"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dconnectus.ovsdb.wifi-iface.default_bridge=br-lan&#10;-Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;-Dconnectus.ovsdb.autoProvisionedCustomerId=2&#10;-Dconnectus.ovsdb.autoProvisionedSsid=Connectus-cloud&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;-Dtip.wlan.secondaryPort=7071&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dtip.wlan.ovsdb.managerAddr=${local_server_address}&#10;-Dtip.wlan.ovsdb.listenPort=6640&#10;-Dtip.wlan.ovsdb.redirector.listenPort=6643&#10;-Dtip.wlan.ovsdb.timeoutSec=30&#10;-Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12&#10;&#10;-Dtip.wlan.mqttBroker.address=${local_server_address}&#10;-Dtip.wlan.mqttBroker.listenPort=1883&#10;-Dtip.wlan.ovsdb.wifi-iface.default_bridge=br-lan&#10;-Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;-Dtip.wlan.ovsdb.autoProvisionedCustomerId=2&#10;-Dtip.wlan.ovsdb.autoProvisionedSsid=TipWlan-cloud&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;-Dtip.wlan.secondaryPort=7071&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
</launchConfiguration> </launchConfiguration>

1
opensync-gateway-cloud-process/src/main/resources/logback.xml
View File

@@ -60,7 +60,6 @@
<logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/> <logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/>
<logger name="com.telecominfraproject.wlan" level="DEBUG"/> <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
<logger name="ai.connectus" level="DEBUG"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/> <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/> <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>

2
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM adoptopenjdk/openjdk13:alpine-jre FROM adoptopenjdk/openjdk13:alpine-jre
LABEL maintainer="ConnectUs.ai as part of the Telecom Infrastructure Project" LABEL maintainer="Telecom Infrastructure Project"
LABEL version="1.0" LABEL version="1.0"
LABEL description="This image runs the mqtt broker (mosquitto) and \ LABEL description="This image runs the mqtt broker (mosquitto) and \
a statically configured OpenSync gateway." a statically configured OpenSync gateway."

1
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/logback.xml
View File

@@ -64,7 +64,6 @@
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/> <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
<logger name="com.telecominfraproject.wlan" level="INFO"/> <logger name="com.telecominfraproject.wlan" level="INFO"/>
<logger name="ai.connectus" level="INFO"/>
<logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/> <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/> <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/> <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>

50
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh
View File

@@ -120,36 +120,36 @@ CLIENT_MQTT_SSL_PROPS="$CLIENT_MQTT_SSL_PROPS -Djavax.net.ssl.trustStore=$MQTT_T
CLIENT_MQTT_SSL_PROPS="$CLIENT_MQTT_SSL_PROPS -Djavax.net.ssl.trustStorePassword=$MQTT_TRUSTSTORE_PASSWORD" CLIENT_MQTT_SSL_PROPS="$CLIENT_MQTT_SSL_PROPS -Djavax.net.ssl.trustStorePassword=$MQTT_TRUSTSTORE_PASSWORD"
OVSDB_PROPS=" " OVSDB_PROPS=" "
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.managerAddr=$OVSDB_MANAGER_HOST" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.listenPort=6640 " OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.listenPort=6640 "
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.redirector.listenPort=6643" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.redirector.listenPort=6643"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.timeoutSec=30" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.timeoutSec=30"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.trustStore=$OVSDB_SERVER_TRUSTSTORE_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.trustStore=$OVSDB_SERVER_TRUSTSTORE_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.trustStorePassword=$OVSDB_SERVER_TRUSTSTORE_PASSWORD" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.trustStorePassword=$OVSDB_SERVER_TRUSTSTORE_PASSWORD"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.keyStore=$OVSDB_SERVER_KEYSTORE_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.keyStore=$OVSDB_SERVER_KEYSTORE_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.keyStorePassword=$OVSDB_SERVER_KEYSTORE_PASSWORD" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.keyStorePassword=$OVSDB_SERVER_KEYSTORE_PASSWORD"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2"
echo OVSDB_PROPS $OVSDB_PROPS echo OVSDB_PROPS $OVSDB_PROPS
MQTT_PROPS=" " MQTT_PROPS=" "
MQTT_PROPS="$MQTT_PROPS -Dconnectus.mqttBroker.address=$MQTT_BROKER_HOST" MQTT_PROPS="$MQTT_PROPS -Dtip.wlan.mqttBroker.address=$MQTT_BROKER_HOST"
MQTT_PROPS="$MQTT_PROPS -Dconnectus.mqttBroker.listenPort=1883" MQTT_PROPS="$MQTT_PROPS -Dtip.wlan.mqttBroker.listenPort=1883"
LOGGING_PROPS=" -Dlogging.config=file:$LOGBACK_CONFIG_FILE" LOGGING_PROPS=" -Dlogging.config=file:$LOGBACK_CONFIG_FILE"

2
opensync-gateway-static-docker/src/main/docker/Dockerfile
View File

@@ -1,5 +1,5 @@
FROM adoptopenjdk/openjdk13:alpine-jre FROM adoptopenjdk/openjdk13:alpine-jre
MAINTAINER ConnectUs MAINTAINER TipWlan
# Update the package list and upgrade installed packages # Update the package list and upgrade installed packages
RUN apk update && apk upgrade && apk add bash RUN apk update && apk upgrade && apk add bash

1
opensync-gateway-static-docker/src/main/docker/app/opensync/logback.xml
View File

@@ -57,7 +57,6 @@
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/> <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
<logger name="com.telecominfraproject.wlan" level="DEBUG"/> <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
<logger name="ai.connectus" level="DEBUG"/>
<logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/> <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/> <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/> <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>

48
opensync-gateway-static-docker/src/main/docker/app/run.sh
View File

@@ -10,36 +10,36 @@ CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStore=/opt/tip-wlan/certs/client_key
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStorePassword=mypassword" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.keyStorePassword=mypassword"
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStore=/opt/tip-wlan/certs/truststore.jks" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStore=/opt/tip-wlan/certs/truststore.jks"
CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStorePassword=mypassword" CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStorePassword=mypassword"
CLIENT_MQTT_SSL_PROPS+=" -Dconnectus.mqttBroker.password=admin" CLIENT_MQTT_SSL_PROPS+=" -Dtip.wlan.mqttBroker.password=admin"
OVSDB_PROPS=" " OVSDB_PROPS=" "
OVSDB_PROPS+=" -Dconnectus.ovsdb.managerAddr=opensync-controller" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=opensync-controller"
OVSDB_PROPS+=" -Dconnectus.ovsdb.listenPort=6640 " OVSDB_PROPS+=" -Dtip.wlan.ovsdb.listenPort=6640 "
OVSDB_PROPS+=" -Dconnectus.ovsdb.redirector.listenPort=6643" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.redirector.listenPort=6643"
OVSDB_PROPS+=" -Dconnectus.ovsdb.timeoutSec=30" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.timeoutSec=30"
OVSDB_PROPS+=" -Dconnectus.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
OVSDB_PROPS+=" -Dconnectus.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
OVSDB_PROPS+=" -Dconnectus.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2"
echo OVSDB_PROPS $OVSDB_PROPS echo OVSDB_PROPS $OVSDB_PROPS
MQTT_PROPS=" " MQTT_PROPS=" "
MQTT_PROPS+=" -Dconnectus.mqttBroker.address=tip-wlan-opensync-mqtt-broker" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address=tip-wlan-opensync-mqtt-broker"
MQTT_PROPS+=" -Dconnectus.mqttBroker.listenPort=1883" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883"
LOGGING_PROPS=" -Dlogging.config=file:/app/opensync/logback.xml" LOGGING_PROPS=" -Dlogging.config=file:/app/opensync/logback.xml"

4
opensync-gateway-static-process/src/main/resources/app/opensync/config_2_ssids.json
View File

@@ -10,7 +10,7 @@
"ssidConfigs" : [ { "ssidConfigs" : [ {
"model_type" : "OpensyncAPSsidConfig", "model_type" : "OpensyncAPSsidConfig",
"radioType" : "is2dot4GHz", "radioType" : "is2dot4GHz",
"ssid" : "Connectus-local", "ssid" : "Tip-wlan-local",
"encryption" : "WPA-PSK", "encryption" : "WPA-PSK",
"key" : "12345678", "key" : "12345678",
"mode" : "2", "mode" : "2",
@@ -18,7 +18,7 @@
}, { }, {
"model_type" : "OpensyncAPSsidConfig", "model_type" : "OpensyncAPSsidConfig",
"radioType" : "is5GHzL", "radioType" : "is5GHzL",
"ssid" : "Connectus-local-5l", "ssid" : "Tip-wlan-local-5l",
"encryption" : "WPA-PSK", "encryption" : "WPA-PSK",
"key" : "12345678", "key" : "12345678",
"mode" : "2", "mode" : "2",

2
opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch
View File

@@ -14,5 +14,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-static-process"/> <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-static-process"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dconnectus.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dconnectus.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dconnectus.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;-Dconnectus.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dtip.wlan.ovsdb.managerAddr=${local_server_address}&#10;-Dtip.wlan.ovsdb.listenPort=6640&#10;-Dtip.wlan.ovsdb.redirector.listenPort=6643&#10;-Dtip.wlan.ovsdb.timeoutSec=30&#10;-Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12&#10;&#10;-Dtip.wlan.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dtip.wlan.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dtip.wlan.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dtip.wlan.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;-Dtip.wlan.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json&#10;-Dtip.wlan.mqttBroker.address=${local_server_address}&#10;-Dtip.wlan.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
</launchConfiguration> </launchConfiguration>

1
opensync-gateway-static-process/src/main/resources/logback.xml
View File

@@ -60,7 +60,6 @@
<logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/> <logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/>
<logger name="com.telecominfraproject.wlan" level="DEBUG"/> <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
<logger name="ai.connectus" level="DEBUG"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/> <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/> <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>

14
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncConnectusController.java → opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncGatewayController.java
View File

@@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.telecominfraproject.wlan.opensync.external.integration.ConnectusOvsdbClientInterface; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbClientInterface;
@Profile("ovsdb_manager") @Profile("ovsdb_manager")
@RestController @RestController
@RequestMapping(value = "/api") @RequestMapping(value = "/api")
public class OpenSyncConnectusController { public class OpenSyncGatewayController {
private static final Logger LOG = LoggerFactory.getLogger(OpenSyncConnectusController.class); private static final Logger LOG = LoggerFactory.getLogger(OpenSyncGatewayController.class);
@Autowired @Autowired
ConnectusOvsdbClientInterface connectusOvsdbClient; OvsdbClientInterface tipwlanOvsdbClient;
@RequestMapping(value = "/connectedClients", method = RequestMethod.GET) @RequestMapping(value = "/connectedClients", method = RequestMethod.GET)
public List<String> getConnectedClients() { public List<String> getConnectedClients() {
List<String> ret = new ArrayList<String>(connectusOvsdbClient.getConnectedClientIds()); List<String> ret = new ArrayList<String>(tipwlanOvsdbClient.getConnectedClientIds());
LOG.info("Returning connected clients {}", ret); LOG.info("Returning connected clients {}", ret);
return ret; return ret;
} }
@@ -34,7 +34,7 @@ public class OpenSyncConnectusController {
@RequestMapping(value = "/changeRedirectorAddress", method = RequestMethod.POST) @RequestMapping(value = "/changeRedirectorAddress", method = RequestMethod.POST)
public String changeRedirectorAddress(@RequestParam String apId, @RequestParam String newRedirectorAddress) { public String changeRedirectorAddress(@RequestParam String apId, @RequestParam String newRedirectorAddress) {
LOG.info("Changing redirector address for AP {} to {}", apId, newRedirectorAddress); LOG.info("Changing redirector address for AP {} to {}", apId, newRedirectorAddress);
String ret = connectusOvsdbClient.changeRedirectorAddress(apId, newRedirectorAddress); String ret = tipwlanOvsdbClient.changeRedirectorAddress(apId, newRedirectorAddress);
LOG.info("Changed redirector address for AP {} to {}", apId, ret); LOG.info("Changed redirector address for AP {} to {}", apId, ret);
return ret; return ret;
} }
@@ -42,7 +42,7 @@ public class OpenSyncConnectusController {
@RequestMapping(value = "/closeSession", method = RequestMethod.POST) @RequestMapping(value = "/closeSession", method = RequestMethod.POST)
public String closeSession(@RequestParam String apId) { public String closeSession(@RequestParam String apId) {
LOG.info("Closing session for AP {} ", apId); LOG.info("Closing session for AP {} ", apId);
String ret = connectusOvsdbClient.closeSession(apId); String ret = tipwlanOvsdbClient.closeSession(apId);
LOG.info("Closed session for AP {} ", apId); LOG.info("Closed session for AP {} ", apId);
return ret; return ret;
} }

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncProcess.java
View File

@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
@ComponentScan(basePackages={"com.telecominfraproject.wlan", "ai.connectus"}) @ComponentScan(basePackages={"com.telecominfraproject.wlan"})
@EnableAutoConfiguration @EnableAutoConfiguration
public class OpenSyncProcess { public class OpenSyncProcess {

8
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
View File

@@ -55,10 +55,10 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
private Thread mqttClientThread; private Thread mqttClientThread;
public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext, public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext,
@Value("${connectus.mqttBroker.address:testportal.123wlan.com}") String mqttBrokerAddress, @Value("${tip.wlan.mqttBroker.address:testportal.123wlan.com}") String mqttBrokerAddress,
@Value("${connectus.mqttBroker.listenPort:1883}") int mqttBrokerListenPort, @Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
@Value("${connectus.mqttBroker.user:admin}") String username, @Value("${tip.wlan.mqttBroker.user:admin}") String username,
@Value("${connectus.mqttBroker.password:admin}") String password, @Value("${tip.wlan.mqttBroker.password:admin}") String password,
@Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}") String jdkKeyStoreLocation, @Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}") String jdkKeyStoreLocation,
@Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}") String jdkKeyStorePassword, @Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}") String jdkKeyStorePassword,
@Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}") String jdkTrustStoreLocation, @Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}") String jdkTrustStoreLocation,

8
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/NettySslContextConfig.java
View File

@@ -31,16 +31,16 @@ public class NettySslContextConfig {
@Bean(name="NettySslContextServer") @Bean(name="NettySslContextServer")
public SslContext nettySslContextServer( public SslContext nettySslContextServer(
@Value("${connectus.ovsdb.trustStore:/opt/tip-wlan/certs/truststore.jks}") @Value("${tip.wlan.ovsdb.trustStore:/opt/tip-wlan/certs/truststore.jks}")
String trustStoreFileName, String trustStoreFileName,
@Value("${connectus.ovsdb.keyStore:/opt/tip-wlan/certs/server.pkcs12}") @Value("${tip.wlan.ovsdb.keyStore:/opt/tip-wlan/certs/server.pkcs12}")
String keyFileName, String keyFileName,
@Value("${connectus.ovsdb.keyStorePassword:mypassword}") @Value("${tip.wlan.ovsdb.keyStorePassword:mypassword}")
String keyStorePassword, String keyStorePassword,
@Value("${connectus.ovsdb.trustStorePassword:mypassword}") @Value("${tip.wlan.ovsdb.trustStorePassword:mypassword}")
String trustStorePassword String trustStorePassword
){ ){
File trustStoreFile = new File(trustStoreFileName); File trustStoreFile = new File(trustStoreFileName);

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbListenerConfig.java
View File

@@ -18,7 +18,7 @@ public class OvsdbListenerConfig {
@Bean @Bean
public OvsdbPassiveConnectionListener ovsdbPassiveConnectionListener( public OvsdbPassiveConnectionListener ovsdbPassiveConnectionListener(
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.listener.threadPoolSize:10}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listener.threadPoolSize:10}")
int threadPoolSize) { int threadPoolSize) {
LOG.debug("Configuring OvsdbPassiveConnectionListener with thread pool size {}", threadPoolSize); LOG.debug("Configuring OvsdbPassiveConnectionListener with thread pool size {}", threadPoolSize);
ScheduledExecutorService executorService = Executors.newScheduledThreadPool(threadPoolSize); ScheduledExecutorService executorService = Executors.newScheduledThreadPool(threadPoolSize);

11
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java → opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
View File

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.telecominfraproject.wlan.opensync.external.integration.ConnectusOvsdbClientInterface; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbClientInterface;
import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface; import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface; import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
@@ -43,14 +43,14 @@ import io.netty.handler.ssl.SslContext;
@Profile("ovsdb_manager") @Profile("ovsdb_manager")
@Component @Component
public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface { public class TipWlanOvsdbClient implements OvsdbClientInterface {
private static final Logger LOG = LoggerFactory.getLogger(ConnectusOvsdbClient.class); private static final Logger LOG = LoggerFactory.getLogger(TipWlanOvsdbClient.class);
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.listenPort:6640}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listenPort:6640}")
private int ovsdbListenPort; private int ovsdbListenPort;
@org.springframework.beans.factory.annotation.Value("${connectus.manager.collectionIntervalSec.deviceStats:120}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.manager.collectionIntervalSec.deviceStats:120}")
private long collectionIntervalSecDeviceStats; private long collectionIntervalSecDeviceStats;
@Autowired @Autowired
@@ -157,6 +157,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} key {} ", remoteHost, localPort, LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} key {} ", remoteHost, localPort,
clientCn, key); clientCn, key);
LOG.info("ovsdbClient connectedClients = {}", ovsdbSessionMapInterface.getNumSessions()); LOG.info("ovsdbClient connectedClients = {}", ovsdbSessionMapInterface.getNumSessions());
} }
}; };

6
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java → opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbRedirector.java
View File

@@ -20,11 +20,11 @@ import io.netty.handler.ssl.SslContext;
@Profile("ovsdb_redirector") @Profile("ovsdb_redirector")
@Component @Component
public class ConnectusOvsdbRedirector { public class TipWlanOvsdbRedirector {
private static final Logger LOG = LoggerFactory.getLogger(ConnectusOvsdbRedirector.class); private static final Logger LOG = LoggerFactory.getLogger(TipWlanOvsdbRedirector.class);
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.redirector.listenPort:6643}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.redirector.listenPort:6643}")
private int ovsdbRedirectorListenPort; private int ovsdbRedirectorListenPort;
@Autowired @Autowired

38
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -75,54 +75,58 @@ import com.vmware.ovsdb.service.OvsdbClient;
public class OvsdbDao { public class OvsdbDao {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbDao.class); private static final Logger LOG = LoggerFactory.getLogger(OvsdbDao.class);
public static final String wifiRouteStateDbTable = "Wifi_Route_State"; public static final String wifiRouteStateDbTable = "Wifi_Route_State";
public static final String wifiMasterStateDbTable = "Wifi_Master_State"; public static final String wifiMasterStateDbTable = "Wifi_Master_State";
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.managerAddr:3.88.149.10}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.managerAddr:3.88.149.10}")
private String managerIpAddr; private String managerIpAddr;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.region:Ottawa}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.region:Ottawa}")
public String region; public String region;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.listenPort:6640}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listenPort:6640}")
private int ovsdbListenPort; private int ovsdbListenPort;
@org.springframework.beans.factory.annotation.Value("${connectus.mqttBroker.address:testportal.123wlan.com}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.address:testportal.123wlan.com}")
private String mqttBrokerAddress; private String mqttBrokerAddress;
@org.springframework.beans.factory.annotation.Value("${connectus.mqttBroker.listenPort:1883}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.listenPort:1883}")
private int mqttBrokerListenPort; private int mqttBrokerListenPort;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.timeoutSec:30}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.timeoutSec:30}")
private int ovsdbTimeoutSec; private int ovsdbTimeoutSec;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_bridge:defaultBridgeForEAPOL}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_bridge:defaultBridgeForEAPOL}")
public String bridgeNameVifInterfaces; public String bridgeNameVifInterfaces;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_lan_type:bridge}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_lan_type:bridge}")
public String defaultLanInterfaceType; public String defaultLanInterfaceType;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_lan_name:lan}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_lan_name:lan}")
public String defaultLanInterfaceName; public String defaultLanInterfaceName;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_wan_type:eth}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_wan_type:eth}")
public String defaultWanInterfaceType; public String defaultWanInterfaceType;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_radio1:home-ap-24}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_radio1:home-ap-24}")
public String ifPfx2pt4GHz; public String ifPfx2pt4GHz;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_radio2:home-ap-l50}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_radio2:home-ap-l50}")
public String ifPfx5GHzL; public String ifPfx5GHzL;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_radio0:home-ap-u50}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_radio0:home-ap-u50}")
public String ifPfx5GHzU; public String ifPfx5GHzU;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.max:8}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.max:8}")
public int maxInterfacesPerRadio; public int maxInterfacesPerRadio;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.awlan-node.upgrade_dl_timer:60}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.awlan-node.upgrade_dl_timer:60}")
public long upgradeDlTimerSeconds; public long upgradeDlTimerSeconds;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.awlan-node.upgrade_timer:60}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.awlan-node.upgrade_timer:60}")
public long upgradeTimerSeconds; public long upgradeTimerSeconds;
public static final String ovsdbName = "Open_vSwitch"; public static final String ovsdbName = "Open_vSwitch";
public static final String awlanNodeDbTable = "AWLAN_Node"; public static final String awlanNodeDbTable = "AWLAN_Node";
public static final String wifiStatsConfigDbTable = "Wifi_Stats_Config"; public static final String wifiStatsConfigDbTable = "Wifi_Stats_Config";
@@ -442,7 +446,7 @@ public class OvsdbDao {
// update sku_number if it was empty // update sku_number if it was empty
if ((ret.skuNumber == null) || ret.skuNumber.isEmpty()) { if ((ret.skuNumber == null) || ret.skuNumber.isEmpty()) {
ret.skuNumber = "connectus.ai_" + ret.serialNumber; ret.skuNumber = "tip.wlan_" + ret.serialNumber;
updateColumns.put("sku_number", new Atom<>(ret.skuNumber)); updateColumns.put("sku_number", new Atom<>(ret.skuNumber));
} }

22
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayConnectusOvsdbClientTest.java → opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java
View File

@@ -40,15 +40,15 @@ import io.netty.handler.ssl.SslContext;
@ActiveProfiles(profiles = { "integration_test", }) // NOTE: these profiles will @ActiveProfiles(profiles = { "integration_test", }) // NOTE: these profiles will
// be ADDED to the list of // be ADDED to the list of
// active profiles // active profiles
@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OpensyncGatewayConnectusOvsdbClientTest.class) @SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OpensyncGatewayTipWlanOvsdbClientTest.class)
@Import(value = { OpensyncGatewayConnectusOvsdbClientTest.Config.class, ConnectusOvsdbClient.class, @Import(value = { OpensyncGatewayTipWlanOvsdbClientTest.Config.class, TipWlanOvsdbClient.class,
ConnectusOvsdbRedirector.class, OvsdbListenerConfig.class, TipWlanOvsdbRedirector.class, OvsdbListenerConfig.class,
OvsdbSessionMapInterface.class, OvsdbDao.class, OpensyncExternalIntegrationInterface.class, OvsdbSessionMapInterface.class, OvsdbDao.class, OpensyncExternalIntegrationInterface.class,
OvsdbSession.class, SslContext.class }) OvsdbSession.class, SslContext.class })
public class OpensyncGatewayConnectusOvsdbClientTest { public class OpensyncGatewayTipWlanOvsdbClientTest {
@MockBean @MockBean
private ConnectusOvsdbRedirector connectusOvsdbRedirector; private TipWlanOvsdbRedirector tipwlanOvsdbRedirector;
@MockBean @MockBean
private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface; private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
@@ -70,7 +70,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
private CompletableFuture<TableUpdates> completableFuture; private CompletableFuture<TableUpdates> completableFuture;
@Autowired @Autowired
ConnectusOvsdbClient connectusOvsdbClient; TipWlanOvsdbClient tipwlanOvsdbClient;
MockitoSession mockito; MockitoSession mockito;
@@ -97,8 +97,8 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
// @PropertySource({ "classpath:persistence-${envTarget:dev}.properties" }) // @PropertySource({ "classpath:persistence-${envTarget:dev}.properties" })
static class Config { static class Config {
@Bean @Bean
public ConnectusOvsdbClient connectusOvsdbClient() { public TipWlanOvsdbClient tipwlanOvsdbClient() {
return new ConnectusOvsdbClient(); return new TipWlanOvsdbClient();
} }
} }
@@ -106,7 +106,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
public void testGetConnectedClientIds() throws Exception { public void testGetConnectedClientIds() throws Exception {
Set<String> connectedClientIds = new HashSet<String>(); Set<String> connectedClientIds = new HashSet<String>();
Mockito.when(ovsdbSessionMapInterface.getConnectedClientIds()).thenReturn(connectedClientIds); Mockito.when(ovsdbSessionMapInterface.getConnectedClientIds()).thenReturn(connectedClientIds);
assert (connectedClientIds.equals(connectusOvsdbClient.getConnectedClientIds())); assert (connectedClientIds.equals(tipwlanOvsdbClient.getConnectedClientIds()));
} }
@Test @Test
@@ -115,7 +115,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
Mockito.when(ovsdbSession.getOvsdbClient()).thenReturn(ovsdbClient); Mockito.when(ovsdbSession.getOvsdbClient()).thenReturn(ovsdbClient);
Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(ovsdbSession); Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(ovsdbSession);
connectusOvsdbClient.processConfigChanged("Test_Client_21P10C68818122"); tipwlanOvsdbClient.processConfigChanged("Test_Client_21P10C68818122");
Mockito.verify(ovsdbSessionMapInterface).getSession("Test_Client_21P10C68818122"); Mockito.verify(ovsdbSessionMapInterface).getSession("Test_Client_21P10C68818122");
Mockito.verify(ovsdbSession).getOvsdbClient(); Mockito.verify(ovsdbSession).getOvsdbClient();
@@ -162,7 +162,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
String expectedResult = "Initialized firmware download to Test_Client_21P10C68818122"; String expectedResult = "Initialized firmware download to Test_Client_21P10C68818122";
assert (connectusOvsdbClient.processFirmwareDownload("Test_Client_21P10C68818122", assert (tipwlanOvsdbClient.processFirmwareDownload("Test_Client_21P10C68818122",
"http://127.0.0.1/~username/ea8300-2020-07-08-6632239/openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin", "http://127.0.0.1/~username/ea8300-2020-07-08-6632239/openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin",
"openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username", "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username",
"b0d03d8fba6b2261786ac97d49a629f2").equals(expectedResult)); "b0d03d8fba6b2261786ac97d49a629f2").equals(expectedResult));