[MERGED] osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: add CTRL tests for enable-/disable-/status-ps
..


add CTRL tests for enable-/disable-/status-ps

Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
---
M tests/ctrl_test_runner.py
A tests/test_subscriber.sql
2 files changed, 55 insertions(+), 0 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index d453197..7c14f50 100644
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -163,6 +163,46 @@
 return responses
 
 
+class TestCtrlHLR(TestCtrlBase):
+
+HLR_DB = 'hlr_ctrl_test.db'
+HLR_SQL = '%s/sql/hlr.sql' % confpath
+HLR_TEST_SQL = '%s/tests/test_subscriber.sql' % confpath
+
+def setUp(self):
+print('\n')
+print(os.getcwd())
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_SQL), shell=True) == 0
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_TEST_SQL), shell=True) == 0
+super(TestCtrlHLR, self).setUp()
+
+def tearDown(self):
+super(TestCtrlHLR, self).tearDown()
+os.unlink("hlr_ctrl_test.db")
+
+def ctrl_command(self):
+return ["./src/osmo-hlr", "-c", "doc/examples/osmo-hlr.cfg", '-l', 
'hlr_ctrl_test.db']
+
+def ctrl_app(self):
+return (4259, "./src/osmo-hlr", "OsmoHLR", "hlr")
+
+def testCtrlErrs(self):
+r = self.do_get('invalid')
+self.assertEquals(r['mtype'], 'ERROR')
+self.assertEquals(r['error'], 'Command not found')
+
+def testEnableDisablePs(self):
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+
 if __name__ == '__main__':
 import argparse
 import sys
@@ -193,6 +233,8 @@
 os.chdir(workdir)
 print "Running tests for specific control commands"
 suite = unittest.TestSuite()
+test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlHLR)
+suite.addTest(test)
 res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
 sys.exit(len(res.errors) + len(res.failures))
 
diff --git a/tests/test_subscriber.sql b/tests/test_subscriber.sql
new file mode 100644
index 000..0767d48
--- /dev/null
+++ b/tests/test_subscriber.sql
@@ -0,0 +1,13 @@
+
+-- 2G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (1, '9019901');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (1, 1, 
'000102030405060708090a0b0c0d0e0f');
+
+-- 3G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (2, '9019902');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (2, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);
+
+-- 2G + 3G subscriber
+INSERT INTO subscriber (id, imsi) VALUES (3, '9019903');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (3, 1, 
'000102030405060708090a0b0c0d0e0f');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (3, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);

-- 
To view, visit https://gerrit.osmocom.org/4064
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Patch Set 3: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/4064
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/4064

to look at the new patch set (#3).

add CTRL tests for enable-/disable-/status-ps

Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
---
M tests/ctrl_test_runner.py
A tests/test_subscriber.sql
2 files changed, 55 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/4064/3

diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index d453197..7c14f50 100644
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -163,6 +163,46 @@
 return responses
 
 
+class TestCtrlHLR(TestCtrlBase):
+
+HLR_DB = 'hlr_ctrl_test.db'
+HLR_SQL = '%s/sql/hlr.sql' % confpath
+HLR_TEST_SQL = '%s/tests/test_subscriber.sql' % confpath
+
+def setUp(self):
+print('\n')
+print(os.getcwd())
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_SQL), shell=True) == 0
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_TEST_SQL), shell=True) == 0
+super(TestCtrlHLR, self).setUp()
+
+def tearDown(self):
+super(TestCtrlHLR, self).tearDown()
+os.unlink("hlr_ctrl_test.db")
+
+def ctrl_command(self):
+return ["./src/osmo-hlr", "-c", "doc/examples/osmo-hlr.cfg", '-l', 
'hlr_ctrl_test.db']
+
+def ctrl_app(self):
+return (4259, "./src/osmo-hlr", "OsmoHLR", "hlr")
+
+def testCtrlErrs(self):
+r = self.do_get('invalid')
+self.assertEquals(r['mtype'], 'ERROR')
+self.assertEquals(r['error'], 'Command not found')
+
+def testEnableDisablePs(self):
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+
 if __name__ == '__main__':
 import argparse
 import sys
@@ -193,6 +233,8 @@
 os.chdir(workdir)
 print "Running tests for specific control commands"
 suite = unittest.TestSuite()
+test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlHLR)
+suite.addTest(test)
 res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
 sys.exit(len(res.errors) + len(res.failures))
 
diff --git a/tests/test_subscriber.sql b/tests/test_subscriber.sql
new file mode 100644
index 000..0767d48
--- /dev/null
+++ b/tests/test_subscriber.sql
@@ -0,0 +1,13 @@
+
+-- 2G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (1, '9019901');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (1, 1, 
'000102030405060708090a0b0c0d0e0f');
+
+-- 3G only subscriber
+INSERT INTO subscriber (id, imsi) VALUES (2, '9019902');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (2, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);
+
+-- 2G + 3G subscriber
+INSERT INTO subscriber (id, imsi) VALUES (3, '9019903');
+INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES (3, 1, 
'000102030405060708090a0b0c0d0e0f');
+INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, opc, sqn) VALUES (3, 5, 
'000102030405060708090a0b0c0d0e0f', '101112131415161718191a1b1c1d1e1f', 0);

-- 
To view, visit https://gerrit.osmocom.org/4064
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 

osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/4064
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 1
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] osmo-hlr[master]: add CTRL tests for enable-/disable-/status-ps

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/4064

add CTRL tests for enable-/disable-/status-ps

Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
---
M tests/ctrl_test_runner.py
1 file changed, 42 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/4064/1

diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index d453197..7c14f50 100644
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -163,6 +163,46 @@
 return responses
 
 
+class TestCtrlHLR(TestCtrlBase):
+
+HLR_DB = 'hlr_ctrl_test.db'
+HLR_SQL = '%s/sql/hlr.sql' % confpath
+HLR_TEST_SQL = '%s/tests/test_subscriber.sql' % confpath
+
+def setUp(self):
+print('\n')
+print(os.getcwd())
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_SQL), shell=True) == 0
+assert subprocess.call('sqlite3 %s < %s' % (self.HLR_DB, 
self.HLR_TEST_SQL), shell=True) == 0
+super(TestCtrlHLR, self).setUp()
+
+def tearDown(self):
+super(TestCtrlHLR, self).tearDown()
+os.unlink("hlr_ctrl_test.db")
+
+def ctrl_command(self):
+return ["./src/osmo-hlr", "-c", "doc/examples/osmo-hlr.cfg", '-l', 
'hlr_ctrl_test.db']
+
+def ctrl_app(self):
+return (4259, "./src/osmo-hlr", "OsmoHLR", "hlr")
+
+def testCtrlErrs(self):
+r = self.do_get('invalid')
+self.assertEquals(r['mtype'], 'ERROR')
+self.assertEquals(r['error'], 'Command not found')
+
+def testEnableDisablePs(self):
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('disable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '0')
+self.assert_set('enable-ps', '9019901', 'OK')
+self.assert_set('status-ps', '9019901', '1')
+
 if __name__ == '__main__':
 import argparse
 import sys
@@ -193,6 +233,8 @@
 os.chdir(workdir)
 print "Running tests for specific control commands"
 suite = unittest.TestSuite()
+test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlHLR)
+suite.addTest(test)
 res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
 sys.exit(len(res.errors) + len(res.failures))
 

-- 
To view, visit https://gerrit.osmocom.org/4064
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I014437db9c0f15d818e04810f6cb14bf475ee002
Gerrit-PatchSet: 1
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr