Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/wifi-ap:add-country-code into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Alfonso Sanchez-Beato]

Add country code configuration options so the beacon frames
contain that IE.

[Konrad Zapałowicz (kzapalowicz)]

Minor comments, mostly wording related.

review: Needs Fixing (code)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:42cdc665b4a180fd4a20216e182afac48711b7a9
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1694/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2254
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1604/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2617
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1780/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1694/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

@Konrad, thanks for the comments. Branch repushed after addressing them.

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:ab0bfe4b3e19de468c8e3925fc24bbfb26398bf0
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1698/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2258/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1607/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2621/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1783/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1698/rebuild

review: Needs Fixing (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

not tested, only changes review. lgtm

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:ab0bfe4b3e19de468c8e3925fc24bbfb26398bf0
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1701/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2261
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1609/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2623
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1785/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1701/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[Simon Fels (morphis)]

review: Needs Fixing

diff --git a/bin/ap.sh b/bin/ap.sh
index 19841de..5db1c56 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -190,6 +190,13 @@ hw_mode=$WIFI_OPERATION_MODE
 dtim_period=3
 
 
+# Regulatory domain options
+country_code=$WIFI_COUNTRY_CODE
+ieee80211d=$WIFI_IEEE80211D
+ieee80211h=$WIFI_IEEE80211H
+local_pwr_constraint=$WIFI_LOCAL_PWR_CONSTRAINT
+
+
 # The wmm_* options are needed to enable AMPDU
 # and get decent 802.11n throughput
 # UAPSD is for stations powersave
diff --git a/conf/default-config b/conf/default-config
index 6152c7c..2573a48 100644
--- a/conf/default-config
+++ b/conf/default-config
@@ -12,9 +12,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# WARNING This file is sourced as shell script by the ap.sh script
-# it's also readed by the configuration service as whitelist of valid tokens.
-# Tokens NOT present in this default file won't accepted by the service
+# WARNING This file is sourced as a shell script by the ap.sh script.
+# It is also read by the configuration service as a whitelist of valid tokens.
+# Tokens NOT present in this default file won't accepted by the service.
 
 DISABLED="true"
 
@@ -50,6 +50,11 @@ WIFI_CHANNEL=6
 # g = IEEE 802.11g (2.4 GHz), ad = IEEE 802.11ad (60 GHz);
 WIFI_OPERATION_MODE="g"
 
+WIFI_COUNTRY_CODE=XX
+WIFI_IEEE80211D=1
+WIFI_IEEE80211H=1
+WIFI_LOCAL_PWR_CONSTRAINT=3
+
 # Wether connection sharing is disabled or not
 SHARE_DISABLED="false"
 # Network interface which connection will be shared with connected
diff --git a/docs/reference/commands.md b/docs/reference/commands.md
index 9845f5a..89d81cd 100644
--- a/docs/reference/commands.md
+++ b/docs/reference/commands.md
@@ -27,9 +27,13 @@ share.disabled: false
 share.network-interface: wlan0
 wifi.address: 10.0.60.1
 wifi.channel: 6
+wifi.country-code: ES
 wifi.hostapd-driver: nl80211
+wifi.ieee80211d: 1
+wifi.ieee80211h: 1
 wifi.interface: wlan0
 wifi.interface-mode: direct
+wifi.local-pwr-constraint: 3
 wifi.netmask: 255.255.255.0
 wifi.operation-mode: g
 wifi.security: open
diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
index 49999db..2428f48 100644
--- a/docs/reference/configuration.md
+++ b/docs/reference/configuration.md
@@ -229,7 +229,6 @@ Example:
 $ wifi-ap.config set dhcp.range-start=192.168.7.10
 ```
 
-
 ## dhcp.range-stop
 
 End of the IP address range being used to assign IP addresses to DHCP clients
@@ -253,3 +252,71 @@ Example:
 ```
 $ wifi-ap.config set dhcp.lease-time=24h
 ```
+
+## wifi.country-code
+
+Country code as specified by ISO/IEC 3166-1, used to set regulatory domain. Set
+as needed to indicate country in which device is operating. This can limit
+available channels and transmit power.
+
+Possible values: see [this list](http://geotags.com/iso3166/countries.html).
+
+Default value: *XX*
+
+Example:
+
+```
+$ wifi-ap.config set wifi.country-code=US
+```
+
+## wifi.ieee80211d
+
+Enable IEEE 802.11d. This advertises the country code and the set of allowed
+channels and transmit power levels based on the regulatory limits.
+
+Possible values:
+
+ * *0*: Disabled
+ * *1*: Enabled
+
+Default value: *1*
+
+Example:
+
+```
+$ wifi-ap.config set wifi.ieee80211d=1
+```
+
+## wifi.ieee80211h
+
+Enable IEEE 802.11h. This enables radar detection and DFS support if
+available. DFS support is required on outdoor 5 GHz channels in most countries
+of the world. This can be used only with ieee80211d=1.
+
+Possible values:
+
+ * *0*: Disabled
+ * *1*: Enabled
+
+Default value: *1*
+
+Example:
+
+```
+$ wifi-ap.config set wifi.ieee80211h=1
+```
+
+## wifi.local-pwr-constraint
+
+Add Power Constraint element to Beacon and Probe Response frames, when
+applicable. The Country element must be set for this to happen. Power Constraint
+element is required by Transmit Power Control. This can be used only with
+ieee80211d=1. Valid values are 0..255 (dB below maximum allowed transmit power).
+
+Default value: *3*
+
+Example:
+
+```
+$ wifi-ap.config set wifi.local-pwr-constraint=3
+```
diff --git a/docs/reference/rest-api/v1-configuration.md b/docs/reference/rest-api/v1-configuration.md
index 158e245..241ed2c 100644
--- a/docs/reference/rest-api/v1-configuration.md
+++ b/docs/reference/rest-api/v1-configuration.md
@@ -52,6 +52,10 @@ $ sudo wifi-ap-client /v1/configuration
 "wifi.security": "wpa2",
 "wifi.security-passphrase": "12345678",
 "wifi.channel": 6,
+"wifi.country-code": "XX",
+"wifi.ieee80211d": 1,
+"wifi.ieee80211h": 1,
+"wifi.local-pwr-constraint": 3,
 "wifi.operation-mode": "virtual",
 "share.disabled": false,
 "share.network-interface": "eth0",
diff --git a/tests/main/default-configuration/tasks.yaml b/tests/main/default-configuration/tasks.yaml
index d6c1cba..c83f35b 100644
--- a/tests/main/default-configuration/tasks.yaml
+++ b/tests/main/default-configuration/tasks.yaml
@@ -17,6 +17,10 @@ execute: |
     test "`/snap/bin/wifi-ap.config get wifi.operation-mode`" = "g"
     test "`/snap/bin/wifi-ap.config get wifi.security`" = "open"
     test "`/snap/bin/wifi-ap.config get wifi.ssid`" = "Ubuntu"
+    test "`/snap/bin/wifi-ap.config get wifi.country-code`" = "XX"
+    test "`/snap/bin/wifi-ap.config get wifi.ieee80211d`" = "1"
+    test "`/snap/bin/wifi-ap.config get wifi.ieee80211h`" = "1"
+    test "`/snap/bin/wifi-ap.config get wifi.local-pwr-constraint`" = "3"
     # FIXME: Once wifi-ap.config get returns correct error codes when an
     # item does not exist we can drop the grep check here.
     /snap/bin/wifi-ap.config get wifi.security-passphrase | grep 'does not exist'