Removed mac keyword from all traffic profiles

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

62 files changed, 12 insertions, 93 deletions

diff --git a/scripts/cap2/asa_explot1.yaml b/scripts/cap2/asa_explot1.yaml
index 6f08c49c..a7e6b3ba 100644
--- a/scripts/cap2/asa_explot1.yaml
+++ b/scripts/cap2/asa_explot1.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0"
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_ipg    : false
   cap_ipg_min : 100
   cap_override_ipg : 1000
diff --git a/scripts/cap2/cur_flow.yaml b/scripts/cap2/cur_flow.yaml
index dc518a44..fcaf6258 100644
--- a/scripts/cap2/cur_flow.yaml
+++ b/scripts/cap2/cur_flow.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   #cap_ipg    : true
   cap_info : 
      - name: cap2/udp_10_pkts.pcap
diff --git a/scripts/cap2/cur_flow_single.yaml b/scripts/cap2/cur_flow_single.yaml
index a5872da0..ce029750 100644
--- a/scripts/cap2/cur_flow_single.yaml
+++ b/scripts/cap2/cur_flow_single.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   #cap_ipg    : true
   cap_info : 
      - name: cap2/udp_10_pkts.pcap
diff --git a/scripts/cap2/cur_flow_single_tw_8.yaml b/scripts/cap2/cur_flow_single_tw_8.yaml
index 7652507a..3768082b 100644
--- a/scripts/cap2/cur_flow_single_tw_8.yaml
+++ b/scripts/cap2/cur_flow_single_tw_8.yaml
@@ -10,8 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
-  #cap_ipg    : true
   tw :                             # set timer wheel configuration options
      buckets : 16384
      levels  : 2
diff --git a/scripts/cap2/dns.yaml b/scripts/cap2/dns.yaml
index 23b02fd6..d7a57e1d 100755
--- a/scripts/cap2/dns.yaml
+++ b/scripts/cap2/dns.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_no_delay.yaml b/scripts/cap2/dns_no_delay.yaml
index 6139716c..7d7a61e1 100644
--- a/scripts/cap2/dns_no_delay.yaml
+++ b/scripts/cap2/dns_no_delay.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_one_server.yaml b/scripts/cap2/dns_one_server.yaml
index bac3c1d1..dd5b7635 100755
--- a/scripts/cap2/dns_one_server.yaml
+++ b/scripts/cap2/dns_one_server.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_single_server.yaml b/scripts/cap2/dns_single_server.yaml
index 0613978a..d862c8c5 100755
--- a/scripts/cap2/dns_single_server.yaml
+++ b/scripts/cap2/dns_single_server.yaml
@@ -14,7 +14,6 @@
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
   wlength    : 7
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 0.5
diff --git a/scripts/cap2/dns_tw.yaml b/scripts/cap2/dns_tw.yaml
index 9ddbc3c8..ef3a9cc6 100644
--- a/scripts/cap2/dns_tw.yaml
+++ b/scripts/cap2/dns_tw.yaml
@@ -14,9 +14,6 @@
      buckets : 32768
      levels  : 2
      bucket_time_usec : 20.0
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
-  #vlan       : { enable : 1  ,  vlan0 : 100 , vlan1 : 200 }
-  #mac_override_by_ip : true
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_wlen.yaml b/scripts/cap2/dns_wlen.yaml
index fc653d4f..87edfc92 100755
--- a/scripts/cap2/dns_wlen.yaml
+++ b/scripts/cap2/dns_wlen.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_wlen1.yaml b/scripts/cap2/dns_wlen1.yaml
index bf07bac3..9b803ceb 100755
--- a/scripts/cap2/dns_wlen1.yaml
+++ b/scripts/cap2/dns_wlen1.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_wlen2.yaml b/scripts/cap2/dns_wlen2.yaml
index 9bc8caae..24131a2a 100755
--- a/scripts/cap2/dns_wlen2.yaml
+++ b/scripts/cap2/dns_wlen2.yaml
@@ -14,7 +14,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength   : 10
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dns_wlength.yaml b/scripts/cap2/dns_wlength.yaml
index fc653d4f..87edfc92 100755
--- a/scripts/cap2/dns_wlength.yaml
+++ b/scripts/cap2/dns_wlength.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/dyn_pyld1.yaml b/scripts/cap2/dyn_pyld1.yaml
index 1ea09aa7..17bb1fba 100755
--- a/scripts/cap2/dyn_pyld1.yaml
+++ b/scripts/cap2/dyn_pyld1.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps : 1.0
diff --git a/scripts/cap2/http.yaml b/scripts/cap2/http.yaml
index 80d58369..38bc5ef9 100755
--- a/scripts/cap2/http.yaml
+++ b/scripts/cap2/http.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_ipg    : true
   cap_info : 
      - name: avl/delay_10_rtp_160k_full.pcap
