README: update configs

README.md

@@ -37,35 +37,35 @@ config controller_select
 	option retry_int '9'
 	option autostart '1'
 
-config fh-iface
+config ap
 	option ifname 'wl0.1'
 	option band '5'
 	option device 'wl0'
 
-config fh-iface
+config ap
 	option ifname 'wl1.1'
 	option band '2'
 	option device 'wl1'
 
-config bk-iface
+config bsta
 	option ifname 'wl0'
 	option band '5'
 	option device 'wl0'
 	option priority '1'
 
-config bk-iface
+config bsta
 	option ifname 'wl1'
 	option band '2'
 	option device 'wl1'
 	option priority '2'
 
-config bk-iface
+config bsta
 	option ifname 'wl2'
 	option band '5'
 	option device 'wl2'
 	option priority '0'
 
-config wifi-radio
+config radio
 	option device 'wl2'
 	option band '5'
 	option dedicated_backhaul '1
@@ -164,14 +164,14 @@ config wifi-iface 'default_sta_wl2'
 
 ### Radios
 
-The `wifi-radio` section will primarily hold the band, device and whether the
+The `radio` section will primarily hold the band, device and whether the
 radio is a dedicated backhaul, meaning no fronthaul interfaces will be
 configured on this radio via AP-Autoconfig. This section will be auto-generated
 on startup by mapagent if not present.
 
 An example config:
 ```
-config wifi-radio
+config radio
 	option device 'wl2'
 	option band '5'
 	option dedicated_backhaul '1'
@@ -182,8 +182,8 @@ config wifi-radio
 When specifying an interface in the mapagent configuration file, there are four
 parameters that must be kept in consideration:
 
-1. Whether the interface is backhaul/fronthaul (`fh-iface`) or backhaul station
-interfaces (`bk-iface`).
+1. Whether the interface is backhaul/fronthaul (`ap`) or backhaul station
+interfaces (`bsta`).
 2. Band of the interface, to be provided as i.e. `option band '2'`
 3. Interface name, to be provided as i.e. `option ifname 'wl0.1'`
 4. Device that the interface belongs to, to be provided as i.e. `option device 'wl0'`
@@ -191,40 +191,40 @@ interfaces (`bk-iface`).
 
 #### Fronthaul Interfaces
 
-Fronthaul interfaces are `fh-iface` sections with `multi_ap '2'` set. This
+Fronthaul interfaces are `ap` sections with `type 'fronthaul'` set. This
 section may also include the options `ssid`, `key`, `encryption`, and `vid`.
 Today these are not mandatory, but will be written automatically during
 AP-Autoconfiguration.
 
 ```
-config fh-iface
+config ap
 	option ifname 'wl0.1'
 	option band '5'
 	option device 'wl0'
 	option ssid 'MAP-44D4376AF7F0-5GHz'
 	option key 'IFJBD2RGYLZ3NE'
 	option encryption 'psk2+aes'
-	option multi_ap '2'
+	option type 'fronthaul'
 	option vid '1'
 ```
 
 
 #### Backhaul Interfaces
 
-Backhaul interfaces are `fh-iface` sections with `multi_ap '1'` set. This
+Backhaul interfaces are `ap` sections with `type 'backhaul'` set. This
 section may also include the options `ssid`, `key`, `encryption`, `enabled`,
 `vid` and a `disallow_bsta` list. Today these are not mandatory, but will be
 written automatically during AP-Autoconfiguration.
 
 ```
-config fh-iface
+config ap
 	option ifname 'wl0.2'
 	option band '5'
 	option device 'wl0'
 	option ssid 'MAP-44D4376AF7F0-BH-5GHz'
 	option key 'd6971d59b096ba3906d20f50dde7e19e7159dfe6eea1765a414e17c90aaefe7a'
 	option encryption 'psk2+aes'
-	option multi_ap '1'
+	option type 'backhaul'
 	option disallow_bsta '0'
 	option vid '1'
 	option enabled '1'
@@ -233,20 +233,20 @@ config fh-iface
 
 #### Combined Front/Back Interfaces
 
