Add client config unit test + fixes to unit tests infra

Signed-off-by: Ido Barnea <ibarnea@cisco.com>

3 files changed, 65 insertions, 56 deletions

diff --git a/scripts/cap2/cluster_example.yaml b/scripts/cap2/cluster_example.yaml
new file mode 100644
index 00000000..6168d131
--- /dev/null
+++ b/scripts/cap2/cluster_example.yaml
@@ -0,0 +1,65 @@
+# 
+# Cluster configuration example file
+# The file must contain the following fields
+#
+# 'vlan'   - Set to true, if the entire configuration is under VLAN. False otherwise.
+#            if set to true, each client group must include vlan configuration
+#
+# 'groups' - Each client group must contain range of IPs
+#            and initiator and responder maps 
+#            'count' is the number of devices on the group.
+#
+# initiator and responder can contain 'vlan', 'src_mac', 'dst_mac', 'next_hop'.
+#
+
+vlan: true
+
+groups:
+
+-    ip_start  : 16.0.0.1
+     ip_end    : 16.0.0.4
+     initiator :
+                 vlan    : 100
+                 dst_mac : "00:00:00:01:00:00"
+     responder :
+                 vlan    : 200
+                 dst_mac : "00:00:00:01:00:00"
+
+     count     : 2
+ 
+-    ip_start  : 16.0.0.5
+     ip_end    : 16.0.0.12
+     initiator :
+                 vlan    : 101
+                 dst_mac : "01:00:00:00:01:01"
+
+     responder :
+                 vlan    : 201
+                 dst_mac : "01:00:00:00:02:01"
+
+     count     : 4
+
+-    ip_start  : 16.0.0.13
+     ip_end    : 16.0.0.30
+
+     initiator :
+                vlan    : 103
+                dst_mac : "02:00:00:00:01:01"
+     responder :
+
+                vlan    : 203
+                dst_mac : "02:00:00:00:02:01"
+
+     count     : 8
+
+-    ip_start  : 16.0.0.31
+     ip_end    : 16.0.1.255
+
+     initiator :
+                vlan    : 104
+                dst_mac : "04:00:00:00:01:01"
+     responder :
+
+                vlan    : 204
+                dst_mac : "04:00:00:00:02:01"
+
diff --git a/scripts/cfg/client_cfg_template.yaml b/scripts/cfg/client_cfg_template.yaml
deleted file mode 100644
index 8257b981..00000000
--- a/scripts/cfg/client_cfg_template.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# 
-# Client configuration example file
-# The file must contain the following fields
-#
-# 'vlan'   - is the entire configuration under VLAN
-#            if so, each client group must include vlan
-#            configuration
-#
-# 'groups' - each client group must contain a range of IP
-#            and initiator and responder maps 
-#            'count' represents the number of MAC devices
-#            on the group.
-#
-# initiator and responder can contain 'vlan', 'src_mac', 'dst_mac'
-#
-
-vlan: true
-
-groups:
-
--    ip_start  : 5.0.0.1
-     ip_end    : 5.0.0.4
-     initiator : 
-                 vlan    : 100
-                 dst_mac : "00:00:00:01:00:00"
-     responder : 
-                 vlan    : 200
-                 dst_mac : "00:00:00:01:00:00"
-
-     count     : 2
- 
--    ip_start  : 5.0.0.5
-     ip_end    : 5.0.0.12
-     initiator :
-                 vlan    : 101
-                 dst_mac : "01:00:00:00:01:01"
-
-     responder:  
-                 vlan    : 201
-                 dst_mac : "01:00:00:00:02:01"
-
-     count     : 4
-
--    ip_start  : 5.0.0.13
-     ip_end    : 5.0.0.30
-
-     initiator : 
-                vlan    : 103
-                dst_mac : "02:00:00:00:01:01"
-     responder :
-
-                vlan    : 203
-                dst_mac : "02:00:00:00:02:01"
-
-     count     : 8
-
diff --git a/scripts/exp/client_cfg_dns-0-ex.erf b/scripts/exp/client_cfg_dns-0-ex.erf
new file mode 100644
index 00000000..cb7ff995
--- /dev/null
+++ b/scripts/exp/client_cfg_dns-0-ex.erf