diff --git a/scripts/cap2/http_plugin.yaml b/scripts/cap2/http_plugin.yaml
index 032409e4..3760c8f4 100755
--- a/scripts/cap2/http_plugin.yaml
+++ b/scripts/cap2/http_plugin.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/delay_10_http_browsing_0.pcap
        cps : 1.0
diff --git a/scripts/cap2/http_short.yaml b/scripts/cap2/http_short.yaml
index 82dbf229..98c70594 100644
--- a/scripts/cap2/http_short.yaml
+++ b/scripts/cap2/http_short.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   #cap_ipg    : true
   cap_info : 
      - name: cap2/190_packet.pcap
diff --git a/scripts/cap2/http_simple.yaml b/scripts/cap2/http_simple.yaml
index ad4814f5..432a9064 100755
--- a/scripts/cap2/http_simple.yaml
+++ b/scripts/cap2/http_simple.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_ipg    : true
   cap_info : 
      - name: avl/delay_10_http_browsing_0.pcap
diff --git a/scripts/cap2/http_very_long.yaml b/scripts/cap2/http_very_long.yaml
index 0e7bb46f..51da7d29 100644
--- a/scripts/cap2/http_very_long.yaml
+++ b/scripts/cap2/http_very_long.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   #cap_ipg    : true
   cap_info : 
      - name: avl/delay_10_http_browsing_0.pcap
diff --git a/scripts/cap2/imix.yaml b/scripts/cap2/imix.yaml
index a155e38b..8a662d28 100755
--- a/scripts/cap2/imix.yaml
+++ b/scripts/cap2/imix.yaml
@@ -13,7 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 28.0
diff --git a/scripts/cap2/imix_1518.yaml b/scripts/cap2/imix_1518.yaml
index ddccc987..d9b093ad 100755
--- a/scripts/cap2/imix_1518.yaml
+++ b/scripts/cap2/imix_1518.yaml
@@ -13,11 +13,10 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
 #
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automatically 
-# but for now it like this , you should have at least 8 
-#  
+# The templates are duplicated on purpose in order to utilize all DRAM bandwidth and get better performance
+# Should do this automaticlly in the future somehow. You should have at least 8 templates
+#
   cap_info : 
      - name: cap2/udp_1518B.pcap
        cps   : 1000.0
