diff --git a/py-json/realm.py b/py-json/realm.py index 6c69a570..2a836b93 100755 --- a/py-json/realm.py +++ b/py-json/realm.py @@ -1303,6 +1303,7 @@ class VAPProfile(LFCliBase): "ap_name": None, "flags": 0, "flags_mask": 0, + "mode": 0, "ssid": None, "key": None, "mac": "xx:xx:xx:xx:*:xx" @@ -1319,10 +1320,6 @@ class VAPProfile(LFCliBase): "interest": 0, # (0x2 + 0x4000 + 0x800000) # current, dhcp, down } - if self.use_ht160: - self.desired_add_vap_flags.append("ht160_enable") - self.desired_add_vap_flags_mask.append("ht160_enable") - def admin_up(self, resource): set_port_r = LFRequest.LFRequest(self.lfclient_url, "/cli-json/set_port", debug_=self.debug) req_json = LFUtils.portUpRequest(resource, None, debug_on=self.debug) @@ -1446,6 +1443,17 @@ class VAPProfile(LFCliBase): return result def create(self, resource, radio, channel=None, up_=None, debug=False, suppress_related_commands_=True): + + if self.use_ht160: + self.desired_add_vap_flags.append("enable_80211d") + self.desired_add_vap_flags_mask.append("enable_80211d") + self.desired_add_vap_flags.append("80211h_enable") + self.desired_add_vap_flags_mask.append("80211h_enable") + self.desired_add_vap_flags.append("ht160_enable") + self.desired_add_vap_flags_mask.append("ht160_enable") + + print("MODE ========= ", self.mode) + jr = self.local_realm.json_get("/radiostatus/1/%s/%s?fields=channel,frequency,country" % (resource, radio), debug_=self.debug) if jr is None: raise ValueError("No radio %s.%s found" % (resource, radio)) @@ -1460,7 +1468,7 @@ class VAPProfile(LFCliBase): "shelf": 1, "resource": resource, "radio": radio, - "mode": 0, #"NA", #0 for AUTO or "NA" + "mode": self.mode, #"NA", #0 for AUTO or "NA" "channel": channel, "country": country, "frequency": self.local_realm.channel_freq(channel_=channel) @@ -1474,7 +1482,8 @@ class VAPProfile(LFCliBase): elif "create_admin_down" not in self.desired_add_vap_flags: self.desired_add_vap_flags.append("create_admin_down") - # create stations down, do set_port on them, then set stations up + # create vaps down, do set_port on them, then set vaps up + self.add_vap_data["mode"] = self.mode self.add_vap_data["flags"] = self.add_named_flags(self.desired_add_vap_flags, add_vap.add_vap_flags) self.add_vap_data["flags_mask"] = self.add_named_flags(self.desired_add_vap_flags_mask, add_vap.add_vap_flags) self.add_vap_data["radio"] = radio