discover: Support DHCP "pathprefix" configuration option

This change implements support for the DHCP "pathprefix" option. We use
the following logic:

 - If pathprefix is present and a full URL, we base the config file
   location on pathprefix + conffile

 - If pathprefix is present but not a full URL, we use it as the path
   component of the URL, and pick up the host from other parameters in
   the DHCP response

 - If no pathprefix is present, we determine the configuration prefix
   from the DHCP bootfile parameter.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

4 files changed, 117 insertions, 0 deletions

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 47fd458..fdc53e3 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -62,6 +62,9 @@ TESTS = \
 	test-pxe-ip-without-conf \
 	test-pxe-non-url-conf \
 	test-pxe-local \
+	test-pxe-pathprefix-with-conf \
+	test-pxe-non-url-pathprefix-with-conf \
+	test-pxe-pathprefix-discover \
 	test-unresolved-remove
 
 $(TESTS): %: %.embedded-config.o
diff --git a/test/parser/test-pxe-non-url-pathprefix-with-conf.c b/test/parser/test-pxe-non-url-pathprefix-with-conf.c
new file mode 100644
index 0000000..36d4726
--- /dev/null
+++ b/test/parser/test-pxe-non-url-pathprefix-with-conf.c
@@ -0,0 +1,38 @@
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+default linux
+
+label linux
+kernel ./kernel
+append command line
+initrd /initrd
+#endif
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_embedded_url(test, "tftp://host/path/to/conf.txt");
+
+	test_set_event_source(test);
+	test_set_event_param(test->ctx->event, "tftp", "host");
+	test_set_event_param(test->ctx->event, "pxepathprefix", "/path/to/");
+	test_set_event_param(test->ctx->event, "pxeconffile", "conf.txt");
+
+	test_run_parser(test, "pxe");
+
+	ctx = test->ctx;
+
+	check_boot_option_count(ctx, 1);
+	opt = get_boot_option(ctx, 0);
+
+	check_name(opt, "linux");
+	check_args(opt, "command line");
+
+	check_resolved_url_resource(opt->boot_image,
+			"tftp://host/path/to/./kernel");
+	check_resolved_url_resource(opt->initrd, "tftp://host/initrd");
+}
diff --git a/test/parser/test-pxe-pathprefix-discover.c b/test/parser/test-pxe-pathprefix-discover.c
new file mode 100644
index 0000000..de2feac
--- /dev/null
+++ b/test/parser/test-pxe-pathprefix-discover.c
@@ -0,0 +1,38 @@
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+default linux
+
+label linux
+kernel ./kernel
+append command line
+initrd /initrd
+#endif
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_embedded_url(test, "tftp://host/path/to/C0A8");
+
+	test_set_event_source(test);
+	test_set_event_param(test->ctx->event, "ip", "192.168.0.1");
+	test_set_event_param(test->ctx->event, "pxepathprefix",
+			"tftp://host/path/to/");
+
+	test_run_parser(test, "pxe");
+
+	ctx = test->ctx;
+
+	check_boot_option_count(ctx, 1);
+	opt = get_boot_option(ctx, 0);
+
+	check_name(opt, "linux");
+	check_args(opt, "command line");
+
+	check_resolved_url_resource(opt->boot_image,
+			"tftp://host/path/to/./kernel");
+	check_resolved_url_resource(opt->initrd, "tftp://host/initrd");
+}
diff --git a/test/parser/test-pxe-pathprefix-with-conf.c b/test/parser/test-pxe-pathprefix-with-conf.c
new file mode 100644
index 0000000..57f942d
--- /dev/null
+++ b/test/parser/test-pxe-pathprefix-with-conf.c
@@ -0,0 +1,38 @@
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+default linux
+
+label linux
+kernel ./kernel
+append command line
+initrd /initrd
+#endif
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_embedded_url(test, "tftp://host/path/to/conf.txt");
+
+	test_set_event_source(test);
+	test_set_event_param(test->ctx->event, "pxepathprefix",
+			"tftp://host/path/to/");
+	test_set_event_param(test->ctx->event, "pxeconffile", "conf.txt");
+
+	test_run_parser(test, "pxe");
+
+	ctx = test->ctx;
+
+	check_boot_option_count(ctx, 1);
+	opt = get_boot_option(ctx, 0);
+
+	check_name(opt, "linux");
+	check_args(opt, "command line");
+
+	check_resolved_url_resource(opt->boot_image,
+			"tftp://host/path/to/./kernel");
+	check_resolved_url_resource(opt->initrd, "tftp://host/initrd");
+}