-Combined fronthaul/backhaul interfaces are `fh-iface` sections with
-`multi_ap '3'` set. This section may also include the options `ssid`, `key`,
+Combined fronthaul/backhaul interfaces are `ap` sections with
+`type 'combined'` set. This section may also include the options `ssid`, `key`,
 `encryption`, and `vid`. Today these are not mandatory, but will be
 written automatically during AP-Autoconfiguration.
 
 ```
-config fh-iface
+config ap
 	option ifname 'wl0.1'
 	option band '5'
 	option device 'wl0'
 	option ssid 'MAP-44D4376AF7F0-COMBINED-5GHz'
 	option key 'IFJBD2RGYLZ3NE'
 	option encryption 'psk2+aes'
-	option multi_ap '3'
+	option type 'combined'
 	option vid '1'
 	option enabled '1'
 ```
@@ -254,18 +254,18 @@ config fh-iface
 
 #### Backhaul Station Interfaces
 
-Backhaul station interfaces are `bk-iface` sections.
+Backhaul station interfaces are `bsta` sections.
 
 Backhaul interface sections will be generated automatically by map-agent upon
 startup. This is because it is assumed a backhaul station is only relevant in
 a multi-ap network scenario.
 
-Once onboarded, a bk-iface may be marked as `option onboarded '1'` by map-agent,
-along with the respective `wifi-radio` section. An onboarded backhaul station
+Once onboarded, a bsta may be marked as `option onboarded '1'` by map-agent,
+along with the respective `radio` section. An onboarded backhaul station
 may look as follows:
 
 ```
-config bk-iface
+config bsta
 	option ifname 'wl0'
 	option band '5'
 	option device 'wl0'
@@ -414,43 +414,43 @@ config controller_select
 	option retry_int '9'
 	option autostart '1'
 
-config fh-iface
+config ap
 	option ifname 'wl0.1'
 	option band '5'
 	option device 'wl0'
 	option ssid 'MAP-EC6C9A52B027-5GHz'
 	option key '7NTx-APvX-pba7-tvd7'
 	option encryption 'sae-mixed+aes'
-	option multi_ap '2'
+	option type 'fronthaul'
 	option enabled '1'
 	option vid '1'
 
-config fh-iface
+config ap
 	option ifname 'wl1.1'
 	option band '2'
 	option device 'wl1'
 	option ssid 'MAP-EC6C9A52B027-2.4GHz'
 	option key '7NTx-APvX-pba7-tvd7'
 	option encryption 'sae-mixed+aes'
-	option multi_ap '2'
+	option type 'fronthaul'
 	option enabled '1'
 	option vid '1'
 
-config bk-iface
+config bsta
 	option ifname 'wl0'
 	option band '5'
 	option device 'wl0'
 	option priority '1'
 	option enabled '0'
 
-config bk-iface
+config bsta
 	option ifname 'wl1'
 	option band '2'
 	option device 'wl1'
 	option priority '2'
 	option enabled '0'
 
-config bk-iface
+config bsta
 	option ifname 'wl2'
 	option band '5'
 	option device 'wl2'
@@ -462,17 +462,17 @@ config bk-iface
 	option onboarded '1'
 	option enabled '1'
 
-config wifi-radio
+config radio
 	option device 'wl2'
 	option band '5'
 	option dedicated_backhaul '1'
 	option onboarded '1'
 
-config wifi-radio
+config radio
 	option device 'wl0'
 	option band '5'
 
-config wifi-radio
+config radio
 	option device 'wl1'
 	option band '2'
 
@@ -480,26 +480,26 @@ config policy
 	option pvid '1'
 	option pcp_default '0'
 
-config fh-iface
+config ap
 	option ifname 'wl0.2'
 	option band '5'
 	option device 'wl0'
 	option ssid 'MAP-EC6C9A52B027-BH-5GHz'
 	option key '7NTx-APvX-pba7-tvd7'
 	option encryption 'sae+aes'
-	option multi_ap '1'
+	option type 'backhaul'
 	option enabled '1'
 	option disallow_bsta '0'
 	option vid '1'
 
-config fh-iface
+config ap
 	option ifname 'wl1.2'
 	option band '2'
 	option device 'wl1'
 	option ssid 'MAP-EC6C9A52B027-BH-2.4GHz'
 	option key '7NTx-APvX-pba7-tvd7'
 	option encryption 'sae+aes'
-	option multi_ap '1'
+	option type 'backhaul'
 	option enabled '1'
 	option disallow_bsta '0'
 	option vid '1'