lwaftr: keep full config in worker setup

Instead of stripping other instances/queues from per-worker configurations,
add the instance and queue id to to worker configurations.

src/apps/lwaftr/lwutil.lua

@@ -21,18 +21,9 @@ local ntohs = lib.ntohs
 
 -- Return device PCI address, queue ID, and queue configuration.
 function parse_instance(conf)
-   local device, instance
-   for k, v in pairs(conf.softwire_config.instance) do
-      assert(device == nil, "configuration has more than one instance")
-      device, instance = k, v
-   end
-   assert(device ~= nil, "configuration has no instance")
-   local id, queue
-   for k, v in pairs(instance.queue) do
-      assert(id == nil, "configuration has more than one RSS queue")
-      id, queue = k, v
-   end
-   assert(id ~= nil, "configuration has no RSS queues")
+   local device = conf.worker_config.device
+   local id = conf.worker_config.queue_id
+   local queue = conf.softwire_config.instance[device].queue[id]
    return device, id, queue
 end
 

src/lib/yang/snabb-softwire-v2.yang

@@ -886,5 +886,18 @@ module snabb-softwire-v2 {
     }
   }
 
+  container worker-config {
+    description
+    "Worker process configuration state. The contained leaves are used only
+     internally. Setting them has no effect.";
+
+    leaf device {
+      type string;
+    }
+    leaf queue-id {
+      type uint8;
+    }
+  }
+
   uses state-counters;
 }

src/program/lwaftr/setup.lua

@@ -701,18 +701,7 @@ local function compute_worker_configs(conf)
       for id, _ in pairs(queues.queue) do
          local worker_id = string.format('%s/%s', device, id)
          local worker_config = make_copy()
-         local instance = worker_config.softwire_config.instance
-         for other_device, queues in pairs(conf.softwire_config.instance) do
-            if other_device ~= device then
-               instance[other_device] = nil
-            else
-               for other_id, _ in pairs(queues.queue) do
-                  if other_id ~= id then
-                     instance[device].queue[other_id] = nil
-                  end
-               end
-            end
-         end
+         worker_config.worker_config = {device=device, queue_id=id}
          ret[worker_id] = worker_config
       end
    end