diff --git a/scripts/cap2/imix_64.yaml b/scripts/cap2/imix_64.yaml
index d3c92296..1a1d7911 100755
--- a/scripts/cap2/imix_64.yaml
+++ b/scripts/cap2/imix_64.yaml
@@ -13,11 +13,10 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
 #
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automaticly 
-# but for now it like this , you should have at least 8 
-#  
+# The templates are duplicated on purpose in order to utilize all DRAM bandwidth and get better performance
+# Should do this automaticlly in the future somehow. You should have at least 8 templates
+#
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 1000.0
diff --git a/scripts/cap2/imix_64_100k.yaml b/scripts/cap2/imix_64_100k.yaml
index 0c2cfe14..60b6aa95 100644
--- a/scripts/cap2/imix_64_100k.yaml
+++ b/scripts/cap2/imix_64_100k.yaml
@@ -13,11 +13,10 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
 #
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automaticly 
-# but for now it like this , you should have at least 8 
-#  
+# The templates are duplicated on purpose in order to utilize all DRAM bandwidth and get better performance
+# Should do this automaticlly in the future somehow. You should have at least 8 templates
+#
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 1000.0
diff --git a/scripts/cap2/imix_64_fast.yaml b/scripts/cap2/imix_64_fast.yaml
index f259381c..cbbb59a0 100644
--- a/scripts/cap2/imix_64_fast.yaml
+++ b/scripts/cap2/imix_64_fast.yaml
@@ -13,11 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
-#
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automaticly 
-# but for now it like this , you should have at least 8 
-#  
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 1000000.0
diff --git a/scripts/cap2/imix_9k.yaml b/scripts/cap2/imix_9k.yaml
index 39472804..5bdb6a34 100644
--- a/scripts/cap2/imix_9k.yaml
+++ b/scripts/cap2/imix_9k.yaml
@@ -13,11 +13,10 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
 #
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automaticly 
-# but for now it like this , you should have at least 8 
-#  
+# The templates are duplicated on purpose in order to utilize all DRAM bandwidth and get better performance
+# Should do this automaticlly in the future somehow. You should have at least 8 templates
+#
   cap_info : 
      - name: stl/yaml/ipv4_udp_9k.pcap
        cps   : 1000.0
diff --git a/scripts/cap2/imix_9k_burst_10.yaml b/scripts/cap2/imix_9k_burst_10.yaml
index 0683764b..4eb8b9e6 100644
--- a/scripts/cap2/imix_9k_burst_10.yaml
+++ b/scripts/cap2/imix_9k_burst_10.yaml
@@ -13,11 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
-#
-# the templates are duplicated in purpose , to utilized all DRAM BW and get better performance, we should do it automaticly 
-# but for now it like this , you should have at least 8 
-#  
   cap_info : 
      - name: stl/yaml/ipv4_udp_9k_burst_10.pcap
        cps   : 0.1
diff --git a/scripts/cap2/imix_fast_1g.yaml b/scripts/cap2/imix_fast_1g.yaml
index 12ce7c4d..9561e01e 100755
--- a/scripts/cap2/imix_fast_1g.yaml
+++ b/scripts/cap2/imix_fast_1g.yaml
@@ -13,7 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 90615
diff --git a/scripts/cap2/imix_fast_1g_100k_flows.yaml b/scripts/cap2/imix_fast_1g_100k_flows.yaml
index a5fb6bc0..59f3a26b 100755
--- a/scripts/cap2/imix_fast_1g_100k_flows.yaml
+++ b/scripts/cap2/imix_fast_1g_100k_flows.yaml
@@ -13,7 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 90615
diff --git a/scripts/cap2/ipv4_load_balance.yaml b/scripts/cap2/ipv4_load_balance.yaml
index 63f7db7d..96733068 100755
--- a/scripts/cap2/ipv4_load_balance.yaml
+++ b/scripts/cap2/ipv4_load_balance.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   vlan       : { enable : 1  ,  vlan0 : 100 , vlan1 : 200 }
   cap_info : 
      - name: cap2/udp_64B.pcap
diff --git a/scripts/cap2/ipv6.yaml b/scripts/cap2/ipv6.yaml
index 3de11f6c..fbb89924 100755
--- a/scripts/cap2/ipv6.yaml
+++ b/scripts/cap2/ipv6.yaml
@@ -12,7 +12,6 @@
           udp_aging      : 1
   src_ipv6 : [0x2001,0x0232,0x1002,0x0051,0x0000,0x0000]
   dst_ipv6 : [0x3001,0x0DB8,0x0003,0x0004,0x0000,0x0000]
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/ipv6.pcap
        cps   : 10.0
