Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC

2018-09-16 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10979 )

Change subject: bts: Add second VTY connection to BSC
..

bts: Add second VTY connection to BSC

Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
---
M bts/BTS_Tests.cfg
M bts/BTS_Tests.default
M bts/BTS_Tests.ttcn
3 files changed, 20 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg
index 58eed2c..d365a06 100644
--- a/bts/BTS_Tests.cfg
+++ b/bts/BTS_Tests.cfg
@@ -13,6 +13,7 @@
 #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau
 #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home
 *.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx
+*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc

 [MODULE_PARAMETERS]
 #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office
diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default
index f254993..920f5d0 100644
--- a/bts/BTS_Tests.default
+++ b/bts/BTS_Tests.default
@@ -14,6 +14,17 @@
 *.BTSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
 *.BTSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"
 *.BTSVTY.PROMPT1 := "OsmoBTS> "
+
+*.BSCVTY.CTRL_MODE := "client"
+*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1"
+*.BSCVTY.CTRL_PORTNUM := "4242"
+*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes"
+*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
+*.BSCVTY.CTRL_READMODE := "buffered"
+*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
+*.BSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"
+*.BSCVTY.PROMPT1 := "OsmoBSC> "
+
 *.PCU.socket_type := "SEQPACKET"

 [MODULE_PARAMETERS]
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 963a38d..aa402d1 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -75,7 +75,9 @@
port TRXC_CODEC_PT BB_TRXC;
var integer g_bb_trxc_conn_id;

+   /* VTY connections to both BTS and BSC */
port TELNETasp_PT BTSVTY;
+   port TELNETasp_PT BSCVTY;

/* PCU Interface of BTS */
port PCUIF_CODEC_PT PCU;
@@ -248,6 +250,12 @@
f_vty_transceive(BTSVTY, "enable");
 }

+private function f_init_vty_bsc() runs on test_CT {
+   map(self:BSCVTY, system:BSCVTY);
+   f_vty_set_prompts(BSCVTY, "OsmoBSC");
+   f_vty_transceive(BSCVTY, "enable");
+}
+
 /* PCU socket may at any time receive a new INFO.ind */
 private altstep as_pcu_info_ind(PCUIF_CODEC_PT pt, integer pcu_conn_id,
out PCUIF_Message pcu_last_info) {

--
To view, visit https://gerrit.osmocom.org/10979
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
Gerrit-Change-Number: 10979
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)


Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC

2018-09-16 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10979 )

Change subject: bts: Add second VTY connection to BSC
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/10979
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
Gerrit-Change-Number: 10979
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC

2018-09-16 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10979 )

Change subject: bts: Add second VTY connection to BSC
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10979
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
Gerrit-Change-Number: 10979
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Sun, 16 Sep 2018 10:44:10 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ttcn3-hacks[master]: bts: Add second VTY connection to BSC

2018-09-16 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/10979


Change subject: bts: Add second VTY connection to BSC
..

bts: Add second VTY connection to BSC

Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
---
M bts/BTS_Tests.cfg
M bts/BTS_Tests.default
M bts/BTS_Tests.ttcn
3 files changed, 20 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/79/10979/1

diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg
index 58eed2c..d365a06 100644
--- a/bts/BTS_Tests.cfg
+++ b/bts/BTS_Tests.cfg
@@ -13,6 +13,7 @@
 #*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau
 #*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home
 *.BTSVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bts-trx
+*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" # osmo-bsc

 [MODULE_PARAMETERS]
 #BTS_Tests.mp_rsl_ip := "10.9.1.2" # office
diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default
index f254993..920f5d0 100644
--- a/bts/BTS_Tests.default
+++ b/bts/BTS_Tests.default
@@ -14,6 +14,17 @@
 *.BTSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
 *.BTSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"
 *.BTSVTY.PROMPT1 := "OsmoBTS> "
+
+*.BSCVTY.CTRL_MODE := "client"
+*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1"
+*.BSCVTY.CTRL_PORTNUM := "4242"
+*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes"
+*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
+*.BSCVTY.CTRL_READMODE := "buffered"
+*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
+*.BSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes"
+*.BSCVTY.PROMPT1 := "OsmoBSC> "
+
 *.PCU.socket_type := "SEQPACKET"

 [MODULE_PARAMETERS]
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 963a38d..aa402d1 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -75,7 +75,9 @@
port TRXC_CODEC_PT BB_TRXC;
var integer g_bb_trxc_conn_id;

+   /* VTY connections to both BTS and BSC */
port TELNETasp_PT BTSVTY;
+   port TELNETasp_PT BSCVTY;

/* PCU Interface of BTS */
port PCUIF_CODEC_PT PCU;
@@ -248,6 +250,12 @@
f_vty_transceive(BTSVTY, "enable");
 }

+private function f_init_vty_bsc() runs on test_CT {
+   map(self:BSCVTY, system:BSCVTY);
+   f_vty_set_prompts(BSCVTY, "OsmoBSC");
+   f_vty_transceive(BSCVTY, "enable");
+}
+
 /* PCU socket may at any time receive a new INFO.ind */
 private altstep as_pcu_info_ind(PCUIF_CODEC_PT pt, integer pcu_conn_id,
out PCUIF_Message pcu_last_info) {

--
To view, visit https://gerrit.osmocom.org/10979
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4b5a906a0841c0a8c3d7c4e9e5a3d1208ecf16a
Gerrit-Change-Number: 10979
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte