<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15856">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ss7: Set default traffic-mode to override<br><br>Change-Id: I8570ed6634eb20c0f9e4b712de6592b6c3b77227<br>---<br>M src/osmo_ss7.c<br>M src/osmo_ss7_vty.c<br>M tests/vty/ss7_asp_test.vty<br>3 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 464f2f4..6c6e412 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -955,7 +955,7 @@</span><br><span> as->inst = inst;</span><br><span> as->cfg.name = talloc_strdup(as, name);</span><br><span> as->cfg.proto = proto;</span><br><span style="color: hsl(0, 100%, 40%);">- as->cfg.mode = OSMO_SS7_AS_TMOD_LOADSHARE;</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode = OSMO_SS7_AS_TMOD_OVERRIDE;</span><br><span> as->cfg.recovery_timeout_msec = 2000;</span><br><span> as->cfg.routing_key.l_rk_id = find_free_l_rk_id(inst);</span><br><span> as->fi = xua_as_fsm_start(as, LOGL_DEBUG);</span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index e11b3bc..b068fec 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -994,7 +994,7 @@</span><br><span> continue;</span><br><span> vty_out(vty, " asp %s%s", asp->cfg.name, VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (as->cfg.mode != OSMO_SS7_AS_TMOD_LOADSHARE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (as->cfg.mode != OSMO_SS7_AS_TMOD_OVERRIDE)</span><br><span> vty_out(vty, " traffic-mode %s%s",</span><br><span> osmo_ss7_as_traffic_mode_name(as->cfg.mode), VTY_NEWLINE);</span><br><span> if (as->cfg.recovery_timeout_msec != 2000) {</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index 74dc777..367c2d9 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -270,13 +270,13 @@</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span> AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span> ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 override</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as active</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span> AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span> ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 override</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as sua</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span>@@ -287,7 +287,7 @@</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span> AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span> ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 0.0.0 loadshare</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 0.0.0 override</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>@@ -318,7 +318,7 @@</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span> AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span> ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 3.2.1 loadshare</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 3.2.1 override</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -359,7 +359,7 @@</span><br><span> Routing Routing Key Cic Cic Traffic</span><br><span> AS Name State Context Dpc Si Opc Ssn Min Max Mode</span><br><span> ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------</span><br><span style="color: hsl(0, 100%, 40%);">-my-ass AS_DOWN 0 3.2.1 loadshare</span><br><span style="color: hsl(120, 100%, 40%);">+my-ass AS_DOWN 0 3.2.1 override</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/+/15856">change 15856</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/+/15856"/><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: I8570ed6634eb20c0f9e4b712de6592b6c3b77227 </div>
<div style="display:none"> Gerrit-Change-Number: 15856 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>