Change in osmo-bts[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode()

[laforge]

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

Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode()
......................................................................

main: add --vty-ref-mode, use vty_dump_xml_ref_mode()

Change-Id: I744520199ef448ff095d0fe703d79ac08f08f7fe
Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40
Related: SYS#4910
---
M src/common/main.c
1 file changed, 32 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/common/main.c b/src/common/main.c
index b1b1766..279e823 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -76,11 +76,38 @@
 		"  -V	--version		Print version information and exit\n"
 		"  -e 	--log-level		Set a global log-level\n"
 		"  -i	--gsmtap-ip		The destination IP used for GSMTAP.\n"
-		"    	--vty-ref-xml   	Generate the VTY reference XML output and exit.\n"
+		"\nVTY reference generation:\n"
+		"	--vty-ref-mode MODE	VTY reference generation mode (e.g. 'expert').\n"
+		"	--vty-ref-xml		Generate the VTY reference XML output and exit.\n"
 		);
 	bts_model_print_help();
 }
 
+static void handle_long_options(const char *prog_name, const int long_option)
+{
+	static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT;
+
+	switch (long_option) {
+	case 1:
+		vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg);
+		if (vty_ref_mode < 0) {
+			fprintf(stderr, "%s: Unknown VTY reference generation "
+				"mode '%s'\n", prog_name, optarg);
+			exit(2);
+		}
+		break;
+	case 2:
+		fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n",
+			get_value_string(vty_ref_gen_mode_names, vty_ref_mode),
+			get_value_string(vty_ref_gen_mode_desc, vty_ref_mode));
+		vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode);
+		exit(0);
+	default:
+		fprintf(stderr, "%s: error parsing cmdline options\n", prog_name);
+		exit(2);
+	}
+}
+
 /* FIXME: finally get some option parsing code into libosmocore */
 static void handle_options(int argc, char **argv)
 {
@@ -110,7 +137,8 @@
 			{ "gsmtap-ip", 1, 0, 'i' },
 			{ "trx-num", 1, 0, 't' },
 			{ "realtime", 1, 0, 'r' },
-			{"vty-ref-xml", 0, &long_option, 1},
+			{ "vty-ref-mode", 1, &long_option, 1 },
+			{ "vty-ref-xml", 0, &long_option, 2 },
 			{ 0, 0, 0, 0 }
 		};
 
@@ -125,14 +153,8 @@
 			exit(0);
 			break;
 		case 0:
-			switch (long_option) {
-			case 1:
-				vty_dump_xml_ref(stdout);
-				exit(0);
-			default:
-				fprintf(stderr, "error parsing cmdline options\n");
-				exit(2);
-			}
+			handle_long_options(argv[0], long_option);
+			break;
 		case 's':
 			log_set_use_color(osmo_stderr_target, 0);
 			break;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I744520199ef448ff095d0fe703d79ac08f08f7fe
Gerrit-Change-Number: 20863
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
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/20201024/56cffac3/attachment.htm>