Skip to content

Commit

Permalink
fixup: remove old link peer mgmt attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
kgiusti committed Nov 21, 2024
1 parent d6ae6af commit c0340e2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 32 deletions.
4 changes: 0 additions & 4 deletions python/skupper_router/management/skrouter.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
48 changes: 21 additions & 27 deletions src/router_core/agent_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -62,7 +61,6 @@ const char *qdr_link_columns[] =
"linkDir",
"owningAddr",
"capacity",
"peer",
"undeliveredCount",
"unsettledCount",
"deliveryCount",
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/router_core/agent_link.h
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down

0 comments on commit c0340e2

Please sign in to comment.