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

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

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))

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:

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}