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

Adding support to Docker for passing lan type AND name, update Dao with attrs

Browse Source
This commit is contained in:
Mike Hansen
2020-06-28 17:04:31 -04:00
parent 7c2af78805
commit 4ed2d584bc
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,8 +163,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
private int autoProvisionedLocationId;
@Value("${connectus.ovsdb.autoProvisionedProfileId:1}")
private int autoProvisionedProfileId;
@Value("${connectus.ovsdb.autoProvisionedSsid:autoProvisionedSsid}")
@Value("${connectus.ovsdb.autoProvisionedSsid:DefaultSsid-}")
private String autoProvisionedSsid;
@Value("${connectus.ovsdb.autoprovisionedSsidKey:autoProvisionedSsid}")
private String autoprovisionedSsidKey;
@Value("${connectus.ovsdb.isAutoconfigEnabled:true}")
private boolean isAutoconfigEnabled;
@Value("${connectus.ovsdb.defaultFwVersion:r10947-65030d81f3}")
@@ -332,10 +334,14 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
for (RadioType radioType : radioTypes) {
Profile ssidProfile = new Profile();
ssidProfile.setCustomerId(ce.getCustomerId());
ssidProfile.setName("DefaultSsid-" + radioType.name());
ssidProfile.setName(autoProvisionedSsid + radioType.name());
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setSsid(ssidProfile.getName());
ssidConfig.setSsidAdminState(StateSetting.enabled);
ssidConfig.setBroadcastSsid(StateSetting.enabled);
ssidConfig.setSecureMode(SecureMode.wpa2PSK);
ssidConfig.setKeyStr(autoprovisionedSsidKey);
ssidConfig.setSecureMode(SecureMode.open);
Set<RadioType> appliedRadios = new HashSet<>();
appliedRadios.add(radioType);
ssidConfig.setAppliedRadios(appliedRadios);

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

@@ -51,10 +51,11 @@ OVSDB_DEVICE_RADIO_1="${OVSDB_DEVICE_RADIO_1:=wifi0}"
echo $OVSDB_DEVICE_RADIO_1
OVSDB_DEVICE_RADIO_2="${OVSDB_DEVICE_RADIO_2:=wifi1}"
echo $OVSDB_DEVICE_RADIO_2
OVSDB_DEVICE_DEFAULT_WAN="${OVSDB_DEVICE_DEFAULT_WAN:=eth}"
OVSDB_DEVICE_DEFAULT_WAN_TYPE="${OVSDB_DEVICE_DEFAULT_WAN_NAME:=eth}"
echo $OVSDB_DEVICE_DEFAULT_WAN
OVSDB_DEVICE_DEFAULT_LAN="${OVSDB_DEVICE_DEFAULT_LAN:=br-lan}"
OVSDB_DEVICE_DEFAULT_LAN_TYPE="${OVSDB_DEVICE_DEFAULT_LAN_TYPE:=br-lan}"
echo $OVSDB_DEVICE_DEFAULT_LAN
OVSDB_DEVICE_DEFAULT_LAN_NAME="${OVSDB_DEVICE_DEFAULT_LAN_NAME:=lan}"
echo Reading AP configuration from $OVSDB_CONFIG_FILE
@@ -133,8 +134,9 @@ OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFI
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=$OVSDB_DEVICE_DEFAULT_WAN"
OVSDB_PROPS="$OVSDB_PROPS -Dconnectus.ovsdb.wifi-iface.default_lan=$OVSDB_DEVICE_DEFAULT_LAN"
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"

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

@@ -25,8 +25,9 @@ OVSDB_PROPS+=" -Dconnectus.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_F
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=$OVSDB_DEVICE_DEFAULT_WAN"
OVSDB_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan=$OVSDB_DEVICE_DEFAULT_LAN"
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"

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

@@ -93,10 +93,13 @@ public class OvsdbDao {
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_bridge:defaultBridgeForEAPOL}")
public String bridgeNameVifInterfaces;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_lan:bridge}")
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_lan_type:bridge}")
public String defaultLanInterfaceType;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_lan_name:lan}")
public String defaultLanInterfaceName;
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.wifi-iface.default_wan:eth}")
@org.springframework.beans.factory.annotation.Value("${connectus.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}")