diff --git a/scripts/cap2/ipv6_load_balance.yaml b/scripts/cap2/ipv6_load_balance.yaml
index bb91a4f8..9e67887c 100755
--- a/scripts/cap2/ipv6_load_balance.yaml
+++ b/scripts/cap2/ipv6_load_balance.yaml
@@ -12,7 +12,6 @@
           udp_aging      : 1
   src_ipv6 : [0x2001,0x0232,0x1002,0x0051,0x0000,0x0000]
   dst_ipv6 : [0x3001,0x0DB8,0x0003,0x0004,0x0000,0x0000]
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   vlan       : { enable : 1  ,  vlan0 : 100 , vlan1 : 200 }
   cap_info : 
      - name: cap2/ipv6.pcap
diff --git a/scripts/cap2/jumbo.yaml b/scripts/cap2/jumbo.yaml
index 901e6189..b5c7451e 100644
--- a/scripts/cap2/jumbo.yaml
+++ b/scripts/cap2/jumbo.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/jumbo.pcap
        cps : 1.0
diff --git a/scripts/cap2/lb_ex1.yaml b/scripts/cap2/lb_ex1.yaml
index 8d5abb61..100ada58 100755
--- a/scripts/cap2/lb_ex1.yaml
+++ b/scripts/cap2/lb_ex1.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_ipg    : true
   cap_info : 
      - name: avl/delay_10_https_0.pcap
diff --git a/scripts/cap2/limit_multi_pkt.yaml b/scripts/cap2/limit_multi_pkt.yaml
index 25e32e86..e61dae9f 100755
--- a/scripts/cap2/limit_multi_pkt.yaml
+++ b/scripts/cap2/limit_multi_pkt.yaml
@@ -13,7 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/dns.pcap
        cps   : 15.0
diff --git a/scripts/cap2/limit_single_pkt.yaml b/scripts/cap2/limit_single_pkt.yaml
index 03802fe8..eb8e5312 100755
--- a/scripts/cap2/limit_single_pkt.yaml
+++ b/scripts/cap2/limit_single_pkt.yaml
@@ -13,7 +13,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/udp_64B.pcap
        cps   : 6.0
diff --git a/scripts/cap2/many_client_example.yaml b/scripts/cap2/many_client_example.yaml
index 7908a5a4..cac4ce40 100644
--- a/scripts/cap2/many_client_example.yaml
+++ b/scripts/cap2/many_client_example.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.3.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        client_pool: "c1"
diff --git a/scripts/cap2/nat_test.yaml b/scripts/cap2/nat_test.yaml
index 659fbe55..ebdbf834 100755
--- a/scripts/cap2/nat_test.yaml
+++ b/scripts/cap2/nat_test.yaml
@@ -11,7 +11,6 @@
           dual_port_mask : "1.0.0.0"
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
diff --git a/scripts/cap2/per_template_gen1.yaml b/scripts/cap2/per_template_gen1.yaml
index 41332518..83ee2d2d 100644
--- a/scripts/cap2/per_template_gen1.yaml
+++ b/scripts/cap2/per_template_gen1.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.1.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        cps : 1.0
diff --git a/scripts/cap2/per_template_gen2.yaml b/scripts/cap2/per_template_gen2.yaml
index 3349087c..c8608328 100644
--- a/scripts/cap2/per_template_gen2.yaml
+++ b/scripts/cap2/per_template_gen2.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.1.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        client_pool: "c1"
diff --git a/scripts/cap2/per_template_gen3.yaml b/scripts/cap2/per_template_gen3.yaml
index 2bf428d0..7bd44722 100644
--- a/scripts/cap2/per_template_gen3.yaml
+++ b/scripts/cap2/per_template_gen3.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.1.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        client_pool: "c2"
diff --git a/scripts/cap2/per_template_gen4.yaml b/scripts/cap2/per_template_gen4.yaml
index 8a8a61b9..4af9ee35 100644
--- a/scripts/cap2/per_template_gen4.yaml
+++ b/scripts/cap2/per_template_gen4.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.1.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        client_pool: "c2"
diff --git a/scripts/cap2/per_template_gen5.yaml b/scripts/cap2/per_template_gen5.yaml
index e29a2bfc..7c39e93d 100755
--- a/scripts/cap2/per_template_gen5.yaml
+++ b/scripts/cap2/per_template_gen5.yaml
@@ -30,7 +30,6 @@
                 ip_start : "38.0.0.1"
                 ip_end : "38.0.3.255"
                 track_ports : false
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        client_pool: "c2"
diff --git a/scripts/cap2/rtsp.yaml b/scripts/cap2/rtsp.yaml
index 7a91c4e9..eb845d03 100755
--- a/scripts/cap2/rtsp.yaml
+++ b/scripts/cap2/rtsp.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/rtsp_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/rtsp_full1.yaml b/scripts/cap2/rtsp_full1.yaml
index c150f54a..2c636688 100755
--- a/scripts/cap2/rtsp_full1.yaml
+++ b/scripts/cap2/rtsp_full1.yaml
@@ -6,7 +6,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/delay_10_rtp_250k_full.pcap
        cps : 1.0
