summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-13 01:29:32 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-09-13 12:52:14 +0200
commite229071479282f854656799c19a07fbe79a20e57 (patch)
treed33707c48aaf271d7fbbc3f2bc0fb7d9e7300528
parent9051421d75eed22c02f01b373cfab58dbadcd4b5 (diff)
fix vty tests: vty no longer goes to parent node implicitly
Fix four instances of VTY tests working because it used to include implicit 'exit' commands to the parent node. Since libosmocore change-id Id73cba2dd34676bad8a130e9c45e67a272f19588 = commit d64b6aed235f6e4d84a2cb8e84b32c3179260254, we no longer do this implicit-exit in interactive VTY shells. *) the nitb node lacked the default command set (including 'end' and 'exit'), so it was impossible to leave the nitb node. This hit in testSubscriberCreateDelete. Add vty_install_default(NITB_NODE). *) in testPingPongConfiguration, the intention is to enter the /msc 0 node. Drop prior entry of the 'network' node, which looks like an oversight. So far the 'msc 0' caused an implicit 'exit' and thus worked, now fails. *) Two instances following comments "# Check searching for outer node's commands", which look like they are intended to check for this implicit-exit behavior. This is obsolete, drop those parts of the tests. Change-Id: I77931d6a09c42c443c6936000592f22a7fd06cab
-rw-r--r--openbsc/src/libmsc/vty_interface_layer3.c1
-rw-r--r--openbsc/tests/vty_test_runner.py22
2 files changed, 1 insertions, 22 deletions
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index 4a99cf19e..f66769be3 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -1294,6 +1294,7 @@ int bsc_vty_init_extra(void)
install_element(CONFIG_NODE, &cfg_nitb_cmd);
install_node(&nitb_node, config_write_nitb);
+ vty_install_default(NITB_NODE);
install_element(NITB_NODE, &cfg_nitb_subscr_create_cmd);
install_element(NITB_NODE, &cfg_nitb_subscr_random_cmd);
install_element(NITB_NODE, &cfg_nitb_no_subscr_create_cmd);
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 92775d5b7..accabaeb7 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -606,14 +606,6 @@ class TestVTYBSC(TestVTYGenericBSC):
self.assertTrue(self.vty.verify("exit", ['']))
self.assertTrue(self.vty.node() is None)
- # Check searching for outer node's commands
- self.vty.command("configure terminal")
- self.vty.command('msc 0')
- self.vty.command("bsc")
- self.assertEquals(self.vty.node(), 'config-bsc')
- self.vty.command("msc 0")
- self.assertEquals(self.vty.node(), 'config-msc')
-
def testUssdNotificationsMsc(self):
self.vty.enable()
self.vty.command("configure terminal")
@@ -716,7 +708,6 @@ class TestVTYBSC(TestVTYGenericBSC):
def testPingPongConfiguration(self):
self.vty.enable()
self.vty.verify("configure terminal", [''])
- self.vty.verify("network", [''])
self.vty.verify("msc 0", [''])
self.vty.verify("timeout-ping 12", [''])
@@ -857,19 +848,6 @@ class TestVTYNAT(TestVTYGenericBSC):
self.assertTrue(self.vty.verify('exit', ['']))
self.assertTrue(self.vty.node() is None)
- # Check searching for outer node's commands
- self.vty.command('configure terminal')
- self.vty.command('mgcp')
- self.vty.command('nat')
- self.assertEquals(self.vty.node(), 'config-nat')
- self.vty.command('mgcp')
- self.assertEquals(self.vty.node(), 'config-mgcp')
- self.vty.command('nat')
- self.assertEquals(self.vty.node(), 'config-nat')
- self.vty.command('bsc 0')
- self.vty.command('mgcp')
- self.assertEquals(self.vty.node(), 'config-mgcp')
-
def testRewriteNoRewrite(self):
self.vty.enable()
res = self.vty.command("configure terminal")