mirror of
https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git
synced 2025-11-01 11:07:49 +00:00
TW-749: Change reference of ConnectUs to TIP (#4)
* 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
committed by
GitHub
GitHub
parent
56e8af9227
commit
b9c0a6d88a
@@ -167,19 +167,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
@Autowired
|
||||
private OpensyncCloudGatewayController gatewayController;
|
||||
|
||||
@Value("${connectus.ovsdb.autoProvisionedCustomerId:1970}")
|
||||
@Value("${tip.wlan.ovsdb.autoProvisionedCustomerId:1970}")
|
||||
private int autoProvisionedCustomerId;
|
||||
@Value("${connectus.ovsdb.autoProvisionedLocationId:8}")
|
||||
@Value("${tip.wlan.ovsdb.autoProvisionedLocationId:8}")
|
||||
private int autoProvisionedLocationId;
|
||||
@Value("${connectus.ovsdb.autoProvisionedProfileId:1}")
|
||||
@Value("${tip.wlan.ovsdb.autoProvisionedProfileId:1}")
|
||||
private int autoProvisionedProfileId;
|
||||
@Value("${connectus.ovsdb.autoProvisionedSsid:DefaultSsid-}")
|
||||
@Value("${tip.wlan.ovsdb.autoProvisionedSsid:DefaultSsid-}")
|
||||
private String autoProvisionedSsid;
|
||||
@Value("${connectus.ovsdb.autoprovisionedSsidKey:12345678}")
|
||||
@Value("${tip.wlan.ovsdb.autoprovisionedSsidKey:12345678}")
|
||||
private String autoprovisionedSsidKey;
|
||||
@Value("${connectus.ovsdb.isAutoconfigEnabled:true}")
|
||||
@Value("${tip.wlan.ovsdb.isAutoconfigEnabled:true}")
|
||||
private boolean isAutoconfigEnabled;
|
||||
@Value("${connectus.ovsdb.defaultFwVersion:r10947-65030d81f3}")
|
||||
@Value("${tip.wlan.ovsdb.defaultFwVersion:r10947-65030d81f3}")
|
||||
private String defaultFwVersion;
|
||||
|
||||
@Autowired
|
||||
|
||||
@@ -41,7 +41,7 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStartDebugEngine
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse;
|
||||
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.OvsdbSessionMapInterface;
|
||||
import com.telecominfraproject.wlan.routing.RoutingServiceInterface;
|
||||
@@ -75,7 +75,7 @@ public class OpensyncCloudGatewayController {
|
||||
private ServiceInstanceInformation serviceInstanceInfo;
|
||||
|
||||
@Autowired
|
||||
private ConnectusOvsdbClientInterface connectusOvsdbClient;
|
||||
private OvsdbClientInterface tipwlanOvsdbClient;
|
||||
|
||||
/**
|
||||
* Flag indicates if this gateway has registered with routing service
|
||||
@@ -265,14 +265,14 @@ public class OpensyncCloudGatewayController {
|
||||
registeredGateway.getHostname(), registeredGateway.getPort());
|
||||
|
||||
if (command instanceof CEGWConfigChangeNotification) {
|
||||
connectusOvsdbClient.processConfigChanged(inventoryId);
|
||||
tipwlanOvsdbClient.processConfigChanged(inventoryId);
|
||||
} else if (command instanceof CEGWStartDebugEngine) {
|
||||
// dtop: we will be using CEGWStartDebugEngine command to deliver
|
||||
// request to
|
||||
// change redirector
|
||||
// TODO: after the demo introduce a specialized command for this!
|
||||
String newRedirectorAddress = ((CEGWStartDebugEngine) command).getGatewayHostname();
|
||||
connectusOvsdbClient.changeRedirectorAddress(inventoryId, newRedirectorAddress);
|
||||
tipwlanOvsdbClient.changeRedirectorAddress(inventoryId, newRedirectorAddress);
|
||||
// TODO: add support for additional commands below
|
||||
} else if (command instanceof CEGWFirmwareDownloadRequest) {
|
||||
|
||||
@@ -283,7 +283,7 @@ public class OpensyncCloudGatewayController {
|
||||
String username = dlRequest.getUsername();
|
||||
String validationCode = dlRequest.getValidationCode();
|
||||
|
||||
connectusOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username,
|
||||
tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username,
|
||||
validationCode);
|
||||
|
||||
} else if (command instanceof CEGWRadioResetRequest) {
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.telecominfraproject.wlan.opensync.external.integration;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
public interface ConnectusOvsdbClientInterface {
|
||||
public interface OvsdbClientInterface {
|
||||
|
||||
Set<String> getConnectedClientIds();
|
||||
|
||||
@@ -31,19 +31,19 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
|
||||
|
||||
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;
|
||||
|
||||
@Value("${connectus.ovsdb.apProfileFileName:/app/config/ProfileAPExample.json}")
|
||||
@Value("${tip.wlan.ovsdb.apProfileFileName:/app/config/ProfileAPExample.json}")
|
||||
private String apProfileFileName;
|
||||
|
||||
@Value("${connectus.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}")
|
||||
@Value("${tip.wlan.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}")
|
||||
private String ssidProfileFileName;
|
||||
|
||||
@Value("${connectus.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}")
|
||||
@Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}")
|
||||
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 serialNumber = "";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"ssidConfigs" : [ {
|
||||
"model_type" : "OpensyncAPSsidConfig",
|
||||
"radioType" : "is2dot4GHz",
|
||||
"ssid" : "Connectus-local",
|
||||
"ssid" : "Tip-wlan-local",
|
||||
"encryption" : "WPA-PSK",
|
||||
"key" : "12345678",
|
||||
"mode" : "2",
|
||||
@@ -18,7 +18,7 @@
|
||||
}, {
|
||||
"model_type" : "OpensyncAPSsidConfig",
|
||||
"radioType" : "is5GHzL",
|
||||
"ssid" : "Connectus-local-5l",
|
||||
"ssid" : "Tip-wlan-local-5l",
|
||||
"encryption" : "WPA-PSK",
|
||||
"key" : "12345678",
|
||||
"mode" : "2",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM adoptopenjdk/openjdk13:alpine-jre
|
||||
MAINTAINER ConnectUs
|
||||
MAINTAINER TipWlan
|
||||
|
||||
# Update the package list and upgrade installed packages
|
||||
RUN apk update && apk upgrade && apk add bash
|
||||
|
||||
@@ -63,7 +63,6 @@
|
||||
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
|
||||
|
||||
<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.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
|
||||
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
|
||||
|
||||
@@ -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.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
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}
|
||||
MQTT_BROKER_HOST="${MQTT_SERVER}"
|
||||
BACKEND_SERVER="${BACKEND_SERVER}"
|
||||
|
||||
OVSDB_PROPS=" "
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.configFileName=/app/opensync/config_2_ssids.json"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.configFileName=/app/opensync/config_2_ssids.json"
|
||||
|
||||
MQTT_PROPS=" "
|
||||
MQTT_PROPS+=" -Dconnectus.mqttBroker.address=$MQTT_BROKER_HOST"
|
||||
MQTT_PROPS+=" -Dconnectus.mqttBroker.listenPort=1883"
|
||||
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address=$MQTT_BROKER_HOST"
|
||||
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883"
|
||||
|
||||
LOGBACK_CONFIG_FILE="${LOGBACK_CONFIG_FILE:=/app/opensync/logback.xml}"
|
||||
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}"
|
||||
|
||||
PROV_PROPS=" "
|
||||
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_bridge=$DEFAULT_BRIDGE"
|
||||
PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE"
|
||||
PROV_PROPS+=" -Dconnectus.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_bridge=$DEFAULT_BRIDGE"
|
||||
PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE"
|
||||
PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$DEFAULT_LAN_TYPE"
|
||||
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"
|
||||
|
||||
|
||||
@@ -21,5 +21,5 @@
|
||||
<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.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 -Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties -Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dconnectus.ovsdb.managerAddr=${local_server_address} -Dconnectus.ovsdb.listenPort=6640 -Dconnectus.ovsdb.redirector.listenPort=6643 -Dconnectus.ovsdb.timeoutSec=30 -Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks -Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12 -Dconnectus.mqttBroker.address=${local_server_address} -Dconnectus.mqttBroker.listenPort=1883 -Dconnectus.ovsdb.wifi-iface.default_bridge=br-lan -Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096 -Dtip.wlan.introspectTokenApi.clientToken=token_placeholder -Dtip.wlan.serviceUser=user -Dtip.wlan.servicePassword=password -Dconnectus.ovsdb.autoProvisionedCustomerId=2 -Dconnectus.ovsdb.autoProvisionedSsid=Connectus-cloud -Dspring.main.show-banner=false -Dserver.port=9096 -Dtip.wlan.secondaryPort=7071 -Dtip.wlan.csrf-enabled=false -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 -Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties -Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dtip.wlan.ovsdb.managerAddr=${local_server_address} -Dtip.wlan.ovsdb.listenPort=6640 -Dtip.wlan.ovsdb.redirector.listenPort=6643 -Dtip.wlan.ovsdb.timeoutSec=30 -Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks -Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12 -Dtip.wlan.mqttBroker.address=${local_server_address} -Dtip.wlan.mqttBroker.listenPort=1883 -Dtip.wlan.ovsdb.wifi-iface.default_bridge=br-lan -Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096 -Dtip.wlan.introspectTokenApi.clientToken=token_placeholder -Dtip.wlan.serviceUser=user -Dtip.wlan.servicePassword=password -Dtip.wlan.ovsdb.autoProvisionedCustomerId=2 -Dtip.wlan.ovsdb.autoProvisionedSsid=TipWlan-cloud -Dspring.main.show-banner=false -Dserver.port=9096 -Dtip.wlan.secondaryPort=7071 -Dtip.wlan.csrf-enabled=false -Dspring.profiles.include=opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
|
||||
</launchConfiguration>
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
<logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/>
|
||||
|
||||
<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.netty.OvsdbConnectionHandler" level="ERROR"/>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
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 description="This image runs the mqtt broker (mosquitto) and \
|
||||
a statically configured OpenSync gateway."
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" 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.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
|
||||
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
|
||||
|
||||
@@ -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"
|
||||
|
||||
OVSDB_PROPS=" "
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.trustStore=$OVSDB_SERVER_TRUSTSTORE_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.trustStorePassword=$OVSDB_SERVER_TRUSTSTORE_PASSWORD"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.keyStore=$OVSDB_SERVER_KEYSTORE_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.keyStorePassword=$OVSDB_SERVER_KEYSTORE_PASSWORD"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.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 -Dconnectus.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 -Dconnectus.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 -Dconnectus.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 -Dconnectus.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.managerAddr=$OVSDB_MANAGER_HOST"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.trustStore=$OVSDB_SERVER_TRUSTSTORE_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.trustStorePassword=$OVSDB_SERVER_TRUSTSTORE_PASSWORD"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.keyStore=$OVSDB_SERVER_KEYSTORE_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.keyStorePassword=$OVSDB_SERVER_KEYSTORE_PASSWORD"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1"
|
||||
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2"
|
||||
|
||||
echo OVSDB_PROPS $OVSDB_PROPS
|
||||
|
||||
|
||||
MQTT_PROPS=" "
|
||||
MQTT_PROPS="$MQTT_PROPS -Dconnectus.mqttBroker.address=$MQTT_BROKER_HOST"
|
||||
MQTT_PROPS="$MQTT_PROPS -Dconnectus.mqttBroker.listenPort=1883"
|
||||
MQTT_PROPS="$MQTT_PROPS -Dtip.wlan.mqttBroker.address=$MQTT_BROKER_HOST"
|
||||
MQTT_PROPS="$MQTT_PROPS -Dtip.wlan.mqttBroker.listenPort=1883"
|
||||
|
||||
LOGGING_PROPS=" -Dlogging.config=file:$LOGBACK_CONFIG_FILE"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM adoptopenjdk/openjdk13:alpine-jre
|
||||
MAINTAINER ConnectUs
|
||||
MAINTAINER TipWlan
|
||||
|
||||
# Update the package list and upgrade installed packages
|
||||
RUN apk update && apk upgrade && apk add bash
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
|
||||
|
||||
<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.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
|
||||
<logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
|
||||
|
||||
@@ -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.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
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+=" -Dconnectus.ovsdb.managerAddr=opensync-controller"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dconnectus.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+=" -Dconnectus.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+=" -Dconnectus.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+=" -Dconnectus.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1"
|
||||
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=opensync-controller"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.listenPort=6640 "
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.redirector.listenPort=6643"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.timeoutSec=30"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.trustStore=/opt/tip-wlan/certs/truststore.jks"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.locationFileName=$OVSDB_LOCATION_CONFIG_FILE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_bridge=$OVSDB_IF_DEFAULT_BRIDGE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$OVSDB_DEVICE_DEFAULT_WAN_TYPE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$OVSDB_DEVICE_DEFAULT_LAN_TYPE"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$OVSDB_DEVICE_DEFAULT_LAN_NAME"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio0=$OVSDB_IF_DEFAULT_RADIO_0"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio1=$OVSDB_IF_DEFAULT_RADIO_1"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_radio2=$OVSDB_IF_DEFAULT_RADIO_2"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio0=$OVSDB_DEVICE_RADIO_0"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio1=$OVSDB_DEVICE_RADIO_1"
|
||||
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.wifi-device.radio2=$OVSDB_DEVICE_RADIO_2"
|
||||
|
||||
echo OVSDB_PROPS $OVSDB_PROPS
|
||||
|
||||
MQTT_PROPS=" "
|
||||
MQTT_PROPS+=" -Dconnectus.mqttBroker.address=tip-wlan-opensync-mqtt-broker"
|
||||
MQTT_PROPS+=" -Dconnectus.mqttBroker.listenPort=1883"
|
||||
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address=tip-wlan-opensync-mqtt-broker"
|
||||
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883"
|
||||
|
||||
LOGGING_PROPS=" -Dlogging.config=file:/app/opensync/logback.xml"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"ssidConfigs" : [ {
|
||||
"model_type" : "OpensyncAPSsidConfig",
|
||||
"radioType" : "is2dot4GHz",
|
||||
"ssid" : "Connectus-local",
|
||||
"ssid" : "Tip-wlan-local",
|
||||
"encryption" : "WPA-PSK",
|
||||
"key" : "12345678",
|
||||
"mode" : "2",
|
||||
@@ -18,7 +18,7 @@
|
||||
}, {
|
||||
"model_type" : "OpensyncAPSsidConfig",
|
||||
"radioType" : "is5GHzL",
|
||||
"ssid" : "Connectus-local-5l",
|
||||
"ssid" : "Tip-wlan-local-5l",
|
||||
"encryption" : "WPA-PSK",
|
||||
"key" : "12345678",
|
||||
"mode" : "2",
|
||||
|
||||
@@ -14,5 +14,5 @@
|
||||
<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.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 -Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties -Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dconnectus.ovsdb.managerAddr=${local_server_address} -Dconnectus.ovsdb.listenPort=6640 -Dconnectus.ovsdb.redirector.listenPort=6643 -Dconnectus.ovsdb.timeoutSec=30 -Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks -Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12 -Dconnectus.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json -Dconnectus.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json -Dconnectus.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json -Dconnectus.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json -Dconnectus.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json -Dconnectus.mqttBroker.address=${local_server_address} -Dconnectus.mqttBroker.listenPort=1883 -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 -Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties -Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json -Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks -Djavax.net.ssl.keyStorePassword=mypassword -Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks -Djavax.net.ssl.trustStorePassword=mypassword -Dtip.wlan.ovsdb.managerAddr=${local_server_address} -Dtip.wlan.ovsdb.listenPort=6640 -Dtip.wlan.ovsdb.redirector.listenPort=6643 -Dtip.wlan.ovsdb.timeoutSec=30 -Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks -Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12 -Dtip.wlan.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json -Dtip.wlan.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json -Dtip.wlan.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json -Dtip.wlan.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json -Dtip.wlan.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json -Dtip.wlan.mqttBroker.address=${local_server_address} -Dtip.wlan.mqttBroker.listenPort=1883 -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>
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
<logger name ="com.telecominfraproject.wlan.core.server.webconfig.WebMvcRegistrationsConfiguration$1$1" level="INFO"/>
|
||||
|
||||
<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.netty.OvsdbConnectionHandler" level="ERROR"/>
|
||||
|
||||
|
||||
@@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
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")
|
||||
@RestController
|
||||
@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
|
||||
ConnectusOvsdbClientInterface connectusOvsdbClient;
|
||||
OvsdbClientInterface tipwlanOvsdbClient;
|
||||
|
||||
@RequestMapping(value = "/connectedClients", method = RequestMethod.GET)
|
||||
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);
|
||||
return ret;
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public class OpenSyncConnectusController {
|
||||
@RequestMapping(value = "/changeRedirectorAddress", method = RequestMethod.POST)
|
||||
public String changeRedirectorAddress(@RequestParam String apId, @RequestParam String 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);
|
||||
return ret;
|
||||
}
|
||||
@@ -42,7 +42,7 @@ public class OpenSyncConnectusController {
|
||||
@RequestMapping(value = "/closeSession", method = RequestMethod.POST)
|
||||
public String closeSession(@RequestParam String 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);
|
||||
return ret;
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
|
||||
@ComponentScan(basePackages={"com.telecominfraproject.wlan", "ai.connectus"})
|
||||
@ComponentScan(basePackages={"com.telecominfraproject.wlan"})
|
||||
@EnableAutoConfiguration
|
||||
public class OpenSyncProcess {
|
||||
|
||||
|
||||
@@ -55,10 +55,10 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
|
||||
private Thread mqttClientThread;
|
||||
|
||||
public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext,
|
||||
@Value("${connectus.mqttBroker.address:testportal.123wlan.com}") String mqttBrokerAddress,
|
||||
@Value("${connectus.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
|
||||
@Value("${connectus.mqttBroker.user:admin}") String username,
|
||||
@Value("${connectus.mqttBroker.password:admin}") String password,
|
||||
@Value("${tip.wlan.mqttBroker.address:testportal.123wlan.com}") String mqttBrokerAddress,
|
||||
@Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
|
||||
@Value("${tip.wlan.mqttBroker.user:admin}") String username,
|
||||
@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.keyStorePassword:mypassword}") String jdkKeyStorePassword,
|
||||
@Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}") String jdkTrustStoreLocation,
|
||||
|
||||
@@ -31,16 +31,16 @@ public class NettySslContextConfig {
|
||||
|
||||
@Bean(name="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,
|
||||
|
||||
@Value("${connectus.ovsdb.keyStore:/opt/tip-wlan/certs/server.pkcs12}")
|
||||
@Value("${tip.wlan.ovsdb.keyStore:/opt/tip-wlan/certs/server.pkcs12}")
|
||||
String keyFileName,
|
||||
|
||||
@Value("${connectus.ovsdb.keyStorePassword:mypassword}")
|
||||
@Value("${tip.wlan.ovsdb.keyStorePassword:mypassword}")
|
||||
String keyStorePassword,
|
||||
|
||||
@Value("${connectus.ovsdb.trustStorePassword:mypassword}")
|
||||
@Value("${tip.wlan.ovsdb.trustStorePassword:mypassword}")
|
||||
String trustStorePassword
|
||||
){
|
||||
File trustStoreFile = new File(trustStoreFileName);
|
||||
|
||||
@@ -18,7 +18,7 @@ public class OvsdbListenerConfig {
|
||||
|
||||
@Bean
|
||||
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) {
|
||||
LOG.debug("Configuring OvsdbPassiveConnectionListener with thread pool size {}", threadPoolSize);
|
||||
ScheduledExecutorService executorService = Executors.newScheduledThreadPool(threadPoolSize);
|
||||
|
||||
@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
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.OvsdbSession;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
|
||||
@@ -43,14 +43,14 @@ import io.netty.handler.ssl.SslContext;
|
||||
|
||||
@Profile("ovsdb_manager")
|
||||
@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;
|
||||
|
||||
@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;
|
||||
|
||||
@Autowired
|
||||
@@ -157,6 +157,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} key {} ", remoteHost, localPort,
|
||||
clientCn, key);
|
||||
LOG.info("ovsdbClient connectedClients = {}", ovsdbSessionMapInterface.getNumSessions());
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
@@ -20,11 +20,11 @@ import io.netty.handler.ssl.SslContext;
|
||||
|
||||
@Profile("ovsdb_redirector")
|
||||
@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;
|
||||
|
||||
@Autowired
|
||||
@@ -75,54 +75,58 @@ import com.vmware.ovsdb.service.OvsdbClient;
|
||||
public class OvsdbDao {
|
||||
private static final Logger LOG = LoggerFactory.getLogger(OvsdbDao.class);
|
||||
|
||||
|
||||
public static final String wifiRouteStateDbTable = "Wifi_Route_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;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.region:Ottawa}")
|
||||
@org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.region:Ottawa}")
|
||||
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;
|
||||
|
||||
@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;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Value("${connectus.mqttBroker.listenPort:1883}")
|
||||
@org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.listenPort:1883}")
|
||||
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;
|
||||
|
||||
@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;
|
||||
|
||||
@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;
|
||||
|
||||
@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;
|
||||
|
||||
@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;
|
||||
|
||||
@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;
|
||||
@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;
|
||||
@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;
|
||||
@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;
|
||||
|
||||
@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;
|
||||
@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 static final String ovsdbName = "Open_vSwitch";
|
||||
public static final String awlanNodeDbTable = "AWLAN_Node";
|
||||
public static final String wifiStatsConfigDbTable = "Wifi_Stats_Config";
|
||||
@@ -442,7 +446,7 @@ public class OvsdbDao {
|
||||
|
||||
// update sku_number if it was empty
|
||||
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));
|
||||
}
|
||||
|
||||
|
||||
@@ -40,15 +40,15 @@ import io.netty.handler.ssl.SslContext;
|
||||
@ActiveProfiles(profiles = { "integration_test", }) // NOTE: these profiles will
|
||||
// be ADDED to the list of
|
||||
// active profiles
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OpensyncGatewayConnectusOvsdbClientTest.class)
|
||||
@Import(value = { OpensyncGatewayConnectusOvsdbClientTest.Config.class, ConnectusOvsdbClient.class,
|
||||
ConnectusOvsdbRedirector.class, OvsdbListenerConfig.class,
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OpensyncGatewayTipWlanOvsdbClientTest.class)
|
||||
@Import(value = { OpensyncGatewayTipWlanOvsdbClientTest.Config.class, TipWlanOvsdbClient.class,
|
||||
TipWlanOvsdbRedirector.class, OvsdbListenerConfig.class,
|
||||
OvsdbSessionMapInterface.class, OvsdbDao.class, OpensyncExternalIntegrationInterface.class,
|
||||
OvsdbSession.class, SslContext.class })
|
||||
public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
public class OpensyncGatewayTipWlanOvsdbClientTest {
|
||||
|
||||
@MockBean
|
||||
private ConnectusOvsdbRedirector connectusOvsdbRedirector;
|
||||
private TipWlanOvsdbRedirector tipwlanOvsdbRedirector;
|
||||
|
||||
@MockBean
|
||||
private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
|
||||
@@ -70,7 +70,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
private CompletableFuture<TableUpdates> completableFuture;
|
||||
|
||||
@Autowired
|
||||
ConnectusOvsdbClient connectusOvsdbClient;
|
||||
TipWlanOvsdbClient tipwlanOvsdbClient;
|
||||
|
||||
MockitoSession mockito;
|
||||
|
||||
@@ -97,8 +97,8 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
// @PropertySource({ "classpath:persistence-${envTarget:dev}.properties" })
|
||||
static class Config {
|
||||
@Bean
|
||||
public ConnectusOvsdbClient connectusOvsdbClient() {
|
||||
return new ConnectusOvsdbClient();
|
||||
public TipWlanOvsdbClient tipwlanOvsdbClient() {
|
||||
return new TipWlanOvsdbClient();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
public void testGetConnectedClientIds() throws Exception {
|
||||
Set<String> connectedClientIds = new HashSet<String>();
|
||||
Mockito.when(ovsdbSessionMapInterface.getConnectedClientIds()).thenReturn(connectedClientIds);
|
||||
assert (connectedClientIds.equals(connectusOvsdbClient.getConnectedClientIds()));
|
||||
assert (connectedClientIds.equals(tipwlanOvsdbClient.getConnectedClientIds()));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -115,7 +115,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
Mockito.when(ovsdbSession.getOvsdbClient()).thenReturn(ovsdbClient);
|
||||
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(ovsdbSession).getOvsdbClient();
|
||||
@@ -162,7 +162,7 @@ public class OpensyncGatewayConnectusOvsdbClientTest {
|
||||
|
||||
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",
|
||||
"openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username",
|
||||
"b0d03d8fba6b2261786ac97d49a629f2").equals(expectedResult));
|
||||
Reference in New Issue
Block a user