pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41403?usp=email )
Change subject: vty: Always write network-indicator ......................................................................
vty: Always write network-indicator
Network-indicator is an important configuration defining the network, hence it should always be printed during vty show/write.
Change-Id: I969ee94c00afa7a77e26c8cf3e9b998b06022641 --- M src/ss7_vty.c M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty 3 files changed, 6 insertions(+), 5 deletions(-)
Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved
diff --git a/src/ss7_vty.c b/src/ss7_vty.c index cfc658d..98c6073 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -1286,11 +1286,9 @@ vty_out(vty, "cs7 instance %u%s", inst->cfg.id, VTY_NEWLINE); if (inst->cfg.description) vty_out(vty, " description %s%s", inst->cfg.description, VTY_NEWLINE); - if (inst->cfg.network_indicator != MTP_NI_INTERNATIONAL) - vty_out(vty, " network-indicator %s%s", - get_value_string(mtp_network_indicator_vals, - inst->cfg.network_indicator), - VTY_NEWLINE); + vty_out(vty, " network-indicator %s%s", + get_value_string(mtp_network_indicator_vals, inst->cfg.network_indicator), + VTY_NEWLINE);
if (inst->cfg.pc_fmt.component_len[0] != 3 || inst->cfg.pc_fmt.component_len[1] != 8 || diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index d9e3add..6a4ac08 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -36,6 +36,7 @@ OsmoSTP(config-cs7)# show running-config ... cs7 instance 0 + network-indicator international xua rkm routing-key-allocation dynamic-permitted asp asp1 2905 54321 m3ua local-ip 27.0.0.1 diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 62ad287..8f2a96a 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -610,6 +610,7 @@ OsmoSTP(config)# show running-config ... cs7 instance 0 + network-indicator international xua rkm routing-key-allocation dynamic-permitted asp my-asp 12345 54321 m3ua local-ip 127.0.0.100 @@ -632,6 +633,7 @@ routing-indicator PC point-code 1.2.3 cs7 instance 1 + network-indicator international route-table system sccp-address bar routing-indicator PC