Change in osmo-hlr[master]: Correct configuration written from vty

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 )

Change subject: Correct configuration written from vty
......................................................................

Correct configuration written from vty

osmo-hlr would not read back written configuration due to
bad indentation in the mslookup->server->service section.

Also ipa-name was missing.

Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb
---
M src/dgsm_vty.c
M src/hlr_vty.c
M tests/test_nodes.vty
3 files changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved
  laforge: Looks good to me, approved



diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c
index 6f29d3b..00a60ea 100644
--- a/src/dgsm_vty.c
+++ b/src/dgsm_vty.c
@@ -442,7 +442,7 @@
 
 		msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false);
 		if (msc)
-			config_write_msc_services(vty, " ", msc);
+			config_write_msc_services(vty, "  ", msc);
 
 		llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) {
 			if (!osmo_ipa_name_cmp(&mslookup_server_msc_wildcard, &msc->name))
diff --git a/src/hlr_vty.c b/src/hlr_vty.c
index 4b91aa9..df2270b 100644
--- a/src/hlr_vty.c
+++ b/src/hlr_vty.c
@@ -102,6 +102,8 @@
 	vty_out(vty, " gsup%s", VTY_NEWLINE);
 	if (g_hlr->gsup_bind_addr)
 		vty_out(vty, "  bind ip %s%s", g_hlr->gsup_bind_addr, VTY_NEWLINE);
+	if (g_hlr->gsup_unit_name.serno)
+		vty_out(vty, "  ipa-name %s%s", g_hlr->gsup_unit_name.serno, VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index 5848fe1..cce5703 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -107,6 +107,7 @@
  database hlr_vty_test.db
  gsup
   bind ip 127.0.0.1
+  ipa-name unnamed-HLR
  ussd route prefix *#100# internal own-msisdn
  ussd route prefix *#101# internal own-imsi
 end
@@ -345,9 +346,9 @@
 mslookup
  server
   mdns bind 239.192.23.42 4266
- service foo.bar at 123.45.67.89 1011
- service baz.bar at 121.31.41.5 1617
- service baz.bar at a:b:c::d 1819
+  service foo.bar at 123.45.67.89 1011
+  service baz.bar at 121.31.41.5 1617
+  service baz.bar at a:b:c::d 1819
  msc MSC-1
  msc msc-901-70-23
   service foo.bar at 76.54.32.10 1234
@@ -401,8 +402,8 @@
 mslookup
  server
   mdns bind 239.192.23.42 4266
- service foo.bar at 123.45.67.89 1011
- service baz.bar at 121.31.41.5 1617
+  service foo.bar at 123.45.67.89 1011
+  service baz.bar at 121.31.41.5 1617
  msc MSC-1
  msc msc-901-70-23
   service foo.bar at 76.54.32.10 1234
@@ -433,9 +434,9 @@
 mslookup
  server
   mdns bind 239.192.23.42 4266
- service foo.bar at 123.45.67.89 1011
- service baz.bar at 121.31.41.5 1617
- service gsup.hlr at 23.42.17.11 4223
+  service foo.bar at 123.45.67.89 1011
+  service baz.bar at 121.31.41.5 1617
+  service gsup.hlr at 23.42.17.11 4223
  msc MSC-1
  msc msc-901-70-23
   service foo.bar at 76.54.32.10 1234

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb
Gerrit-Change-Number: 23111
Gerrit-PatchSet: 4
Gerrit-Owner: keith <keith at rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210228/86d2aeeb/attachment.htm>