pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39613?usp=email )

Change subject: vty: show cs7 route: display qos-class configured value ......................................................................

vty: show cs7 route: display qos-class configured value

Change-Id: I2d2a246c7fbdf495af94ac5da14d4a93ef837f81 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_route_prio.vty 2 files changed, 13 insertions(+), 6 deletions(-)

Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve daniel: Looks good to me, approved

diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index d1885ea..a15b7c6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -518,7 +518,14 @@ llist_for_each_entry(rt, &rtbl->routes, list) { vty_out(vty, "%-22s %c %c %u %-19s %-7s %-7s %-7s%s", osmo_ss7_route_print(rt), - ' ', ' ', rt->cfg.priority, rt->cfg.linkset_name, "?", "?", "?", VTY_NEWLINE); + ' ', + '0' + rt->cfg.qos_class, + rt->cfg.priority, + rt->cfg.linkset_name, + "?", + "?", + "?", + VTY_NEWLINE); } }

diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 2c68080..255128e 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -65,7 +65,7 @@

OsmoSTP(config-cs7)# ! ADD 2 ROUTES WITH DECREASING PRIORITIES. THEY SHOULD END UP REORDERED BY PRIORITY: OsmoSTP(config-cs7)# route-table system -OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as1 priority 6 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as1 priority 6 qos-class 7 OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as2 OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as3 priority 2 OsmoSTP(config-cs7-rt)# show running-config @@ -75,7 +75,7 @@ route-table system update route 3.2.1 7.255.7 linkset as3 priority 2 update route 3.2.1 7.255.7 linkset as2 - update route 3.2.1 7.255.7 linkset as1 priority 6 + update route 3.2.1 7.255.7 linkset as1 priority 6 qos-class 7 ... OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route Routing table = system @@ -83,9 +83,9 @@

Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 2 as3 ? ? ? -3.2.1/14 5 as2 ? ? ? -3.2.1/14 6 as1 ? ? ? +3.2.1/14 0 2 as3 ? ? ? +3.2.1/14 0 5 as2 ? ? ? +3.2.1/14 7 6 as1 ? ? ?

OsmoSTP(config-cs7-rt)# ! NOW TEST LOOKUP WORKS AS DESIRED (as3 PICKED): OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0