From 9ef6d2d0381b75b5219fe005278c87d171b0f89c Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Thu, 23 Jan 2025 14:00:55 +0100
Subject: [PATCH] yang: Remove old STP port state from operational

---
 src/confd/yang/infix-if-bridge.yang                | 9 +++------
 src/statd/python/cli_pretty/cli_pretty.py          | 3 ++-
 src/statd/python/yanger/ietf_interfaces/bridge.py  | 3 ---
 test/case/ietf_interfaces/bridge_stp_basic/test.py | 3 ++-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/confd/yang/infix-if-bridge.yang b/src/confd/yang/infix-if-bridge.yang
index ea0bfc09..7e7aa131 100644
--- a/src/confd/yang/infix-if-bridge.yang
+++ b/src/confd/yang/infix-if-bridge.yang
@@ -32,6 +32,9 @@ submodule infix-if-bridge {
   revision 2025-01-08 {
     description "Add Spanning Tree Protocol (STP) support.
 
+                 Move STP port state from the old `stp-state` to the
+                 new `stp/cist/state`.
+
                  Drop the `default-priority` bridge port option, which
                  has never been supported but was accidentally
                  included in the model.";
@@ -883,12 +886,6 @@ submodule infix-if-bridge {
         }
       }
     }
-
-    leaf stp-state {
-      type stp-state;
-      config false;
-      description "The operation state of the bridge port.";
-    }
   }
 
   augment "/if:interfaces/if:interface/infix-if:port" {
diff --git a/src/statd/python/cli_pretty/cli_pretty.py b/src/statd/python/cli_pretty/cli_pretty.py
index 7d38961a..7616e70f 100755
--- a/src/statd/python/cli_pretty/cli_pretty.py
+++ b/src/statd/python/cli_pretty/cli_pretty.py
@@ -282,7 +282,8 @@ class Iface:
         self.br_vlans = get_json_data({}, self.data, 'infix-interfaces:bridge', 'vlans', "vlan")
         self.bridge = get_json_data('', self.data, 'infix-interfaces:bridge-port', 'bridge')
         self.pvid = get_json_data('', self.data, 'infix-interfaces:bridge-port', 'pvid')
-        self.stp_state = get_json_data('', self.data, 'infix-interfaces:bridge-port', 'stp-state')
+        self.stp_state = get_json_data('', self.data, 'infix-interfaces:bridge-port',
+                                       'stp', 'cist', 'state')
         self.containers = get_json_data('', self.data, 'infix-interfaces:container-network', 'containers')
 
 
diff --git a/src/statd/python/yanger/ietf_interfaces/bridge.py b/src/statd/python/yanger/ietf_interfaces/bridge.py
index febe0cd9..14e22667 100644
--- a/src/statd/python/yanger/ietf_interfaces/bridge.py
+++ b/src/statd/python/yanger/ietf_interfaces/bridge.py
@@ -141,9 +141,6 @@ def lower(iplink):
         },
 
         "stp": lower_stp(iplink),
-
-        # TODO: REMOVE
-        "stp-state": info["state"],
     }
 
 
diff --git a/test/case/ietf_interfaces/bridge_stp_basic/test.py b/test/case/ietf_interfaces/bridge_stp_basic/test.py
index f4a74e9c..8d1f5745 100755
--- a/test/case/ietf_interfaces/bridge_stp_basic/test.py
+++ b/test/case/ietf_interfaces/bridge_stp_basic/test.py
@@ -57,7 +57,8 @@ def addbr(dut):
 def num_blocking(dut):
     num = 0
     for iface in dut.get_data("/ietf-interfaces:interfaces")["interfaces"]["interface"]:
-        if iface.get("bridge-port", {}).get("stp-state") == "blocking":
+        state = iface.get("bridge-port", {}).get("stp", {}).get("cist", {}).get("state")
+        if state == "blocking":
             num += 1
 
     return num