Merge pull request snabbco#917 from Igalia/setup-conf

Load config from setup.lua

src/program/lwaftr/bench/bench.lua

@@ -39,7 +39,7 @@ end
 
 function run(args)
    local opts, scheduling, conf_file, inv4_pcap, inv6_pcap = parse_args(args)
-   local conf = require('apps.lwaftr.conf').load_lwaftr_config(conf_file)
+   local conf = setup.read_config(conf_file)
 
    -- If there is a name defined on the command line, it should override
    -- anything defined in the config.

src/program/lwaftr/check/check.lua

@@ -1,7 +1,6 @@
 module(..., package.seeall)
 
 local lib = require("core.lib")
-local lwconf = require("apps.lwaftr.conf")
 local setup = require("program.lwaftr.setup")
 local util = require("program.lwaftr.check.util")
 local engine = require("core.app")
@@ -43,7 +42,7 @@ function run(args)
                                          or  setup.load_check
    local conf_file, inv4_pcap, inv6_pcap, outv4_pcap, outv6_pcap, counters_path =
       unpack(args)
-   local conf = lwconf.load_lwaftr_config(conf_file)
+   local conf = setup.read_config(conf_file)
    local c = config.new()
    load_check(c, conf, inv4_pcap, inv6_pcap, outv4_pcap, outv6_pcap)
    engine.configure(c)

src/program/lwaftr/run/run.lua

@@ -145,7 +145,7 @@ end
 
 function run(args)
    local opts, scheduling, conf_file, v4, v6 = parse_args(args)
-   local conf = require('apps.lwaftr.conf').load_lwaftr_config(conf_file)
+   local conf = setup.read_config(conf_file)
 
    -- If there are v4 or v6 options we need to migrate the configuration in
    -- memory from the PCI device specified, later we'll want to support

src/program/lwaftr/setup.lua

@@ -29,6 +29,7 @@ local ipv4_ntop  = require("lib.yang.util").ipv4_ntop
 local S          = require("syscall")
 local engine     = require("core.app")
 local lib        = require("core.lib")
+local yang       = require("lib.yang.yang")
 
 
 local capabilities = {['ietf-softwire']={feature={'binding', 'br'}}}

src/program/lwaftr/soaktest/soaktest.lua

@@ -2,7 +2,6 @@ module(..., package.seeall)
 
 local config = require("core.config")
 local lib = require("core.lib")
-local lwconf = require('apps.lwaftr.conf')
 local setup = require("program.lwaftr.setup")
 local engine = require("core.app")
 
@@ -40,7 +39,7 @@ function run (args)
    local load_soak_test = opts["on-a-stick"] and setup.load_soak_test_on_a_stick
                                              or  setup.load_soak_test
    local c = config.new()
-   local conf = lwconf.load_lwaftr_config(conf_file)
+   local conf = setup.read_config(conf_file)
    load_soak_test(c, conf, inv4_pcap, inv6_pcap)
 
    engine.configure(c)

src/program/snabbvmx/lwaftr/lwaftr.lua

@@ -99,18 +99,10 @@ function run(args)
    local ingress_drop_wait = 20
 
    if file_exists(conf_file) then
-      conf = lib.load_conf(conf_file)
-      if not file_exists(conf.lwaftr) then
-         -- Search in main config file.
-         conf.lwaftr = lib.dirname(conf_file).."/"..conf.lwaftr
-      end
-      if not file_exists(conf.lwaftr) then
-         fatal(("lwAFTR conf file '%s' not found"):format(conf.lwaftr))
-      end
-      lwconf = require('apps.lwaftr.conf').load_lwaftr_config(conf.lwaftr)
+      conf, lwconf = setup.load_conf(conf_file)
       external_interface = lwconf.softwire_config.external_interface
       internal_interface = lwconf.softwire_config.internal_interface
-      -- If one interface has vlan tags, the other one should as well.
+      -- If one interface has vlan tags, then the other one should as well.
       assert((not external_interface.vlan_tag) == (not internal_interface.vlan_tag))
    else
       print(("Interface '%s' set to passthrough mode."):format(id))

src/program/snabbvmx/lwaftr/setup.lua

@@ -22,6 +22,7 @@ local pci = require("lib.hardware.pci")
 local raw = require("apps.socket.raw")
 local tap = require("apps.tap.tap")
 local pcap = require("apps.pcap.pcap")
+local yang = require("lib.yang.yang")
 
 local fatal, file_exists = lwutil.fatal, lwutil.file_exists
 local dir_exists, nic_exists = lwutil.dir_exists, lwutil.nic_exists
@@ -329,13 +330,14 @@ function passthrough(c, conf, sock_path)
    end
 end
 
-local function load_conf (conf_filename)
+function load_conf (conf_filename)
    local function load_lwaftr_config (conf, conf_filename)
       local filename = conf.lwaftr
       if not file_exists(filename) then
          filename = lib.dirname(conf_filename).."/"..filename
       end
-      return require("apps.lwaftr.conf").load_lwaftr_config(filename)
+      return yang.load_configuration(filename,
+                                     {schema_name=lwaftr.LwAftr.yang_schema})
    end
    local conf = dofile(conf_filename)
    return conf, load_lwaftr_config(conf, conf_filename)