pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sigtran/+/41635?usp=email )
Change subject: tests/vty: Run ss7_asp_test.vty
......................................................................
tests/vty: Run ss7_asp_test.vty
Old commit enabled running vty tests for libosmo-sigtran in SG mode, but
prevented running the existing ones in ASP mode. Re-enable them (and
update the vty output to up to date expectations).
Fixes: d3e69b874971441071663a2457773dac77b579ae
Change-Id: Ibcb0c589e6bdf692fa82361deedeb82169c09270
---
M tests/vty/Makefile.am
M tests/vty/ss7_asp_test.vty
2 files changed, 82 insertions(+), 28 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/tests/vty/Makefile.am b/tests/vty/Makefile.am
index 79a56ec..1c50c04 100644
--- a/tests/vty/Makefile.am
+++ b/tests/vty/Makefile.am
@@ -62,7 +62,7 @@
# make vty-test U=-u
vty-transcript-test:
$(MAKE) vty-transcript-test-stp
-# $(MAKE) vty-transcript-test-asp
+ $(MAKE) vty-transcript-test-asp
# don't run multiple tests concurrently so that the ports don't conflict
vty-test:
diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty
index 581bc38..50c2c46 100644
--- a/tests/vty/ss7_asp_test.vty
+++ b/tests/vty/ss7_asp_test.vty
@@ -11,7 +11,11 @@
show cs7 instance <0-15> asp-assoc-status
show cs7 instance <0-15> asp-assoc-status name ASP_NAME
show cs7 instance <0-15> as (active|all|m3ua|sua)
- show cs7 instance <0-15> route
+ show cs7 instance <0-15> as name AS_NAME
+ show cs7 instance <0-15> as binding-table name AS_NAME
+ show cs7 instance <0-15> route [POINT_CODE]
+ show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches]
+ show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15>
[list-asps]
show cs7 instance <0-15> sccp addressbook
show cs7 instance <0-15> sccp users
show cs7 instance <0-15> sccp ssn <0-65535>
@@ -27,6 +31,7 @@
show cs7 (sua|m3ua|ipa) (sctp|tcp) [<0-65534>]
show cs7 config
cs7 instance <0-15> asp NAME disconnect
+ cs7 instance <0-15> asp NAME audit point-code POINT_CODE
show cs7 instance <0-15> asp
show cs7 instance <0-15> asp name ASP_NAME
show cs7 instance <0-15> asp-remaddr
@@ -34,7 +39,11 @@
show cs7 instance <0-15> asp-assoc-status
show cs7 instance <0-15> asp-assoc-status name ASP_NAME
show cs7 instance <0-15> as (active|all|m3ua|sua)
- show cs7 instance <0-15> route
+ show cs7 instance <0-15> as name AS_NAME
+ show cs7 instance <0-15> as binding-table name AS_NAME
+ show cs7 instance <0-15> route [POINT_CODE]
+ show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches]
+ show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15>
[list-asps]
show cs7 instance <0-15> sccp addressbook
show cs7 instance <0-15> sccp users
show cs7 instance <0-15> sccp ssn <0-65535>
@@ -78,13 +87,16 @@
asp-assoc-status Application Server Process (ASP) SCTP association status
as Application Server (AS)
route Routing Table
+ route-lookup Look up route
sccp Signalling Connection Control Part
ss7_asp_vty_test# show cs7 instance 0 as ?
- active Display all active ASs
- all Display all ASs (default)
- m3ua Display all m3ua ASs
- sua Display all SUA ASs
+ active Display all active ASs
+ all Display all ASs (default)
+ m3ua Display all m3ua ASs
+ sua Display all SUA ASs
+ name Look up AS with a given name
+ binding-table Display binding table
ss7_asp_vty_test# show cs7 instance 0 sccp ?
addressbook List all SCCP addressbook entries
@@ -109,6 +121,8 @@
point-code format default
point-code delimiter (default|dash)
xua rkm routing-key-allocation (static-only|dynamic-permitted)
+ sls-opc-dpc [opc-shift] [<0-8>] [dpc-shift] [<0-8>]
+ sls-shift <0-6>
asp NAME <0-65535> <0-65535> (sua|m3ua|ipa)
asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) (sctp|tcp)
no asp NAME
@@ -126,6 +140,8 @@
point-code Configure the local Point Code
secondary-pc Configure the local Secondary Point Code
xua SIGTRAN xxxUA related
+ sls-opc-dpc Shift OPC and DPC bits used during routing decision
+ sls-shift Shift SLS bits used during routing decision
asp Configure Application Server Process
no Negate a command or set its defaults
as Configure an Application Server
@@ -257,33 +273,55 @@
no remote-ip (A.B.C.D|X:X::X:X)
local-ip (A.B.C.D|X:X::X:X) [primary]
no local-ip (A.B.C.D|X:X::X:X)
- qos-class <0-255>
+ qos-class <0-7>
role (sg|asp|ipsp)
transport-role (client|server)
sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535>
no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout)
+ tcp-param keepalive enabled
+ tcp-param keepalive (time|intvl|probes) <0-65535>
+ no tcp-param keepalive
+ no tcp-param keepalive (time|intvl|probes)
+ tcp-param user-timeout <0-65535>
+ no tcp-param user-timeout
+ destination-audit asp-active
+ no destination-audit asp-active
+ quirk (no_notify|daud_in_asp|snm_inactive)
+ no quirk (no_notify|daud_in_asp|snm_inactive)
+ timer xua (ack|beat) <1-999999>
+ timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp)
<1-999999>
block
shutdown
+ no shutdown
...
ss7_asp_vty_test(config-cs7-asp)# ?
...
- description Save human-readable description of the object
- remote-ip Specify Remote IP Address of ASP
- no Negate a command or set its defaults
- local-ip Specify Local IP Address from which to contact ASP
- qos-class Specify QoS Class of ASP
- role Specify the xUA role for this ASP
- transport-role Specify the transport layer role for this ASP
- sctp-param Configure SCTP parameters
- block Allows a SCTP Association with ASP, but doesn't let it
become active
- shutdown Terminates SCTP association; New associations will be
rejected
+ description Save human-readable description of the object
+ remote-ip Specify Remote IP Address of ASP
+ no Negate a command or set its defaults
+ local-ip Specify Local IP Address from which to contact ASP
+ qos-class Specify QoS Class of ASP
+ role Specify the xUA role for this ASP
+ transport-role Specify the transport layer role for this ASP
+ sctp-param Configure SCTP parameters
+ tcp-param Configure TCP parameters
+ destination-audit Configure ASP Auditing (xUA DAUD)
+ quirk Enable quirk to work around interop issues
+ timer Configure ASP default timer values
+ block Allows a SCTP Association with ASP, but doesn't let it
become active
+ shutdown Terminates SCTP association; New associations will be
rejected
...
ss7_asp_vty_test(config-cs7-asp)# no ?
...
- sctp-param Configure SCTP parameters
- quirk Disable quirk to work around interop issues
+ remote-ip Specify Remote IP Address of ASP
+ local-ip Specify Local IP Address from which to contact ASP
+ sctp-param Configure SCTP parameters
+ tcp-param Configure TCP parameters
+ destination-audit Configure ASP Auditing (xUA DAUD)
+ quirk Disable quirk to work around interop issues
+ shutdown Terminates SCTP association; New associations will be
rejected
...
ss7_asp_vty_test(config-cs7-asp)# remote-ip 127.0.0.200
@@ -331,6 +369,7 @@
...
end
ss7_asp_vty_test(config-cs7-asp)# exit
+% NOTE: Make sure to use '[no] shutdown' command in 'asp' node in order to
restart the ASP for new configs to be applied.
ss7_asp_vty_test(config-cs7)# as my-ass m3ua
ss7_asp_vty_test(config-cs7-as)# list
@@ -338,15 +377,19 @@
description .TEXT
asp NAME
no asp NAME
- traffic-mode (broadcast | loadshare | roundrobin | override)
+ traffic-mode (broadcast | roundrobin | override)
+ traffic-mode loadshare [bindings] [sls] [opc-sls] [opc-shift] [<0-2>]
no traffic-mode
+ sls-shift <0-3>
+ binding-table reset
recovery-timeout <1-2000>
- qos-class <0-255>
+ qos-class <0-7>
routing-key RCONTEXT DPC
routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup)
routing-key RCONTEXT DPC ssn SSN
routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup)
ssn SSN
- point-code override dpc PC
+ point-code override (opc|dpc) PC
+ no point-code override (opc|dpc)
point-code override patch-sccp (disabled|both)
ss7_asp_vty_test(config-cs7-as)# ?
@@ -355,7 +398,9 @@
asp Specify that a given ASP is part of this AS
no Negate a command or set its defaults
traffic-mode Specifies traffic mode of operation of the ASP within the
AS
- recovery-timeout Specifies the recovery timeout value in milliseconds
+ sls-shift Shift SLS bits used during routing decision
+ binding-table AS Loadshare binding table operations
+ recovery-timeout Specifies RFC4666 recovery timer T(r) timeout
qos-class Specity QoS Class of AS
routing-key Define a routing key
point-code Point Code Specific Features
@@ -363,6 +408,7 @@
ss7_asp_vty_test(config-cs7-as)# no ?
asp Specify ASP to be removed from this AS
traffic-mode Remove explicit traffic mode of operation of this AS
+ point-code Point Code Specific Features
ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 as all
Routing Routing Key Cic
Cic Traffic
@@ -392,13 +438,13 @@
ss7_asp_vty_test(config-cs7-as)# do show cs7 instance 0 asp
ASP Name AS Name State Type Role SCTP Role Local
Addresses Remote Addresses
------------ ------------ ------------- ---- ---- ---------
----------------------- -----------------------
-my-asp my-ass ASP_DOWN m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
+my-asp my-ass uninitialized m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
ss7_asp_vty_test(config-cs7-as)# exit
ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp
ASP Name AS Name State Type Role SCTP Role Local
Addresses Remote Addresses
------------ ------------ ------------- ---- ---- ---------
----------------------- -----------------------
-my-asp my-ass ASP_DOWN m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
+my-asp my-ass uninitialized m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
ss7_asp_vty_test(config-cs7)# exit
@@ -406,7 +452,7 @@
ss7_asp_vty_test(config)# do show cs7 instance 0 asp
ASP Name AS Name State Type Role SCTP Role Local
Addresses Remote Addresses
------------ ------------ ------------- ---- ---- ---------
----------------------- -----------------------
-my-asp my-ass ASP_DOWN m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
+my-asp my-ass uninitialized m3ua sg server
(127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345
ss7_asp_vty_test(config)# do show cs7 instance 0 as all
Routing Routing Key Cic
Cic Traffic
@@ -419,6 +465,7 @@
ss7_asp_vty_test(config)# show running-config
...
cs7 instance 0
+ network-indicator international
asp my-asp 12345 54321 m3ua
local-ip 127.0.0.100
local-ip 127.0.0.101
@@ -426,6 +473,7 @@
remote-ip 127.0.0.201
role sg
sctp-role server
+ no shutdown
as my-ass m3ua
asp my-asp
routing-key 0 3.2.1
@@ -433,6 +481,7 @@
routing-indicator PC
point-code 1.2.3
cs7 instance 1
+ network-indicator international
sccp-address bar
routing-indicator PC
point-code 1.2.3
@@ -447,6 +496,11 @@
No ASP named 'unknown-asp' found
ss7_asp_vty_test(config-cs7)# no asp my-asp
+% ASP 'my-asp' currently configured in AS 'my-ass'. You must first remove the
ASP from the AS configuration
+ss7_asp_vty_test(config-cs7)# as my-ass m3ua
+ss7_asp_vty_test(config-cs7-as)# no asp my-asp
+ss7_asp_vty_test(config-cs7-as)# exit
+ss7_asp_vty_test(config-cs7)# no asp my-asp
ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp
ASP Name AS Name State Type Role SCTP Role Local
Addresses Remote Addresses
@@ -548,6 +602,6 @@
ss7_asp_vty_test(config-cs7)# show running-config
... !sccp max-optional-data
-ss7_asp_vty_test(config-cs7)# sccp max-optional-data 130
+ss7_asp_vty_test(config-cs7)# sccp max-optional-data 128
ss7_asp_vty_test(config-cs7)# show running-config
... !sccp max-optional-data
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41635?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ibcb0c589e6bdf692fa82361deedeb82169c09270
Gerrit-Change-Number: 41635
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
