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.
openconfig · Mar 30, 2022 · c0dc6e3 · c0dc6e3
1 parent 9b77615
commit c0dc6e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/release/models/wifi/openconfig-ap-manager.yang b/release/models/wifi/openconfig-ap-manager.yang
@@ -188,8 +188,11 @@ module openconfig-ap-manager {
       enum AF {
         description "Powered using 802.3af.";
       }
-      enum BT {
-        description "Powered using 802.3bt.";
+      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.";

diff --git a/release/models/wifi/openconfig-wifi-phy.yang b/release/models/wifi/openconfig-wifi-phy.yang
@@ -290,13 +290,6 @@ module openconfig-wifi-phy {
         restrictions.";
     }
 
-    leaf-list supported-channels-6ghz {
-      type oc-wifi-types:channels-type-6ghz;
-      description
-        "6 GHz channels allowed by a combination of regulatory and AP
-         certification restrictions.";
-    }
-
     leaf channel-change-reason {
       type identityref {
         base oc-wifi-types:CHANGE_REASON_TYPE;

diff --git a/release/models/wifi/openconfig-wifi-types.yang b/release/models/wifi/openconfig-wifi-types.yang
@@ -57,24 +57,14 @@ 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
       a superset of what may be allowed by any one particular regulatory
       domain.";
   }
 
-  typedef channels-type-6ghz {
-    type uint8 {
-      range "1 | 5 | 9 | 13 | 17 | 21 | 25 | 29 | 33 | 37 | 41 | 45 | 49 | 53 | 57 | 61 | 65 | 69 | 73 | 77 | 81 | 85 | 89 | 93 | 97 | 101 | 105 | 109 | 113 | 117 | 121 | 125 | 129 | 133 | 137 | 141 | 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 6 GHz channels available for use. This is a
-       superset of what may be allowed by any one particular regulatory
-       domain.";
-  }
-
   // identity statements
   identity CLIENT_STATE {
     description