Skip to content

Commit

Permalink
Update WiFi models to support 6 GHz operation. (#607)
Browse files Browse the repository at this point in the history 
* Update WiFi models to support 6 GHz operation.

    * (M) release/models/wifi/openconfig-ap-manager.yang
      - Added deployment types and power sources.
    * (M) release/models/wifi/openconfig-wifi-mac.yang
      - Added ssid basic/supported data rates, opmode
      - Changed server-group requirements for new opmodes
      - Added mfp support
    * (M) release/models/wifi/openconfig-wifi-phy.yang
      - Added new channels and neighbor-list-state opmodes.
    * (M) release/models/wifi/openconfig-wifi-types
      - Added new channels, operating frequencies and operating capabilities.

* Fix OC versions and substitute - for _.

* Substitute - for _

* Additional updates to support 6 GHz on WiFi models.

* (M) release/models/wifi/openconfig-wifi-types.yang
  - Consolidated channels for all frequencies.
* (M) release/models/wifi/openconfig-wifi-phy.yang
  - Removed supported-channels-6ghz due to channel consolidation (above).
* (M) release/models/wifi/openconfig-ap-manager.yang
  - Updated power-sources for 802.3bt with Types 3 and 4.

* * (M) release/models/wifi/openconfig-ap-manager.yang
  - Removed deployment type as implementation of 6 GHz APs in outdoor
    environments is still pending.
* (M) release/models/wifi/openconfig-wifi-mac.yang
  - Updated leaf descriptions to include 6 GHz where appropriate.
  - Added WPA3_ENTERPRISE_192_BIT enum under opmode leaf.
  - Updated server-group and mfp leaves with WPA3_ENTERPRISE_192_BIT
    opmode option.
  - Added wpa3-psk leaf.
* (M) release/models/wifi/openconfig-wifi-phy.yang
  - Updated neighbor-list-state opmodes with WPA3.
* (M) release/models/wifi/openconfig-wifi-types
  - Renamed new 6GHz-related identities for consistency.

* Addressing comments for adding 6 GHz support.

* (M) release/models/wifi/openconfig-wifi-types
  - Updated description of 6GHz-related frequency types.

Co-authored-by: Diana Cortes <dcortes@google.com>
  • Loading branch information
@deecortes
deecortes and Diana Cortes authored May 6, 2022
1 parent e3fa98e commit 207feef
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 18 deletions.
14 changes: 13 additions & 1 deletion release/models/wifi/openconfig-ap-manager.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ module openconfig-ap-manager {
"This module defines the top level configuration and state data for a
system which manages Access Points.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2023-03-24" {
description
"Update model to support operation in 6 GHz frequency.";
reference "1.1.0";
}

revision "2021-08-02" {
description
Expand Down Expand Up @@ -166,6 +172,12 @@ module openconfig-ap-manager {
enum AF {
description "Powered using 802.3af.";
}
enum BT_TYPE3 {
description "Powered using 802.3bt Type 3.";
}
enum BT_TYPE4 {
description "Powered using 802.3bt Type 4.";
}
enum PLUG {
description "Powered using local source, not PoE.";
}
Expand Down
78 changes: 69 additions & 9 deletions release/models/wifi/openconfig-wifi-mac.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ module openconfig-wifi-mac {
description
"Model for managing MAC layer configuration of Radio interfaces.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2022-03-24" {
description
"Update model to support operation in 6 GHz frequency.";
reference "1.1.0";
}

revision "2021-08-02" {
description
Expand Down Expand Up @@ -117,7 +123,7 @@ module openconfig-wifi-mac {
default "oc-wifi-types:FREQ_2_5_GHZ";
description
"Operating frequency of this SSID. When none specified, the
default is dual-band.";
default is dual-band 2.4 and 5 GHz.";
}

leaf-list basic-data-rates-2g {
Expand Down Expand Up @@ -151,6 +157,21 @@ module openconfig-wifi-mac {
description
"5GHz Supported data-rates for the SSID.";
}
leaf-list basic-data-rates-6g {
type identityref {
base oc-wifi-types:DATA_RATE;
}
description
"6GHz Basic data-rates for the SSID.";
}

leaf-list supported-data-rates-6g {
type identityref {
base oc-wifi-types:DATA_RATE;
}
description
"6GHz Supported data-rates for the SSID.";
}
// MCS rates explicitly absent, as they are typically not pruned.

leaf broadcast-filter {
Expand Down Expand Up @@ -208,8 +229,25 @@ module openconfig-wifi-mac {
description
"WPA2-Enterprise with 802.1X authentication.";
}
enum ENHANCED_OPEN {
description
"Open authentication with Opportunistic Wireless Encryption.";
}
enum WPA3_SAE {
description
"WPA3-SAE using Simultaneous Authentication of Equals (SAE).";
}
enum WPA3_ENTERPRISE {
description
"WPA3-Enterprise with 802.1X SHA-256 authentication key
management.";
}
enum WPA3_ENTERPRISE_192_BIT {
description
"WPA3-Enterprise with 802.1X SHA-384 authentication key
management.";
}
}
default "OPEN";
description
"The type of Layer2 authentication in use.";
}
Expand All @@ -223,17 +261,30 @@ module openconfig-wifi-mac {
}
description
"The passphrase used on this WPA2-Personal SSID.";
}
}

leaf wpa3-psk {
when "../opmode = 'WPA3_SAE'";
type string {
length "8..63";
}
description
"The passphrase used on this WPA3-SAE SSID.";
}

leaf server-group {
when "../opmode = 'WPA2_ENTERPRISE' or ../opmode =
'WPA2_PERSONAL'";
when "../opmode = 'WPA2_ENTERPRISE' or
../opmode = 'WPA2_PERSONAL' or
../opmode = 'WPA3_ENTERPRISE' or
../opmode = 'WPA3_ENTERPRISE_192_BIT' or
../opmode = 'WPA3_SAE'";
type string;
description
"Specifies the RADIUS server-group to be used,
as defined in the openconfig-aaa.yang model.
Including WPA2_PERSONAL as it can be accompained by MAB.";
Including WPA2_PERSONAL and WPA3_SAE as they can be accompanied by
MAB.";
}

leaf dva {
Expand Down Expand Up @@ -294,6 +345,16 @@ module openconfig-wifi-mac {
description
"Enable/disable Opportunistic Key Caching.";
}

leaf mfp {
when "../opmode = 'WPA3_ENTERPRISE' or ../opmode =
'WPA3_ENTERPRISE_192_BIT' or ../opmode =
'WPA3_SAE' or ../opmode = 'ENHANCED_OPEN'";
type boolean;
mandatory true;
description
"Management Frame Protection is required for WPA3 and OWE.";
}
}

grouping dot11v-config {
Expand Down Expand Up @@ -1329,8 +1390,7 @@ module openconfig-wifi-mac {
leaf frequency {
type uint8;
description
"Frequency the client is utilizing. Typically, 2.4 or
5[GHz].";
"Frequency the client is utilizing. Typically, 2.4, 5 or 6 [GHz].";
}
}
}
Expand Down
28 changes: 26 additions & 2 deletions release/models/wifi/openconfig-wifi-phy.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ module openconfig-wifi-phy {
description
"Model for managing PHY layer configuration of Radio interfaces.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2022-03-24" {
description
"Update model to support operation in 6 GHz frequency.";
reference "1.1.0";
}

revision "2021-08-02" {
description
Expand Down Expand Up @@ -122,7 +128,7 @@ module openconfig-wifi-phy {

leaf channel {
type uint8 {
range "1..165";
range "1..233";
}
description
"Operating channel of this radio. If using channel-bonding
Expand Down Expand Up @@ -428,6 +434,24 @@ module openconfig-wifi-phy {
description
"Any flavor of WEP encryption.";
}
enum ENHANCED_OPEN {
description
"Open authentication with Opportunistic Wireless Encryption.";
}
enum WPA3_SAE {
description
"WPA3-SAE using Simultaneous Authentication of Equals (SAE).";
}
enum WPA3_ENTERPRISE {
description
"WPA3-Enterprise with 802.1X SHA-256 authentication key
management.";
}
enum WPA3_ENTERPRISE_192_BIT {
description
"WPA3-Enterprise with 802.1X SHA-384 authentication key
management.";
}
}
description
"Operating mode of the BSS.";
Expand Down
36 changes: 30 additions & 6 deletions release/models/wifi/openconfig-wifi-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ module openconfig-wifi-types {
that are used in the openconfig-wifi modules. It can be
imported by any module to make use of these types.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2022-03-24" {
description
"Update model to support operation in 6 GHz frequency.";
reference "1.1.0";
}

revision "2021-08-02" {
description
Expand Down Expand Up @@ -51,7 +57,7 @@ module openconfig-wifi-types {
//typdef statements
typedef channels-type {
type uint8 {
range "1..14 | 36 | 40 | 44| 48 | 52 | 56 | 60 | 64 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | 128 | 132 | 136 | 140 | 144 | 149 | 153 | 157 | 161 | 165";
range "1..14 | 17 | 21 | 25 | 29 | 33 | 36 | 37 | 40 | 41 | 44 | 45 | 48 | 49 | 52 | 53 | 56 | 57 | 60 | 61 | 64 | 65 | 69 | 73 | 77 | 81 | 85 | 89 | 93 | 97 | 100 | 101 | 104 | 105 | 108 | 109 | 112 | 113 | 116 | 117 | 120 | 121 | 124 | 125 | 128 | 129 | 132 | 133 | 136 | 137 | 140 | 141 | 144 | 145 | 149 | 153 | 157 | 161 | 165 | 169 | 173 | 177 | 181 | 185 | 189 | 193 | 197 | 201 | 205 | 209 | 213 | 217 | 221 | 225 | 229 | 233";
}
description
"Type to specify all the WiFi channels available for use. This is
Expand Down Expand Up @@ -241,11 +247,24 @@ module openconfig-wifi-types {
base OPERATING_FREQUENCY;
description
"The Radio or SSID will be dual-band; operating in
both 2.4 & 5GHz frequencies.
both 2.4 & 5GHz frequencies.";
}

identity FREQ_6GHZ {
base OPERATING_FREQUENCY;
description "The Radio or SSID will operate at 6GHz only.";
}

Dual-band Radio typically refers to a Monitor-mode radio, hopping
between frequencies, dwelling for a configurable amount of time on
each frequency.";
identity FREQ_5_6_GHZ {
base OPERATING_FREQUENCY;
description "The Radio or SSID will be dual-band; operating in both 5 &
6GHz frequencies.";
}

identity FREQ_2_5_6_GHZ {
base OPERATING_FREQUENCY;
description "The Radio or SSID will be tri-band; operating in 2.4, 5 and
6GHz frequencies.";
}

identity CLIENT_CAPABILITIES {
Expand Down Expand Up @@ -284,6 +303,11 @@ module openconfig-wifi-types {
are observied in addition to Assoc. Req.";
}

identity MFP {
base CLIENT_CAPABILITIES;
description "Whether this STA can use Management Frame Protection.";
}

identity CHANGE_REASON_TYPE {
description
"Base type to specify the reason an Access Point
Expand Down

0 comments on commit 207feef

Please sign in to comment.