<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15801">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Print traffic mode during show cs7 instance as<br><br>Change-Id: Ief6b03f50751b8d8f4021e94d54f079681b64d51<br>---<br>M src/osmo_ss7_vty.c<br>M tests/vty/ss7_asp_test.vty<br>2 files changed, 29 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index fa3d5d1..e11b3bc 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -1040,9 +1040,9 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " Routing Routing Key Cic Cic%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "AS Name State Context Dpc Si Opc Ssn Min Max%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "------------ ------------ ---------- ------------- ---- ------------- --- ----- -----%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Routing Routing Key Cic Cic Traffic%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "AS Name State Context Dpc Si Opc Ssn Min Max Mode%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------%s", VTY_NEWLINE);</span><br><span> </span><br><span> llist_for_each_entry(as, &inst->as_list, list) {</span><br><span> if (filter && !strcmp(filter, "m3ua") && as->cfg.proto != OSMO_SS7_ASP_PROT_M3UA)</span><br><span>@@ -1050,10 +1050,11 @@</span><br><span> if (filter && !strcmp(filter, "sua") && as->cfg.proto != OSMO_SS7_ASP_PROT_SUA)</span><br><span> continue;</span><br><span> /* FIXME: active filter */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%-12s %-12s %-10u %-13s %4s %13s %3s %5s %4s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%-12s %-12s %-10u %-13s %4s %13s %3s %5s %4s %10s%s",</span><br><span> as->cfg.name, osmo_fsm_inst_state_name(as->fi), as->cfg.routing_key.context,</span><br><span> osmo_ss7_pointcode_print(as->inst, as->cfg.routing_key.pc),</span><br><span style="color: hsl(0, 100%, 40%);">- "", "", "", "", "", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ "", "", "", "", "", osmo_ss7_as_traffic_mode_name(as->cfg.mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> }</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index b502367..74dc777 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -267,27 +267,27 @@</span><br><span> asp Specify ASP to be removed from this AS</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as all</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 </span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as active</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 </span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as sua</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as m3ua</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 </span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# asp my-asp</span><br><span> ss7_asp_vty_test(config-cs7-as)# routing-key 0 3.2.1</span><br><span>@@ -315,10 +315,10 @@</span><br><span> my-asp ? ASP_DOWN m3ua 127.0.0.200:12345 </span><br><span> </span><br><span> ss7_asp_vty_test(config)# do show cs7 instance 0 as all</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 3.2.1 </span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 3.2.1 loadshare</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -356,10 +356,10 @@</span><br><span> ------------ ------------ ------------- ---- ----------------------- ----------</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 as all</span><br><span style="color: hsl(0, 100%, 40%);">- Routing Routing Key Cic Cic</span><br><span style="color: hsl(0, 100%, 40%);">-AS Name State Context Dpc Si Opc Ssn Min Max</span><br><span>------------- ------------ ---------- ------------- ---- ------------- --- ----- -----</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 3.2.1 </span><br><span style="color: hsl(120, 100%, 40%);">+ Routing Routing Key Cic Cic Traffic</span><br><span style="color: hsl(120, 100%, 40%);">+AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span style="color: hsl(120, 100%, 40%);">+------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 3.2.1 loadshare</span><br><span> </span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15801">change 15801</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15801"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ief6b03f50751b8d8f4021e94d54f079681b64d51 </div>
<div style="display:none"> Gerrit-Change-Number: 15801 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>