rename resource nitb_iface to ip_address
I would like to use the IP addresses also for OsmoBSC processes, so it is more
than clear now that 'nitb_iface' was the wrong naming choice.
The only distinction we may need in the future is public versus loopback
interface. To add that, we may add a trait to the 'ip_address' resource
like:
ip_address:
- addr: 10.42.42.1
type: public
- addr: 127.0.0.1
type: loopback
This way we can substitute public vs loopback addresses flexibly (e.g. using
scenarios).
Change-Id: I3ad583ae7a33f7a7bb56fe78a125f73c56a0e860
diff --git a/selftest/suite_test/resources.conf b/selftest/suite_test/resources.conf
index 178e13c..2005590 100644
--- a/selftest/suite_test/resources.conf
+++ b/selftest/suite_test/resources.conf
@@ -1,6 +1,6 @@
# all hardware and interfaces available to this osmo-gsm-tester
-nitb_iface:
+ip_address:
- addr: 10.42.42.1
- addr: 10.42.42.2
- addr: 10.42.42.3
diff --git a/selftest/suite_test/test_suite/mo_mt_sms.py b/selftest/suite_test/test_suite/mo_mt_sms.py
index cf44357..8b5e1ec 100644
--- a/selftest/suite_test/test_suite/mo_mt_sms.py
+++ b/selftest/suite_test/test_suite/mo_mt_sms.py
@@ -1,10 +1,10 @@
-nitb_iface = resources.nitb_iface()
+ip_address = resources.ip_address()
nitb = resources.nitb()
bts = resources.bts()
ms_mo = resources.modem()
ms_mt = resources.modem()
-nitb.start(nitb_iface)
+nitb.start(ip_address)
bts.start(nitb)
nitb.add_subscriber(ms_mo, resources.msisdn())
diff --git a/selftest/suite_test/test_suite/mo_sms.py b/selftest/suite_test/test_suite/mo_sms.py
index d9517dd..768a99c 100644
--- a/selftest/suite_test/test_suite/mo_sms.py
+++ b/selftest/suite_test/test_suite/mo_sms.py
@@ -1,11 +1,11 @@
-nitb_iface = resources.nitb_iface()
+ip_address = resources.ip_address()
nitb = resources.nitb()
bts = resources.bts()
ms_ext = resources.msisdn()
fake_ext = resources.msisdn()
ms = resources.modem()
-nitb.configure(nitb_iface, bts)
+nitb.configure(ip_address, bts)
bts.configure(nitb)
nitb.start()
diff --git a/selftest/suite_test/test_suite/suite.conf b/selftest/suite_test/test_suite/suite.conf
index 4a03379..376f6cd 100644
--- a/selftest/suite_test/test_suite/suite.conf
+++ b/selftest/suite_test/test_suite/suite.conf
@@ -1,5 +1,5 @@
resources:
- nitb_iface:
+ ip_address:
- times: 1
bts:
- times: 1