diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-05-22 20:04:05 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-05-29 00:18:43 +0200 |
| commit | 4f59ba6e68f94c230e8e80bcdc29c03f22607a09 (patch) | |
| tree | 465e3ff9c535ee2c7454c2e478278de84fcb6af4 | |
| parent | c4ba4a6866a13e925bfc023f1fe3c5f5d5603601 (diff) | |
config: nitb template: move ip_address to nitb.ip_address
It's the NITB's address, so it should go in the nitb.* scope.
Change-Id: I71a5ef153b7156b0644253f5aa8a0c848f42ab3b
| -rw-r--r-- | selftest/template_test.ok | 8 | ||||
| -rwxr-xr-x | selftest/template_test.py | 4 | ||||
| -rw-r--r-- | src/osmo_gsm_tester/osmo_nitb.py | 2 | ||||
| -rw-r--r-- | src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/selftest/template_test.ok b/selftest/template_test.ok index 0f896ee..d031c96 100644 --- a/selftest/template_test.ok +++ b/selftest/template_test.ok @@ -12,11 +12,11 @@ log stderr ! line vty no login - bind val_ip_address_addr + bind val_ip_address ! e1_input e1_line 0 driver ipa - ipa bind val_ip_address_addr + ipa bind val_ip_address network network country code val_mcc mobile network code val_mnc @@ -135,14 +135,14 @@ network timeslot 3 phys_chan_config val_phys_chan_config_3 smpp - local-tcp-ip val_ip_address_addr 2775 + local-tcp-ip val_ip_address 2775 system-id test policy closed esme test password test default-route ctrl - bind val_ip_address_addr + bind val_ip_address - Testing: expect to fail on invalid templates dir sucess: setting non-existing templates dir raised RuntimeError diff --git a/selftest/template_test.py b/selftest/template_test.py index b7d987c..45347b6 100755 --- a/selftest/template_test.py +++ b/selftest/template_test.py @@ -57,8 +57,8 @@ vals = dict(nitb=dict( encryption='val_encryption', bts_list=(mock_bts0, mock_bts1) ), - ), - ip_address=dict(addr='val_ip_address_addr'), + ip_address=dict(addr='val_ip_address'), + ), ) print(template.render('osmo-nitb.cfg', vals)) diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py index 926c111..1bb1fcf 100644 --- a/src/osmo_gsm_tester/osmo_nitb.py +++ b/src/osmo_gsm_tester/osmo_nitb.py @@ -70,7 +70,7 @@ class OsmoNitb(log.Origin): values = dict(nitb=config.get_defaults('nitb')) config.overlay(values, self.suite_run.config()) - config.overlay(values, dict(ip_address=self.ip_address)) + config.overlay(values, dict(nitb=dict(ip_address=self.ip_address))) bts_list = [] for bts in self.bts: diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl index 9339545..a47ac02 100644 --- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl @@ -10,11 +10,11 @@ log stderr ! line vty no login - bind ${ip_address.addr} + bind ${nitb.ip_address.addr} ! e1_input e1_line 0 driver ipa - ipa bind ${ip_address.addr} + ipa bind ${nitb.ip_address.addr} network network country code ${nitb.net.mcc} mobile network code ${nitb.net.mnc} @@ -75,11 +75,11 @@ network % endfor %endfor smpp - local-tcp-ip ${ip_address.addr} 2775 + local-tcp-ip ${nitb.ip_address.addr} 2775 system-id test policy closed esme test password test default-route ctrl - bind ${ip_address.addr} + bind ${nitb.ip_address.addr} |