diff --git a/scripts/cap2/rtsp_full2.yaml b/scripts/cap2/rtsp_full2.yaml
index eb75afec..45c86e1a 100755
--- a/scripts/cap2/rtsp_full2.yaml
+++ b/scripts/cap2/rtsp_full2.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/delay_10_rtp_160k_full.pcap
        cps : 1.0
diff --git a/scripts/cap2/rtsp_short1.yaml b/scripts/cap2/rtsp_short1.yaml
index 8e0fd53d..264465f9 100755
--- a/scripts/cap2/rtsp_short1.yaml
+++ b/scripts/cap2/rtsp_short1.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/delay_10_rtp_250k_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/rtsp_short1_slow.yaml b/scripts/cap2/rtsp_short1_slow.yaml
index 7a3abb59..1f4e6b36 100755
--- a/scripts/cap2/rtsp_short1_slow.yaml
+++ b/scripts/cap2/rtsp_short1_slow.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/delay_10_rtp_250k_short.pcap
        cps : 0.01
diff --git a/scripts/cap2/rtsp_short2.yaml b/scripts/cap2/rtsp_short2.yaml
index 8e0fd53d..264465f9 100755
--- a/scripts/cap2/rtsp_short2.yaml
+++ b/scripts/cap2/rtsp_short2.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/delay_10_rtp_250k_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/rtsp_short3.yaml b/scripts/cap2/rtsp_short3.yaml
index 8e0fd53d..264465f9 100755
--- a/scripts/cap2/rtsp_short3.yaml
+++ b/scripts/cap2/rtsp_short3.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/delay_10_rtp_250k_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/sfr.yaml b/scripts/cap2/sfr.yaml
index da6391d2..da4503d7 100755
--- a/scripts/cap2/sfr.yaml
+++ b/scripts/cap2/sfr.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/Oracle.pcap
        cps : 150.0
diff --git a/scripts/cap2/sfr2.yaml b/scripts/cap2/sfr2.yaml
index 910e36bf..f75ebb08 100755
--- a/scripts/cap2/sfr2.yaml
+++ b/scripts/cap2/sfr2.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/Oracle.pcap
        cps : 1.0
diff --git a/scripts/cap2/sfr3.yaml b/scripts/cap2/sfr3.yaml
index bb60fe9d..f26b53cb 100755
--- a/scripts/cap2/sfr3.yaml
+++ b/scripts/cap2/sfr3.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/Oracle.pcap
        cps : 0.5
