From c0340e2cb6a953e1d7018a25d6cae3dcb4d68fdb Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@redhat.com>
Date: Thu, 21 Nov 2024 10:31:09 -0500
Subject: [PATCH] fixup: remove old link peer mgmt attribute

---
 .../skupper_router/management/skrouter.json   |  4 --
 src/router_core/agent_link.c                  | 48 ++++++++-----------
 src/router_core/agent_link.h                  |  2 +-
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/python/skupper_router/management/skrouter.json b/python/skupper_router/management/skrouter.json
index ba1749e24..39c0580e2 100644
--- a/python/skupper_router/management/skrouter.json
+++ b/python/skupper_router/management/skrouter.json
@@ -1422,10 +1422,6 @@
                     "type": "integer",
                     "description": "The capacity, in deliveries, for the link.  The number of undelivered plus unsettled deliveries shall not exceed the capacity.  This is enforced by link flow control."
                 },
-                "peer": {
-                    "type": "string",
-                    "description": "Identifier of the paired link if this is an attach-routed link."
-                },
                 "undeliveredCount": {
                     "type": "integer",
                     "graph": true,
diff --git a/src/router_core/agent_link.c b/src/router_core/agent_link.c
index 5aeb50619..9bd4d6fa2 100644
--- a/src/router_core/agent_link.c
+++ b/src/router_core/agent_link.c
@@ -30,28 +30,27 @@
 #define QDR_LINK_LINK_DIR                 5
 #define QDR_LINK_OWNING_ADDR              6
 #define QDR_LINK_CAPACITY                 7
-#define QDR_LINK_PEER                     8
-#define QDR_LINK_UNDELIVERED_COUNT        9
-#define QDR_LINK_UNSETTLED_COUNT          10
-#define QDR_LINK_DELIVERY_COUNT           11
-#define QDR_LINK_CONNECTION_ID            12
-#define QDR_LINK_ADMIN_STATE              13
-#define QDR_LINK_OPER_STATE               14
-#define QDR_LINK_PRESETTLED_COUNT         15
-#define QDR_LINK_DROPPED_PRESETTLED_COUNT 16
-#define QDR_LINK_ACCEPTED_COUNT           17
-#define QDR_LINK_REJECTED_COUNT           18
-#define QDR_LINK_RELEASED_COUNT           19
-#define QDR_LINK_MODIFIED_COUNT           20
-#define QDR_LINK_DELAYED_1SEC             21
-#define QDR_LINK_DELAYED_10SEC            22
-#define QDR_LINK_DELIVERIES_STUCK         23
-#define QDR_LINK_OPEN_MOVED_STREAMS       24
-#define QDR_LINK_INGRESS_HISTOGRAM        25
-#define QDR_LINK_PRIORITY                 26
-#define QDR_LINK_SETTLE_RATE              27
-#define QDR_LINK_CREDIT_AVAILABLE         28
-#define QDR_LINK_ZERO_CREDIT_SECONDS      29
+#define QDR_LINK_UNDELIVERED_COUNT        8
+#define QDR_LINK_UNSETTLED_COUNT          9
+#define QDR_LINK_DELIVERY_COUNT           10
+#define QDR_LINK_CONNECTION_ID            11
+#define QDR_LINK_ADMIN_STATE              12
+#define QDR_LINK_OPER_STATE               13
+#define QDR_LINK_PRESETTLED_COUNT         14
+#define QDR_LINK_DROPPED_PRESETTLED_COUNT 15
+#define QDR_LINK_ACCEPTED_COUNT           16
+#define QDR_LINK_REJECTED_COUNT           17
+#define QDR_LINK_RELEASED_COUNT           18
+#define QDR_LINK_MODIFIED_COUNT           19
+#define QDR_LINK_DELAYED_1SEC             20
+#define QDR_LINK_DELAYED_10SEC            21
+#define QDR_LINK_DELIVERIES_STUCK         22
+#define QDR_LINK_OPEN_MOVED_STREAMS       23
+#define QDR_LINK_INGRESS_HISTOGRAM        24
+#define QDR_LINK_PRIORITY                 25
+#define QDR_LINK_SETTLE_RATE              26
+#define QDR_LINK_CREDIT_AVAILABLE         27
+#define QDR_LINK_ZERO_CREDIT_SECONDS      28
 
 const char *qdr_link_columns[] =
     {"name",
@@ -62,7 +61,6 @@ const char *qdr_link_columns[] =
      "linkDir",
      "owningAddr",
      "capacity",
-     "peer",
      "undeliveredCount",
      "unsettledCount",
      "deliveryCount",
@@ -157,10 +155,6 @@ static void qdr_agent_write_column_CT(qdr_core_t *core, qd_composed_field_t *bod
         qd_compose_insert_uint(body, link->capacity);
         break;
 
-    case QDR_LINK_PEER:  // link-routing no longer supported
-        qd_compose_insert_null(body);
-        break;
-
     case QDR_LINK_UNDELIVERED_COUNT:
         qd_compose_insert_ulong(body, DEQ_SIZE(link->undelivered));
         break;
diff --git a/src/router_core/agent_link.h b/src/router_core/agent_link.h
index b0ec1a117..06e503dda 100644
--- a/src/router_core/agent_link.h
+++ b/src/router_core/agent_link.h
@@ -29,7 +29,7 @@ void qdra_link_update_CT(qdr_core_t          *core,
                          qdr_query_t         *query,
                          qd_parsed_field_t   *in_body);
 
-#define QDR_LINK_COLUMN_COUNT  30
+#define QDR_LINK_COLUMN_COUNT  29
 
 extern const char *qdr_link_columns[QDR_LINK_COLUMN_COUNT + 1];