ipfoc probe_ptree: more schema cleanup

snabbco · Jul 21, 2022 · 88312f5 · 88312f5
1 parent ab14ac3
commit 88312f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/src/lib/yang/snabb-snabbflow-v1.yang b/src/lib/yang/snabb-snabbflow-v1.yang
@@ -173,10 +173,13 @@ module snabb-snabbflow-v1 {
         container pfx6-to-as { leaf file { mandatory true; type string; } }
         container vlan-to-ifindex { leaf file { mandatory true; type string; } }
         container mac-to-as { leaf file { mandatory true; type string; } }
-      }
-
-      leaf maps-logfile {
-        type string;
+        leaf log-directory {
+          type string;
+          description
+            "Path in which to create log files for map failures.
+            If given, failed lookups in maps will be logged to
+            <log-directory>/<observation-domain>.log";
+        }
       }
 
       leaf add-packet-metadata {
@@ -224,7 +227,7 @@ module snabb-snabbflow-v1 {
           type string;
         }
 
-        leaf-list templates {
+        leaf-list template {
           type string;
         }
 
@@ -242,10 +245,6 @@ module snabb-snabbflow-v1 {
           default false;
         }
 
-        leaf map-log-directory {
-          type string;
-        }
-
         container restart {
           description
             "Restart policy for exporter instances with embed: false.";
@@ -276,9 +275,6 @@ module snabb-snabbflow-v1 {
             default 1;
           }
 
-          // busywait = { default = nil },
-          // pin_cpu = { default = false },
-
         }
       }
     }

diff --git a/src/program/ipfix/probe_ptree/probe_ptree.lua b/src/program/ipfix/probe_ptree/probe_ptree.lua
@@ -146,7 +146,7 @@ function setup_workers (config)
          config.exporter_ip = yang_util.ipv4_ntop(ipfix.exporter_ip)
 
          config.collector_pool = exporter.collector_pool
-         config.templates = exporter.templates
+         config.templates = exporter.template
 
          config.output_type = "tap_routed"
          config.instance = nil
@@ -186,9 +186,9 @@ function setup_workers (config)
             observation_domain = observation_domain + 1
             iconfig.observation_domain = od
             iconfig.output = "ipfixexport"..od
-            if exporter.maps_log_dir then
+            if ipfix.maps.log_directory then
                iconfig.maps_logfile =
-                  exporter.maps_log_dir.."/"..od..".log"
+                  ipfix.maps.log_directory.."/"..od..".log"
             end
 
             -- Scale the scan protection parameters by the number of

diff --git a/src/program/ipfix/probe_ptree/snabbflow.conf b/src/program/ipfix/probe_ptree/snabbflow.conf
@@ -53,8 +53,8 @@ snabbflow-config {
 
         exporter {
             name e1;
-            templates "v4_extended";
-            templates "v6_extended";
+            template "v4_extended";
+            template "v6_extended";
             collector-pool c1;
             use-maps true;