summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-10-23 16:36:41 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-10-24 13:23:09 +0200
commitc99724a9ec5f427a2a9d2ceda0cc7d9b1f847a0c (patch)
tree600dea36d0ba2646aa13ce6cf1d040a162d48bf4
parent7240f56a70867edb0455eaff1c2e6bcf5247513f (diff)
ss7: Set default traffic-mode to override
-rw-r--r--src/osmo_ss7.c2
-rw-r--r--src/osmo_ss7_vty.c2
-rw-r--r--tests/vty/ss7_asp_test.vty10
3 files changed, 7 insertions, 7 deletions
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 464f2f4..6c6e412 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -955,7 +955,7 @@ osmo_ss7_as_find_or_create(struct osmo_ss7_instance *inst, const char *name,
as->inst = inst;
as->cfg.name = talloc_strdup(as, name);
as->cfg.proto = proto;
- as->cfg.mode = OSMO_SS7_AS_TMOD_LOADSHARE;
+ as->cfg.mode = OSMO_SS7_AS_TMOD_OVERRIDE;
as->cfg.recovery_timeout_msec = 2000;
as->cfg.routing_key.l_rk_id = find_free_l_rk_id(inst);
as->fi = xua_as_fsm_start(as, LOGL_DEBUG);
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index e11b3bc..b068fec 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -994,7 +994,7 @@ static void write_one_as(struct vty *vty, struct osmo_ss7_as *as)
continue;
vty_out(vty, " asp %s%s", asp->cfg.name, VTY_NEWLINE);
}
- if (as->cfg.mode != OSMO_SS7_AS_TMOD_LOADSHARE)
+ if (as->cfg.mode != OSMO_SS7_AS_TMOD_OVERRIDE)
vty_out(vty, " traffic-mode %s%s",
osmo_ss7_as_traffic_mode_name(as->cfg.mode), VTY_NEWLINE);
if (as->cfg.recovery_timeout_msec != 2000) {
diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty
index 74dc777..367c2d9 100644
--- a/tests/vty/ss7_asp_test.vty
+++ b/tests/vty/ss7_asp_test.vty
@@ -270,13 +270,13 @@ ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as all
Routing Routing Key Cic Cic Traffic
AS Name State Context Dpc Si Opc Ssn Min Max Mode
------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------
-my-ass AS_DOWN 0 0.0.0 loadshare
+my-ass AS_DOWN 0 0.0.0 override
ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as active
Routing Routing Key Cic Cic Traffic
AS Name State Context Dpc Si Opc Ssn Min Max Mode
------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------
-my-ass AS_DOWN 0 0.0.0 loadshare
+my-ass AS_DOWN 0 0.0.0 override
ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as sua
Routing Routing Key Cic Cic Traffic
@@ -287,7 +287,7 @@ ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as m3ua
Routing Routing Key Cic Cic Traffic
AS Name State Context Dpc Si Opc Ssn Min Max Mode
------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------
-my-ass AS_DOWN 0 0.0.0 loadshare
+my-ass AS_DOWN 0 0.0.0 override
ss7_asp_vty_test(config-cs7-as)# asp my-asp
ss7_asp_vty_test(config-cs7-as)# routing-key 0 3.2.1
@@ -318,7 +318,7 @@ ss7_asp_vty_test(config)# do show cs7 instance 0 as all
Routing Routing Key Cic Cic Traffic
AS Name State Context Dpc Si Opc Ssn Min Max Mode
------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------
-my-ass AS_DOWN 0 3.2.1 loadshare
+my-ass AS_DOWN 0 3.2.1 override
@@ -359,7 +359,7 @@ ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 as all
Routing Routing Key Cic Cic Traffic
AS Name State Context Dpc Si Opc Ssn Min Max Mode
------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------
-my-ass AS_DOWN 0 3.2.1 loadshare
+my-ass AS_DOWN 0 3.2.1 override
ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 sccp timers