aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-01-22 14:44:28 +0100
committerHarald Welte <laforge@gnumonks.org>2019-01-24 15:29:08 +0000
commitef64b231dc4a385c471754440d89d35f091fea27 (patch)
tree5b06744610115f93527ca44ae26ac5b93978dbdc
parent851814aa7c6a89faa536d5ec60d16dd37826e2d0 (diff)
VTY tests: fill DB before running test
Create a test_subscriber.vty.sql file with a dummy entry that has the ID 100. All entries created in test_subscriber.vty have an ID > 100 now. This will be used in follow-up commit [1] to create a database entry with an invalid IMEI value to test the related error handling code path (that entry could not be created through the VTY). [1]: change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Related: OS#3733 Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/test_subscriber.vty120
-rw-r--r--tests/test_subscriber.vty.sql3
3 files changed, 65 insertions, 60 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e07749c..4da8ab1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,6 +56,8 @@ VTY_TEST_DB = hlr_vty_test.db
# make vty-test U=-u
vty-test:
-rm -f $(VTY_TEST_DB)
+ sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql
+ sqlite3 $(VTY_TEST_DB) < $(srcdir)/test_subscriber.vty.sql
osmo_verify_transcript_vty.py -v \
-n OsmoHLR -p 4258 \
-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \
diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty
index 8677c9b..d310eb3 100644
--- a/tests/test_subscriber.vty
+++ b/tests/test_subscriber.vty
@@ -29,15 +29,15 @@ OsmoHLR# subscriber id ?
OsmoHLR# subscriber imsi 123456789023000 show
% No subscriber for imsi = '123456789023000'
-OsmoHLR# subscriber id 1 show
-% No subscriber for id = '1'
+OsmoHLR# subscriber id 101 show
+% No subscriber for id = '101'
OsmoHLR# subscriber msisdn 12345 show
% No subscriber for msisdn = '12345'
OsmoHLR# show subscriber imsi 123456789023000
% No subscriber for imsi = '123456789023000'
-OsmoHLR# show subscriber id 1
-% No subscriber for id = '1'
+OsmoHLR# show subscriber id 101
+% No subscriber for id = '101'
OsmoHLR# show subscriber msisdn 12345
% No subscriber for msisdn = '12345'
@@ -50,16 +50,16 @@ OsmoHLR# subscriber imsi 12345 create
OsmoHLR# subscriber imsi 123456789023000 create
% Created subscriber 123456789023000
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: none
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: none
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: none
OsmoHLR# subscriber msisdn 12345 show
@@ -69,15 +69,15 @@ OsmoHLR# subscriber imsi 123456789023000 update msisdn 12345
% Updated subscriber IMSI='123456789023000' to MSISDN='12345'
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 12345
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 12345
OsmoHLR# subscriber msisdn 12345 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 12345
@@ -91,26 +91,26 @@ OsmoHLR# subscriber msisdn 423 update msisdn none
OsmoHLR# subscriber msisdn 423 show
% No subscriber for msisdn = '423'
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: none
OsmoHLR# subscriber imsi 123456789023000 update msisdn 423
% Updated subscriber IMSI='123456789023000' to MSISDN='423'
OsmoHLR# subscriber msisdn 423 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
OsmoHLR# subscriber msisdn 423 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
@@ -141,7 +141,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki val ?
OsmoHLR# subscriber imsi 123456789023000 update aud2g xor ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: XOR
@@ -149,39 +149,39 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v1
KI=beefedcafefaceacedaddeddecadefee
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v1
KI=beefedcafefaceacedaddeddecadefee
OsmoHLR# subscriber msisdn 423 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v1
KI=beefedcafefaceacedaddeddecadefee
-OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v2
KI=cededeffacedacefacedbadfadedbeef
OsmoHLR# subscriber msisdn 423 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v2
KI=cededeffacedacefacedbadfadedbeef
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v2
@@ -189,63 +189,63 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki C01ffedC1cadaeAc1d1f1edAcac1aB0a
OsmoHLR# subscriber msisdn 423 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee
+OsmoHLR# subscriber id 101 update aud2g nonsense ki BeefedCafeFaceAcedAddedDecadeFee
% Unknown command.
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee
+OsmoHLR# subscriber id 101 update aud2g milenage ki BeefedCafeFaceAcedAddedDecadeFee
% Unknown command.
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa
+OsmoHLR# subscriber id 101 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa
% Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa'
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX
+OsmoHLR# subscriber id 101 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX
% Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX'
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v3
KI=c01ffedc1cadaeac1d1f1edacac1ab0a
-OsmoHLR# subscriber id 1 update aud2g none
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 update aud2g none
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
@@ -275,7 +275,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0D
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -286,7 +286,7 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op DeafBeddedBabeAcceededFadedDecaf
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -296,13 +296,13 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber imsi 123456789023000 update aud3g none
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ind-bitlen 23
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -313,7 +313,7 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k CoiffedCicadaeAcidifiedAcaciaBoa opc CededEffacedAceFacedBadFadedBeef
% Invalid value for K: 'CoiffedCicadaeAcidifiedAcaciaBoa'
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -324,7 +324,7 @@ OsmoHLR# subscriber imsi 123456789023000 show
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CoiffedCicadaeAcidifiedAcaciaBoa
% Invalid value for OPC: 'CoiffedCicadaeAcidifiedAcaciaBoa'
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -336,7 +336,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0D
OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d op CoiffedCicadaeAcidifiedAcaciaBoa
% Invalid value for OP: 'CoiffedCicadaeAcidifiedAcaciaBoa'
OsmoHLR# subscriber imsi 123456789023000 show
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
3G auth: MILENAGE
@@ -344,9 +344,9 @@ OsmoHLR# subscriber imsi 123456789023000 show
OP=c01ffedc1cadaeac1d1f1edacac1ab0a
IND-bitlen=5
-OsmoHLR# subscriber id 1 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef
-OsmoHLR# subscriber id 1 show
- ID: 1
+OsmoHLR# subscriber id 101 update aud2g comp128v2 ki CededEffacedAceFacedBadFadedBeef
+OsmoHLR# subscriber id 101 show
+ ID: 101
IMSI: 123456789023000
MSISDN: 423
2G auth: COMP128v2
@@ -361,14 +361,14 @@ OsmoHLR# subscriber imsi 123456789023000 delete
OsmoHLR# subscriber imsi 123456789023000 show
% No subscriber for imsi = '123456789023000'
-OsmoHLR# subscriber id 1 show
-% No subscriber for id = '1'
+OsmoHLR# subscriber id 101 show
+% No subscriber for id = '101'
OsmoHLR# subscriber msisdn 423 show
% No subscriber for msisdn = '423'
OsmoHLR# subscriber imsi 123456789023000 create
% Created subscriber 123456789023000
- ID: 1
+ ID: 101
IMSI: 123456789023000
MSISDN: none
diff --git a/tests/test_subscriber.vty.sql b/tests/test_subscriber.vty.sql
new file mode 100644
index 0000000..ff167aa
--- /dev/null
+++ b/tests/test_subscriber.vty.sql
@@ -0,0 +1,3 @@
+-- Dummy entry with ID=100 gives all subscribers created in the VTY test an
+-- ID > 100, so we can pre-fill the database with IDs < 100.
+INSERT INTO subscriber (id, imsi) VALUES(100, '000000000000100');