wireless: T3042: move wifi-regulatory-domain into individual interface definition

3 files changed, 12 insertions, 98 deletions

diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index a18a21b83..5d723bbfd 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -109,11 +109,6 @@ def get_config(config=None):
 
             if tmp: wifi = dict_merge(tmp, wifi)
 
-    # retrieve configured regulatory domain
-    conf.set_level(['system'])
-    if conf.exists(['wifi-regulatory-domain']):
-        wifi['country_code'] = conf.return_value(['wifi-regulatory-domain'])
-
     # Only one wireless interface per phy can be in station mode
     tmp = find_other_stations(conf, base, wifi['ifname'])
     if tmp: wifi['station_interfaces'] = tmp
@@ -144,8 +139,7 @@ def verify(wifi):
 
     if wifi['type'] == 'access-point':
         if 'country_code' not in wifi:
-            raise ConfigError('Wireless regulatory domain is mandatory,\n' \
-                              'use "set system wifi-regulatory-domain" for configuration.')
+            raise ConfigError('Wireless country-code is mandatory')
 
         if 'channel' not in wifi:
             raise ConfigError('Wireless channel must be configured!')
diff --git a/src/conf_mode/system-wifi-regdom.py b/src/conf_mode/system-wifi-regdom.py
deleted file mode 100755
index 874f93923..000000000
--- a/src/conf_mode/system-wifi-regdom.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from copy import deepcopy
-from sys import exit
-
-from vyos.config import Config
-from vyos import ConfigError
-from vyos.template import render
-
-from vyos import airbag
-airbag.enable()
-
-config_80211_file='/etc/modprobe.d/cfg80211.conf'
-config_crda_file='/etc/default/crda'
-
-default_config_data = {
-    'regdom' : '',
-    'deleted' : False
-}
-
-def get_config(config=None):
-    regdom = deepcopy(default_config_data)
-    if config:
-        conf = config
-    else:
-        conf = Config()
-    base = ['system', 'wifi-regulatory-domain']
-
-    # Check if interface has been removed
-    if not conf.exists(base):
-        regdom['deleted'] = True
-        return regdom
-    else:
-        regdom['regdom'] = conf.return_value(base)
-
-    return regdom
-
-def verify(regdom):
-    if regdom['deleted']:
-        return None
-
-    if not regdom['regdom']:
-        raise ConfigError("Wireless regulatory domain is mandatory.")
-
-    return None
-
-def generate(regdom):
-    print("Changing the wireless regulatory domain requires a system reboot.")
-
-    if regdom['deleted']:
-        if os.path.isfile(config_80211_file):
-            os.unlink(config_80211_file)
-
-        if os.path.isfile(config_crda_file):
-            os.unlink(config_crda_file)
-
-        return None
-
-    render(config_80211_file, 'wifi/cfg80211.conf.tmpl', regdom)
-    render(config_crda_file, 'wifi/crda.tmpl', regdom)
-    return None
-
-def apply(regdom):
-    return None
-
-if __name__ == '__main__':
-    try:
-        c = get_config()
-        verify(c)
-        generate(c)
-        apply(c)
-    except ConfigError as e:
-        print(e)
-        exit(1)
diff --git a/src/migration-scripts/interfaces/13-to-14 b/src/migration-scripts/interfaces/13-to-14
index 545b57ab2..fc6d7f443 100755
--- a/src/migration-scripts/interfaces/13-to-14
+++ b/src/migration-scripts/interfaces/13-to-14
@@ -14,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Rename Wireless interface security mode 'both' to 'wpa+wpa2'
+# T3043: rename Wireless interface security mode 'both' to 'wpa+wpa2'
+# T3043: move "system wifi-regulatory-domain" to indicidual wireless interface
 
 import os
 
@@ -36,6 +37,12 @@ if __name__ == '__main__':
         # Nothing to do
         exit(0)
 
+    country_code = ''
+    cc_cli = ['system', 'wifi-regulatory-domain']
+    if config.exists(cc_cli):
+        country_code = config.return_value(cc_cli)
+        config.delete(cc_cli)
+
     for wifi in config.list_nodes(base):
         sec_mode = base + [wifi, 'security', 'wpa', 'mode']
         if config.exists(sec_mode):
@@ -43,6 +50,9 @@ if __name__ == '__main__':
             if mode == 'both':
                 config.set(sec_mode, value='wpa+wpa2', replace=True)
 
+        if country_code:
+            config.set(base + [wifi, 'country-code'], value=country_code)
+
     try:
         with open(file_name, 'w') as f:
             f.write(config.to_string())