laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 
Display RANAP state during 'show cnlink'

This adds a line to the output showing DISCONNECTED or CONNNECTED
state for each cnlink during the 'show cnlink' VTY command.

Closes: SYS#6741
Change-Id: I6ab7d08fcd0631d31a12418f950c5901a93db43a
---
M src/osmo-hnbgw/cnlink.c
M src/osmo-hnbgw/hnbgw_vty.c
M tests/config/defaults.vty
M tests/config/legacy.vty
M tests/config/one_cs7.vty
M tests/config/one_cs7_with_addrs.vty
M tests/config/one_cs7_with_iucs_addr.vty
M tests/config/one_cs7_with_iups_addr.vty
M tests/config/two_cs7.vty
M tests/config/two_cs7_with_addrs.vty
10 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c
index 0ff8163..78cd72f 100644
--- a/src/osmo-hnbgw/cnlink.c
+++ b/src/osmo-hnbgw/cnlink.c
@@ -304,7 +304,7 @@
 
 static struct osmo_fsm_state cnlink_fsm_states[] = {
 	[CNLINK_ST_DISC] = {
-		     .name = "DISC",
+		     .name = "DISCONNECTED",
 		     .in_event_mask = 0
 			     | S(CNLINK_EV_RX_RESET)
 			     | S(CNLINK_EV_RX_RESET_ACK)
@@ -317,7 +317,7 @@
 		     .action = cnlink_disc_action,
 		     },
 	[CNLINK_ST_CONN] = {
-		     .name = "CONN",
+		     .name = "CONNECTED",
 		     .in_event_mask = 0
 			     | S(CNLINK_EV_RX_RESET)
 			     | S(CNLINK_EV_RX_RESET_ACK)
diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c
index 8cbe249..62fe4aa 100644
--- a/src/osmo-hnbgw/hnbgw_vty.c
+++ b/src/osmo-hnbgw/hnbgw_vty.c
@@ -149,6 +149,7 @@
 
 	rt = osmo_ss7_route_lookup(ss7, cnlink->remote_addr.pc);
 	vty_out(vty, "      SS7 route: %s%s", osmo_ss7_route_name(rt, true), VTY_NEWLINE);
+	vty_out(vty, "      RANAP state: %s%s", osmo_fsm_inst_state_name(cnlink->fi), VTY_NEWLINE);
 }
 
 DEFUN(show_cnlink, show_cnlink_cmd, "show cnlink",
diff --git a/tests/config/defaults.vty b/tests/config/defaults.vty
index 82d2654..364fb0f 100644
--- a/tests/config/defaults.vty
+++ b/tests/config/defaults.vty
@@ -17,8 +17,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=0.23.5,SSN=RANAP <-> RI=SSN_PC,PC=0.23.1,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=0.23.5,SSN=RANAP <-> RI=SSN_PC,PC=0.23.4,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/legacy.vty b/tests/config/legacy.vty
index 2a8b88d..4106cb1 100644
--- a/tests/config/legacy.vty
+++ b/tests/config/legacy.vty
@@ -23,8 +23,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-msc=RI=SSN_PC,PC=1.2.3,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-sgsn=RI=SSN_PC,PC=1.4.2,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/one_cs7.vty b/tests/config/one_cs7.vty
index ea19415..5e765d4 100644
--- a/tests/config/one_cs7.vty
+++ b/tests/config/one_cs7.vty
@@ -15,8 +15,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.1,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.4,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/one_cs7_with_addrs.vty b/tests/config/one_cs7_with_addrs.vty
index 2a8b88d..4106cb1 100644
--- a/tests/config/one_cs7_with_addrs.vty
+++ b/tests/config/one_cs7_with_addrs.vty
@@ -23,8 +23,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-msc=RI=SSN_PC,PC=1.2.3,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-sgsn=RI=SSN_PC,PC=1.4.2,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/one_cs7_with_iucs_addr.vty b/tests/config/one_cs7_with_iucs_addr.vty
index bc7b396..af33110 100644
--- a/tests/config/one_cs7_with_iucs_addr.vty
+++ b/tests/config/one_cs7_with_iucs_addr.vty
@@ -19,8 +19,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-msc=RI=SSN_PC,PC=1.2.3,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.4,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/one_cs7_with_iups_addr.vty b/tests/config/one_cs7_with_iups_addr.vty
index b8e1f19..8aad3d8 100644
--- a/tests/config/one_cs7_with_iups_addr.vty
+++ b/tests/config/one_cs7_with_iups_addr.vty
@@ -19,8 +19,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.1,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-sgsn=RI=SSN_PC,PC=1.4.2,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/two_cs7.vty b/tests/config/two_cs7.vty
index f8a5f0d..2a600d6 100644
--- a/tests/config/two_cs7.vty
+++ b/tests/config/two_cs7.vty
@@ -19,8 +19,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.1,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> RI=SSN_PC,PC=0.23.4,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...
diff --git a/tests/config/two_cs7_with_addrs.vty b/tests/config/two_cs7_with_addrs.vty
index 08871aa..a3ca262 100644
--- a/tests/config/two_cs7_with_addrs.vty
+++ b/tests/config/two_cs7_with_addrs.vty
@@ -33,8 +33,10 @@
 OsmoHNBGW# show cnlink
 IuCS: OsmoHNBGW:RI=SSN_PC,PC=1.1.1,SSN=RANAP <-> my-msc=RI=SSN_PC,PC=1.2.3,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-msc-0 proto=m3ua ASP asp-clnt-msc-0
+      RANAP state: DISCONNECTED
 IuPS: OsmoHNBGW:RI=SSN_PC,PC=2.2.2,SSN=RANAP <-> my-sgsn=RI=SSN_PC,PC=2.4.2,SSN=RANAP
       SS7 route: pc=0=0.0.0 mask=0x0=0.0.0 via AS as-clnt-sgsn-0 proto=m3ua ASP asp-clnt-sgsn-0
+      RANAP state: DISCONNECTED
 
 OsmoHNBGW# show running-config
 ...

To view, visit change 35568. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I6ab7d08fcd0631d31a12418f950c5901a93db43a
Gerrit-Change-Number: 35568
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged