aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2018-09-28 17:38:56 +0200
committerDaniel Willmann <dwillmann@sysmocom.de>2018-11-29 10:48:57 +0100
commit5748b3f60f85c82fee5272ef902fc3d0ac2f3120 (patch)
tree0d650b8b9c2beb5c26dd40c4c21fb3dc1300bb96
parent9b44c86fe6731c51e78ba3cbd48e45b31474c269 (diff)
osmo-cn-latest: Use osmo-config-merge to configure the MSC
-rwxr-xr-xosmo-cn-latest/create_hlr.py18
-rw-r--r--osmo-cn-latest/osmo-msc.cfg.base (renamed from osmo-cn-latest/osmo-msc.cfg)10
2 files changed, 22 insertions, 6 deletions
diff --git a/osmo-cn-latest/create_hlr.py b/osmo-cn-latest/create_hlr.py
index b754af7..0a625a9 100755
--- a/osmo-cn-latest/create_hlr.py
+++ b/osmo-cn-latest/create_hlr.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+import os, sys
import csv
import sys
import sqlite3
@@ -127,7 +128,22 @@ def main():
infilename = args[0]
csvfields = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'extension', 'smsp', 'ki', 'opc', 'adm1']
- create_hlr_3g("hlr.db")
+ try:
+ create_hlr_3g("hlr.db")
+ except sqlite3.OperationalError:
+ print("hlr.db already exists, please remove!\n");
+ sys.exit(1)
+
+ msc = open("osmo-msc.cfg.patch", "w")
+ msc.write("network\n")
+ msc.write(" network country code %s\n" %(options.mcc))
+ msc.write(" mobile network code %s\n" %(options.mnc))
+ msc.write(" short name OsmoMSC-%s-%s\n" %(options.mcc, options.mnc))
+ msc.write(" long name OsmoMSC-%s-%s\n" %(options.mcc, options.mnc))
+ msc.close()
+
+ os.system("osmo-config-merge osmo-msc.cfg.base osmo-msc.cfg.patch > osmo-msc.cfg")
+
inf = open(infilename, "r")
outf = open("simcards.csv", "w")
diff --git a/osmo-cn-latest/osmo-msc.cfg b/osmo-cn-latest/osmo-msc.cfg.base
index 8924d1e..042d847 100644
--- a/osmo-cn-latest/osmo-msc.cfg
+++ b/osmo-cn-latest/osmo-msc.cfg.base
@@ -2,11 +2,11 @@
! OsmoMSC configuration saved from vty
!
log file /data/osmo-msc.log
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 0
- logging level all everything
+ logging filter all 1
+ logging color 1
+ logging print category 1
+ logging timestamp 0
+ logging level all everything
!
line vty
no login