Apply _when_ to sensor state, remove sensor from top level model

Author: mrevang

release/models/platform/openconfig-platform-common.yang

@@ -20,13 +20,7 @@ submodule openconfig-platform-common {
     "This modules contains common groupings that are used in multiple
     components within the platform module.";
 
-  oc-ext:openconfig-version "0.33.0";
-
-  revision "2025-09-16" {
-    description
-      "Add sensor container.";
-    reference "0.33.0";
-  }
+  oc-ext:openconfig-version "0.32.0";
 
   revision "2025-07-15" {
     description

release/models/platform/openconfig-platform-sensor.yang

@@ -8,6 +8,7 @@ module openconfig-platform-sensor {
   prefix "oc-sensor";
 
   import openconfig-platform { prefix oc-platform; }
+  import openconfig-platform-types { prefix oc-platform-types; }
   import openconfig-extensions { prefix oc-ext; }
   import openconfig-alarm-types { prefix oc-alarm-types; }
 
@@ -167,25 +168,30 @@ module openconfig-platform-sensor {
     }
   }
 
+  grouping sensor-top {
+    container sensor {
+      description
+        "Data for sensor components";
+
+      container state {
+        when "../../oc-platform:state/oc-platform:type = 'oc-platform-types:SENSOR'";
+        config false;
+        description
+          "Operational state data for sensor components";
+        uses sensor-state;
+        uses sensor-threshold-top;
+      }
+    }
+  }
 
   // data definition statements
 
   // augment statements
 
-  augment "/oc-platform:components/oc-platform:component/oc-platform:state/" +
-    "oc-platform:sensor" {
-    description
-      "Adding sensor data to component model";
-
-    uses sensor-threshold-top;
-  }
-
-  augment "/oc-platform:components/oc-platform:component/oc-platform:state/" +
-    "oc-platform:sensor/oc-platform:state" {
+  augment "/oc-platform:components/oc-platform:component" {
     description
-      "Adding sensor state data to component model";
+      "Adding sensor container to component";
 
-    uses sensor-state;
+    uses sensor-top;
   }
-
 }

release/models/platform/openconfig-platform.yang

@@ -65,13 +65,7 @@ module openconfig-platform {
     (presence or absence of a component) and state (physical
     attributes or status).";
 
-  oc-ext:openconfig-version "0.33.0";
-
-  revision "2025-09-16" {
-    description
-      "Add sensor container.";
-    reference "0.33.0";
-  }
+  oc-ext:openconfig-version "0.32.0";
 
   revision "2025-07-15" {
     description
@@ -1063,20 +1057,6 @@ revision "2024-05-29" {
     }
   }
 
-  grouping platform-component-sensor-state {
-    container sensor {
-      //when "../state/type = 'oc-platform-types:SENSOR'";
-      description
-        "Data for sensor components";
-
-      container state {
-        config false;
-        description
-          "Operational state data for sensor components";
-      }
-    }
-  }
-
   grouping platform-anchors-top {
     description
       "This grouping is used to add containers for components that
@@ -1372,9 +1352,6 @@ revision "2024-05-29" {
               "'oc-platform-types:INTEGRATED_CIRCUIT' or " +
               "'oc-platform-types:FRU'";
           }
-          uses platform-component-sensor-state {
-            when "./type = 'oc-platform-types:SENSOR'";
-          }
         }
 
         uses platform-component-properties-top;