From 9ad3387e96d4963735bd585be76933ab981f8afe Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Tue, 26 May 2020 15:34:37 -0400 Subject: [PATCH] Key Refresh VIF attribute setting --- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index c2eb780..aa49e20 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -1686,7 +1686,7 @@ public class OvsdbDao { public void configureSingleSsid(OvsdbClient ovsdbClient, String bridge, String ifName, String ssid, boolean ssidBroadcast, Map security, Map provisionedWifiRadioConfigs, String radioIfName, int vlanId, - int vifRadioIdx, boolean rrmEnabled, String minHwMode, boolean enabled) { + int vifRadioIdx, boolean rrmEnabled, String minHwMode, boolean enabled, int keyRefresh) { List operations = new ArrayList<>(); Map updateColumns = new HashMap<>(); @@ -1705,8 +1705,8 @@ public class OvsdbDao { updateColumns.put("uapsd_enable", new Atom<>(true)); updateColumns.put("vif_radio_idx", new Atom(vifRadioIdx)); updateColumns.put("min_hw_mode", new Atom<>(minHwMode)); - updateColumns.put("vlan_id", new Atom(vlanId)); + updateColumns.put("group_rekey", new Atom(keyRefresh)); @SuppressWarnings("unchecked") com.vmware.ovsdb.protocol.operation.notation.Map securityMap = com.vmware.ovsdb.protocol.operation.notation.Map @@ -1797,6 +1797,8 @@ public class OvsdbDao { SsidConfiguration ssidConfig = (SsidConfiguration) ssidProfile.getDetails(); for (RadioType radioType : ssidConfig.getAppliedRadios()) { + + int keyRefresh = ssidConfig.getKeyRefresh(); Map provisionedWifiRadioConfigs = getProvisionedWifiRadioConfigs( ovsdbClient); @@ -1854,7 +1856,7 @@ public class OvsdbDao { try { configureSingleSsid(ovsdbClient, bridge, ifName, ssidConfig.getSsid(), ssidBroadcast, security, provisionedWifiRadioConfigs, radioIfName, ssidConfig.getVlanId(), vifRadioIdx, - rrmEnabled, minHwMode, enabled); + rrmEnabled, minHwMode, enabled, keyRefresh); } catch (IllegalStateException e) { // could not provision this SSID, but still can go on