diff --git a/scripts/cap2/sfr4.yaml b/scripts/cap2/sfr4.yaml
index 49d7e9b3..d273344e 100755
--- a/scripts/cap2/sfr4.yaml
+++ b/scripts/cap2/sfr4.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/http_get.pcap
        cps : 1.0
diff --git a/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile.yaml b/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile.yaml
index b36771c4..71a7672a 100755
--- a/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile.yaml
+++ b/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile.yaml
@@ -3,7 +3,6 @@
   max_src_ip : 0x90000001
   min_dst_ip : 0xa0000001
   max_dst_ip : 0xb0000001
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/Oracle.pcap
        cps : 60
diff --git a/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile_ipg_mix.yaml b/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile_ipg_mix.yaml
index 2d8d9ce8..fdfd08b3 100755
--- a/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile_ipg_mix.yaml
+++ b/scripts/cap2/sfr_agg_tcp14_udp11_http200msec_new_high_new_nir_profile_ipg_mix.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: cap2/Oracle.pcap
        cps : 21.6
diff --git a/scripts/cap2/short_tcp.yaml b/scripts/cap2/short_tcp.yaml
index 2c58a002..a436656a 100755
--- a/scripts/cap2/short_tcp.yaml
+++ b/scripts/cap2/short_tcp.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 0
           udp_aging      : 0
-  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_info : 
      - name: avl/delay_10_smtp_0.pcap
        cps : 1.0
diff --git a/scripts/cap2/sip_short1.yaml b/scripts/cap2/sip_short1.yaml
index e644bf56..63b0790e 100755
--- a/scripts/cap2/sip_short1.yaml
+++ b/scripts/cap2/sip_short1.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/delay_10_sip_video_call_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/sip_short2.yaml b/scripts/cap2/sip_short2.yaml
index e644bf56..63b0790e 100755
--- a/scripts/cap2/sip_short2.yaml
+++ b/scripts/cap2/sip_short2.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/delay_10_sip_video_call_short.pcap
        cps : 1.0
diff --git a/scripts/cap2/test_mac.yaml b/scripts/cap2/test_mac.yaml
deleted file mode 100755
index 8ae7eaea..00000000
--- a/scripts/cap2/test_mac.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- min_ip : "1.1.1.1"
-  items :
-    - ip : "1.1.1.1"
-      mac : [0x2,0x0,0x0,0x1,0x0,0x0]
-
-    - ip : "1.1.1.2"
-      mac : [0x3,0x0,0x0,0x1,0x0,0x0]
-    - ip : "1.1.1.103"
-      mac : [0x3,0x0,0x0,0x1,0x0,0x0]
diff --git a/scripts/cap2/test_pcap_mode1.yaml b/scripts/cap2/test_pcap_mode1.yaml
index 3af7b088..967035bd 100755
--- a/scripts/cap2/test_pcap_mode1.yaml
+++ b/scripts/cap2/test_pcap_mode1.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/citrix_0.pcap
        cps : 1.0
diff --git a/scripts/cap2/test_pcap_mode2.yaml b/scripts/cap2/test_pcap_mode2.yaml
index 6bb6ba3a..e6f28b24 100755
--- a/scripts/cap2/test_pcap_mode2.yaml
+++ b/scripts/cap2/test_pcap_mode2.yaml
@@ -13,7 +13,6 @@
   cap_ipg    : true
   cap_ipg_min    : 30
   cap_override_ipg    : 200
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: avl/citrix_0.pcap
        cps : 1.0
diff --git a/scripts/cap2/wrong_ip.yaml b/scripts/cap2/wrong_ip.yaml
index 226b0c5c..5477c27f 100644
--- a/scripts/cap2/wrong_ip.yaml
+++ b/scripts/cap2/wrong_ip.yaml
@@ -10,7 +10,6 @@
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/wrong_ip.pcap
        cps : 1.0