VLAN on SSID

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java

@@ -1634,6 +1634,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                 }
 
+                if (clientSession != null) {
 
                     ClientSessionDetails clientSessionDetails = clientSession.getDetails();
                     clientSessionDetails.setRadioType(getRadioTypeFromOpensyncRadioBand(band));
@@ -1641,7 +1642,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     clientSessionDetails.setAssocRssi(getNegativeSignedIntFromUnsigned(client.getStats().getRssi()));
 
                     if (client.getConnected()) {
-                        if (clientSessionDetails.getAssociationState() != null && clientSessionDetails.getAssociationState().equals(AssociationState.Disconnected)) {
+                        if (clientSessionDetails.getAssociationState() != null
+                                && clientSessionDetails.getAssociationState().equals(AssociationState.Disconnected)) {
                             clientSessionDetails.setIsReassociation(true);
                         }
                         if (client.hasConnectCount()) {
@@ -1752,7 +1754,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                         LOG.info("handleClientSessionUpdate Updated clientSession {}", clientSession);
 
                     }
-                
+                }
 
             }
 

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

@@ -82,6 +82,7 @@ import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
 public class OvsdbDao {
+
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbDao.class);
 
     public static final String wifiRouteStateDbTable = "Wifi_Route_State";
@@ -654,7 +655,6 @@ public class OvsdbDao {
     }
 
 
-
     public void performRedirect(OvsdbClient ovsdbClient, String clientCn) {
 
         List<Operation> operations = new ArrayList<>();
@@ -1589,6 +1589,23 @@ public class OvsdbDao {
                 }
             }
 
+            operations = new ArrayList<>();
+            conditions = new ArrayList<>();
+            conditions.add(new Condition("vlan_id", Function.GREATER_THAN, new Atom<>(1)));
+            operations.add(new Delete(wifiInetConfigDbTable, conditions));
+
+            fResult = ovsdbClient.transact(ovsdbName, operations);
+            result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Removed all existing vlan interfaces configs from {}:", wifiInetConfigDbTable);
+
+                for (OperationResult res : result) {
+                    LOG.debug("Op Result {}", res);
+                }
+            }
+
+
             LOG.info("Removed all ssids");
 
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
@@ -1676,7 +1693,8 @@ public class OvsdbDao {
                     freqBand = "2.4G";
                     break;
                 case is5GHz:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military and
+                    // 802.11h dfs (Dynamic Frequency Selection) aka military
+                    // and
                     // weather radar
                     // avoidance protocol
                     // Must not be disabled (by law)
@@ -1688,7 +1706,8 @@ public class OvsdbDao {
 
                     break;
                 case is5GHzL:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military and
+                    // 802.11h dfs (Dynamic Frequency Selection) aka military
+                    // and
                     // weather radar
                     // avoidance protocol
                     // Must not be disabled (by law)
@@ -1700,7 +1719,8 @@ public class OvsdbDao {
 
                     break;
                 case is5GHzU:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military and
+                    // 802.11h dfs (Dynamic Frequency Selection) aka military
+                    // and
                     // weather radar
                     // avoidance protocol
                     // Must not be disabled (by law)
@@ -1848,6 +1868,7 @@ public class OvsdbDao {
             }
 
             ret.stream().forEach(new Consumer<OpensyncAPRadioState>() {
+
                 @Override
                 public void accept(OpensyncAPRadioState wrs) {
                     LOG.debug("Wifi_Radio_State row {}", wrs);
@@ -1981,6 +2002,7 @@ public class OvsdbDao {
         ret.add(tableState);
 
         ret.stream().forEach(new Consumer<OpensyncWifiAssociatedClients>() {
+
             @Override
             public void accept(OpensyncWifiAssociatedClients wrs) {
                 LOG.debug("Wifi_Associated_Clients row {}", wrs);
@@ -2118,8 +2140,9 @@ public class OvsdbDao {
 
     }
 
-    private void configureWifiRadios(OvsdbClient ovsdbClient, String freqBand, int channel, Map<String, String> hwConfig,
+    private void configureWifiRadios(OvsdbClient ovsdbClient, String freqBand, int channel,
-            String country, int beaconInterval, boolean enabled, String hwMode, String ht_mode, int txPower)
+            Map<String, String> hwConfig, String country, int beaconInterval, boolean enabled, String hwMode,
+            String ht_mode, int txPower)
             throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
 
         List<Operation> operations = new ArrayList<>();
@@ -2173,12 +2196,41 @@ public class OvsdbDao {
         Map<String, Value> updateColumns = new HashMap<>();
 
         try {
+
             // If we are doing a NAT SSID, no bridge, else yes
+            String bridge = null;
             if (networkForwardMode == NetworkForwardMode.NAT) {
-                updateColumns.put("bridge", new Atom<>(defaultLanInterfaceName));
+                bridge = defaultLanInterfaceName;
             } else {
-                updateColumns.put("bridge", new Atom<>(defaultWanInterfaceName));
+                bridge = defaultWanInterfaceName;
+
             }
+
+            if (vlanId > 1) {
+                // vlan config, check to see if we already have the vlan in
+                // question
+
+                Map<String, WifiInetConfigInfo> wifiInetConfigInfoMap = getProvisionedWifiInetConfigs(ovsdbClient);
+                String vlanIfName = bridge + vlanId;
+                if (!wifiInetConfigInfoMap.containsKey(vlanIfName)) {
+                    // we need to make a VLAN, before we do anything else
+                    createInetConfigForVlan(ovsdbClient, bridge, (networkForwardMode == NetworkForwardMode.NAT),
+                            vlanIfName, vlanId, gateway, inet, ipAssignScheme);
+                }
+
+                bridge = vlanIfName;
+
+                updateColumns.put("vlan_id", new Atom<>(vlanId));
+                updateColumns.put("mode", new Atom<>("ap_vlan"));
+            } else {
+                updateColumns.put("mode", new Atom<>("ap"));
+                updateColumns.put("vlan_id", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            }
+
+
+            updateColumns.put("bridge", new Atom<>(bridge));
+
+
             if (enable80211v) {
                 updateColumns.put("btm", new Atom<>(1));
             } else {
@@ -2193,21 +2245,13 @@ public class OvsdbDao {
                 updateColumns.put("ft_mobility_domain", new com.vmware.ovsdb.protocol.operation.notation.Set());
             }
             updateColumns.put("if_name", new Atom<>(ifName));
-            updateColumns.put("mode", new Atom<>("ap"));
             updateColumns.put("rrm", new Atom<>(rrmEnabled ? 1 : 0));
             updateColumns.put("ssid", new Atom<>(ssid));
             updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
             updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
 
             updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
-            if (vlanId > 0) {
+
-                updateColumns.put("vlan_id", new Atom<>(vlanId));
-                if (vlanId > 1) {
-                    updateColumns.put("bridge", new Atom<>("vlan" + vlanId));
-                }
-            } else {
-                updateColumns.put("vlan_id", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            }
             updateColumns.put("group_rekey", new Atom<>(keyRefresh));
             updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
             updateColumns.put("ap_bridge", new Atom<>(apBridge));
@@ -2334,13 +2378,15 @@ public class OvsdbDao {
 
         // List<String> columns = new ArrayList<>();
         // columns.add("vif_configs");
-//        operations.add(new Select(wifiRadioConfigDbTable, conditions, columns));
+        // operations.add(new Select(wifiRadioConfigDbTable, conditions,
+        // columns));
         // fResult = ovsdbClient.transact(ovsdbName, operations);
         // result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
         //
         // Set<Uuid> vifConfigsSet = new HashSet<>();
         //
-//        if ((result != null) && (result.length > 0) && !((SelectResult) result[0]).getRows().isEmpty()) {
+        // if ((result != null) && (result.length > 0) && !((SelectResult)
+        // result[0]).getRows().isEmpty()) {
         // row = ((SelectResult) result[0]).getRows().iterator().next();
         // if (row != null) {
         // vifConfigsSet = row.getSetColumn("vif_configs");
@@ -2354,7 +2400,8 @@ public class OvsdbDao {
         // vifConfigsSet.add(vifConfigUuid);
         // }
         //
-//        com.vmware.ovsdb.protocol.operation.notation.Set vifConfigs = com.vmware.ovsdb.protocol.operation.notation.Set
+        // com.vmware.ovsdb.protocol.operation.notation.Set vifConfigs =
+        // com.vmware.ovsdb.protocol.operation.notation.Set
         // .of(vifConfigsSet);
         //
         // updateColumns.put("vif_configs", vifConfigs);
@@ -2627,10 +2674,68 @@ public class OvsdbDao {
 
     }
 
+    private void createInetConfigForVlan(OvsdbClient ovsdbClient, String parentIfName, boolean isNAT, String vlanIfName,
+            int vlanId, String gateway, String inet, String ipAssignScheme) {
+
+        List<Operation> operations = new ArrayList<>();
+        Map<String, Value> insertColumns = new HashMap<>();
+
+        try {
+            insertColumns.put("if_type", new Atom<>("vlan"));
+            insertColumns.put("vlan_id", new Atom<>(vlanId));
+            insertColumns.put("if_name", new Atom<>(vlanIfName));
+            insertColumns.put("parent_ifname", new Atom<>(parentIfName));
+            insertColumns.put("NAT", new Atom<>(isNAT));
+            insertColumns.put("enabled", new Atom<>(true));
+            insertColumns.put("network", new Atom<>(true));
+            insertColumns.put("mtu", new Atom<>(1500));
+            insertColumns.put("ip_assign_scheme", new Atom<>(ipAssignScheme));
+
+            if (ipAssignScheme.equals("static")) {
+
+                Map<String, String> dhcpMap = new HashMap<>();
+                dhcpMap.put("start", "100");
+                dhcpMap.put("stop", "250");
+                dhcpMap.put("lease_time", "1h");
+                insertColumns.put("dhcpd", com.vmware.ovsdb.protocol.operation.notation.Map.of(dhcpMap));
+                if (inet != null) {
+                    insertColumns.put("inet_addr", new Atom<>(inet));
+                }
+                insertColumns.put("netmask", new Atom<>("255.255.255.0"));
+
+
+            } else if (ipAssignScheme.equals("dhcp")) {
+
+                insertColumns.put("ip_assign_scheme", new Atom<>("dhcp"));
+                insertColumns.put("dhcp_sniff", new Atom<>(true));
+
+            }
+
+            Row row = new Row(insertColumns);
+            operations.add(new Insert(wifiInetConfigDbTable, row));
+
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+
+            LOG.debug("Provisioned Vlan {}", vlanId);
+
+            for (OperationResult res : result) {
+                LOG.debug("Op Result {}", res);
+            }
+
+        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
+            LOG.error("Error in provisioning Vlan", e);
+            throw new RuntimeException(e);
+        }
+
+
+    }
+
     private void getRadiusConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
             Map<String, String> security) {
         List<Profile> radiusServiceList = new ArrayList<>();
         radiusServiceList = opensyncApConfig.getRadiusProfiles().stream().filter(new Predicate<Profile>() {
+
             @Override
             public boolean test(Profile p) {
                 return p.getName().equals((ssidConfig.getRadiusServiceName()));
@@ -2743,12 +2848,6 @@ public class OvsdbDao {
                 updateColumns.put("dhcp_sniff", new Atom<>(false));
             }
 
-            if (ifType.equals("vlan")) {
-                updateColumns.put("vlan_id", new Atom<>(vlanId));
-            } else {
-                updateColumns.put("vlan_id", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            }
-
             Row row = new Row(updateColumns);
             operations.add(new Update(wifiInetConfigDbTable, conditions, row));
 
@@ -2806,12 +2905,6 @@ public class OvsdbDao {
                 insertColumns.put("dhcp_sniff", new Atom<>(false));
             }
 
-            if (ifType.equals("vlan")) {
-                insertColumns.put("vlan_id", new Atom<>(vlanId));
-            } else {
-                insertColumns.put("vlan_id", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            }
-
             Row row = new Row(insertColumns);
             operations.add(new Insert(wifiInetConfigDbTable, row));
 
@@ -2853,9 +2946,12 @@ public class OvsdbDao {
 
 
             provisionWifiStatsConfigClient(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
-//            provisionWifiStatsConfigSteering(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+            // provisionWifiStatsConfigSteering(radioConfigs,
-//            provisionWifiStatsConfigCapacity(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+            // getProvisionedWifiStatsConfigs(ovsdbClient), operations);
-//            provisionWifiStatsConfigRssi(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+            // provisionWifiStatsConfigCapacity(radioConfigs,
+            // getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+            // provisionWifiStatsConfigRssi(radioConfigs,
+            // getProvisionedWifiStatsConfigs(ovsdbClient), operations);
 
 
             if (!operations.isEmpty()) {
@@ -2885,6 +2981,7 @@ public class OvsdbDao {
             List<Operation> operations) {
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_neighbor_off-chan")) {
@@ -2910,6 +3007,7 @@ public class OvsdbDao {
         });
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_neighbor_on-chan")) {
@@ -2934,6 +3032,7 @@ public class OvsdbDao {
             List<Operation> operations, com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds) {
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_survey_on-chan")) {
@@ -2955,6 +3054,7 @@ public class OvsdbDao {
         });
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_survey_off-chan")) {
@@ -2988,6 +3088,7 @@ public class OvsdbDao {
             Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_client")) {
@@ -3012,6 +3113,7 @@ public class OvsdbDao {
             Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_capacity")) {
@@ -3036,6 +3138,7 @@ public class OvsdbDao {
             Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
 
         radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
+
             @Override
             public void accept(WifiRadioConfigInfo rc) {
                 if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_rssi")) {
@@ -3073,7 +3176,6 @@ public class OvsdbDao {
         }
 
 
-
     }