From 853b92652eef979b251f2457c6b70eab650eb610 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 8 Aug 2024 07:49:45 -0700
Subject: [PATCH 01/16] Update description of model-name.

---
 release/models/platform/openconfig-platform.yang | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 89ebb559b..e1695413e 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -542,9 +542,13 @@ module openconfig-platform {
     leaf model-name {
       type string;
       description
-        "A human readable string describing the model of a component.
-        This string is optional and should only be populated if part-no
-        is also populated.";
+        "The model of a component. This should be the orderable part
+        number when the component is a FRU (field replaceable unit).
+        To distinguish this from part-no, the model-name is the model
+        that could be searched for online. The part-no is the unique
+        identifier of a part, but would not necessarily have meaning
+        to someone reading it. The model-name is optional and should
+        only be populated if part-no is also populated.";
     }
 
     leaf clei-code {

From 3754373c55cad02a2de73d53bb97562fe5e9ca5d Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 8 Aug 2024 07:51:13 -0700
Subject: [PATCH 02/16] Add new revision.

---
 release/models/platform/openconfig-platform.yang | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index e1695413e..4b48bea30 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -65,7 +65,13 @@ module openconfig-platform {
     (presence or absence of a component) and state (physical
     attributes or status).";
 
-  oc-ext:openconfig-version "0.27.0";
+  oc-ext:openconfig-version "0.28.0";
+
+  revision "2024-08-08" {
+    description
+      "Update description of model-name leaf.";
+    reference "0.28.0";
+  }
 
   revision "2024-05-29" {
     description

From ef5d95be64ce6248afa4687a71b7df4e2bb7f824 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 8 Aug 2024 07:51:53 -0700
Subject: [PATCH 03/16] Update revision in openconfig-platform-common.

---
 release/models/platform/openconfig-platform-common.yang | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform-common.yang b/release/models/platform/openconfig-platform-common.yang
index 04f58b3ac..da46ed60b 100644
--- a/release/models/platform/openconfig-platform-common.yang
+++ b/release/models/platform/openconfig-platform-common.yang
@@ -20,7 +20,13 @@ submodule openconfig-platform-common {
     "This modules contains common groupings that are used in multiple
     components within the platform module.";
 
-  oc-ext:openconfig-version "0.27.0";
+  oc-ext:openconfig-version "0.28.0";
+
+  revision "2024-08-08" {
+    description
+      "Update description of model-name leaf.";
+    reference "0.28.0";
+  }
 
   revision "2024-05-29" {
     description

From 47fe1d3d6c334dd76a7afc80a1f4be30b1d4ff75 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 8 Aug 2024 16:15:21 -0700
Subject: [PATCH 04/16] Update openconfig-platform.yang

---
 release/models/platform/openconfig-platform.yang | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 4b48bea30..970b6502b 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -548,13 +548,8 @@ module openconfig-platform {
     leaf model-name {
       type string;
       description
-        "The model of a component. This should be the orderable part
-        number when the component is a FRU (field replaceable unit).
-        To distinguish this from part-no, the model-name is the model
-        that could be searched for online. The part-no is the unique
-        identifier of a part, but would not necessarily have meaning
-        to someone reading it. The model-name is optional and should
-        only be populated if part-no is also populated.";
+        "The model of a component. The model-name is optional and
+        should only be populated if part-no is also populated.";
     }
 
     leaf clei-code {

From 772eb8bf5679c336e447fa490becc4179e3ef3d6 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:32:07 -0700
Subject: [PATCH 05/16] Indicate that model-name is required.

---
 release/models/platform/openconfig-platform.yang | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 970b6502b..5788f5096 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -548,8 +548,11 @@ module openconfig-platform {
     leaf model-name {
       type string;
       description
-        "The model of a component. The model-name is optional and
-        should only be populated if part-no is also populated.";
+        "The hardware model name of a component. This is the hardware
+        name that would be found in a device catalog and is often the
+        orderable name of the component. This is required for all FRU
+        (field replaceable unit) components (i.e.,
+        /components/component/state/removable=TRUE).";
     }
 
     leaf clei-code {

From 2096726be032c64cd305e45455be2df85a908c99 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:27:48 -0700
Subject: [PATCH 06/16] Check that removable is true for model-name.

Co-authored-by: Darren Loher <dloher@google.com>
---
 release/models/platform/openconfig-platform.yang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 5788f5096..2b4a4e83a 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,8 +546,9 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      type string;
-      description
+      when "../removable = 'true'" {
+        type string;
+        description
         "The hardware model name of a component. This is the hardware
         name that would be found in a device catalog and is often the
         orderable name of the component. This is required for all FRU

From c45f0267912ebb511d187ebd78aa75b1b3b8adf7 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:29:07 -0700
Subject: [PATCH 07/16] Apply suggested updates to definition.

Co-authored-by: Darren Loher <dloher@google.com>
---
 release/models/platform/openconfig-platform.yang | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 2b4a4e83a..8388066a9 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -549,11 +549,10 @@ module openconfig-platform {
       when "../removable = 'true'" {
         type string;
         description
-        "The hardware model name of a component. This is the hardware
-        name that would be found in a device catalog and is often the
-        orderable name of the component. This is required for all FRU
-        (field replaceable unit) components (i.e.,
-        /components/component/state/removable=TRUE).";
+        "This is the component name that would be found in a catalog of 
+        stock keeping units (SKU) and should be the orderable name of
+        the component. This is required for all FRU (field replaceable unit)
+        components (i.e., /components/component/state/removable=TRUE).";
     }
 
     leaf clei-code {

From 0774b5ec2e0fd124c2fe61eaaba43d443a516af7 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:28:44 -0700
Subject: [PATCH 08/16] Fix when stmt.

---
 release/models/platform/openconfig-platform.yang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 8388066a9..a90283954 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,9 +546,9 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true'" {
-        type string;
-        description
+      when "../removable = 'true'";
+      type string;
+      description
         "This is the component name that would be found in a catalog of 
         stock keeping units (SKU) and should be the orderable name of
         the component. This is required for all FRU (field replaceable unit)

From 83bba81d38567127840ebaedb0e18d9a1f65766e Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:39:57 -0700
Subject: [PATCH 09/16] Set mandatory true when removable is true.

---
 release/models/platform/openconfig-platform.yang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index a90283954..7736234b4 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,7 +546,9 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true'";
+      when "../removable = 'true'" {
+        mandatory true;
+      }
       type string;
       description
         "This is the component name that would be found in a catalog of 

From 37a425f9dabe7eb71e77bbfe69d5972c42ceb75a Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:41:52 -0700
Subject: [PATCH 10/16] Remove "component name" from model name description.

---
 release/models/platform/openconfig-platform.yang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 7736234b4..e3351ed6c 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -551,9 +551,9 @@ module openconfig-platform {
       }
       type string;
       description
-        "This is the component name that would be found in a catalog of 
-        stock keeping units (SKU) and should be the orderable name of
-        the component. This is required for all FRU (field replaceable unit)
+        "Model name that would be found in a catalog of stock keeping
+        units (SKU) and should be the orderable name of the component.
+        This is required for all FRU (field replaceable unit)
         components (i.e., /components/component/state/removable=TRUE).";
     }
 

From 0df4e7b3154e3fe8b897e26d2ada847e880c4067 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:43:22 -0700
Subject: [PATCH 11/16] Do not mention FRU in model-name description.

---
 release/models/platform/openconfig-platform.yang | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index e3351ed6c..85e2cbafb 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -552,9 +552,8 @@ module openconfig-platform {
       type string;
       description
         "Model name that would be found in a catalog of stock keeping
-        units (SKU) and should be the orderable name of the component.
-        This is required for all FRU (field replaceable unit)
-        components (i.e., /components/component/state/removable=TRUE).";
+        units (SKU) and should be the orderable name of the 
+        component.";
     }
 
     leaf clei-code {

From 9d872a690d657f29255480355eba6c8f8f9a8aae Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Fri, 30 Aug 2024 07:48:20 -0700
Subject: [PATCH 12/16] Remove trailing whitespace.

---
 release/models/platform/openconfig-platform.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 85e2cbafb..077b883b5 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -552,7 +552,7 @@ module openconfig-platform {
       type string;
       description
         "Model name that would be found in a catalog of stock keeping
-        units (SKU) and should be the orderable name of the 
+        units (SKU) and should be the orderable name of the
         component.";
     }
 

From 23d441ecdd081393d63cc179f19ec4121a68ef15 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Tue, 3 Sep 2024 08:28:36 -0700
Subject: [PATCH 13/16] Fix when stmt.

---
 release/models/platform/openconfig-platform.yang | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 077b883b5..646682c85 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,9 +546,8 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true'" {
-        mandatory true;
-      }
+      when "../removable = 'true'";
+      mandatory true;
       type string;
       description
         "Model name that would be found in a catalog of stock keeping

From 395bfa14e1ae330436677fdbc3cb4076990c7043 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:36:46 -0400
Subject: [PATCH 14/16] When removable or state/type is CHASSIS

---
 release/models/platform/openconfig-platform.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index 646682c85..b8214b160 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,7 +546,7 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true'";
+      when "../removable = 'true' or ../state/type = 'CHASSIS'";
       mandatory true;
       type string;
       description

From 6650e9e09cd85b9514e6514082c35b19cca0af96 Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:53:10 -0400
Subject: [PATCH 15/16] Fix state/type in when statement.

---
 release/models/platform/openconfig-platform.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index b8214b160..d45dbecce 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,7 +546,7 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true' or ../state/type = 'CHASSIS'";
+      when "../removable = 'true' or ../type = 'CHASSIS'";
       mandatory true;
       type string;
       description

From 19e94b0b09a52068244e49e140e0c5f970c5885b Mon Sep 17 00:00:00 2001
From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:41:46 -0400
Subject: [PATCH 16/16] Prefix chassis type.

---
 release/models/platform/openconfig-platform.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
index d45dbecce..3ddb6cef4 100644
--- a/release/models/platform/openconfig-platform.yang
+++ b/release/models/platform/openconfig-platform.yang
@@ -546,7 +546,7 @@ module openconfig-platform {
     }
 
     leaf model-name {
-      when "../removable = 'true' or ../type = 'CHASSIS'";
+      when "../removable = 'true' or ../type = 'oc-platform-types:CHASSIS'";
       mandatory true;
       type string;
       description