Removed mac keyword from all traffic profiles

Signed-off-by: Ido Barnea <[email protected]>

diff --git a/doc/trex_book.asciidoc b/doc/trex_book.asciidoc
index de5801f..3f0db6c 100755 (executable)
--- a/doc/trex_book.asciidoc
+++ b/doc/trex_book.asciidoc
@@ -1309,23 +1309,19 @@ Cpu Utilization : 0.1 %
           dual_port_mask : "1.0.0.0" 
           tcp_aging      : 1
           udp_aging      : 1
-  mac        : [0x00,0x00,0x00,0x01,0x00,0x00] <3>
-  cap_ipg    : true                            <4>
-  cap_ipg_min    : 30                          <5>
-  cap_override_ipg    : 200                    <6>
-  vlan       : { enable : 1  ,  vlan0 : 100 , vlan1 : 200 } <7>
-  mac_override_by_ip : true  <8>
+  cap_ipg    : true                            <3>
+  cap_ipg_min    : 30                          <4>
+  cap_override_ipg    : 200                    <5>
+  vlan       : { enable : 1  ,  vlan0 : 100 , vlan1 : 200 } <6>
+  mac_override_by_ip : true  <7>
 ----
 <1> Test duration (seconds). Can be overridden using the `-d` option.
-<2> See the link:trex_manual.html#_clients_servers_ip_allocation_scheme[generator] section.
-// what does note 2 mean? see somewhere else? isn't this simply the generator section?
-<3> Default source/destination MAC address. The configuration YAML can override this.
-<4> true (default) indicates that the IPG is taken from the cap file (also taking into account cap_ipg_min and cap_override_ipg if they exist). false indicates that IPG is taken from per template section.
-<5> The following two options can set the min ipg in microseconds: (if (pkt_ipg<cap_ipg_min) { pkt_ipg=cap_override_ipg} )
-<6> Value to override (microseconds), as described in note above.
-<7> Enable load balance feature. See xref:trex_load_bal[trex load balance section] for info.
-<8> Enable MAC address replacement by client IP.
-
+<2> See full explanation on generator section link:trex_manual.html#_clients_servers_ip_allocation_scheme[here].
+<3> true (default) indicates that the IPG is taken from the cap file (also taking into account cap_ipg_min and cap_override_ipg if they exist). false indicates that IPG is taken from per template section.
+<4> The following two options can set the min ipg in microseconds: (if (pkt_ipg<cap_ipg_min) { pkt_ipg=cap_override_ipg} )
+<5> Value to override (microseconds), as described in note above.
+<6> Enable load balance feature. See xref:trex_load_bal[trex load balance section] for info.
+<7> Enable MAC address replacement by client IP.
 
 ==== Timer Wheel section configuration  
 

diff --git a/scripts/cap2/asa_explot1.yaml b/scripts/cap2/asa_explot1.yaml
index 6f08c49..a7e6b3b 100644 (file)
--- 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 dc518a4..fcaf625 100644 (file)
--- 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 a5872da..ce02975 100644 (file)
--- 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 7652507..3768082 100644 (file)
--- 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 23b02fd..d7a57e1 100755 (executable)
--- 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 6139716..7d7a61e 100644 (file)
--- 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 bac3c1d..dd5b763 100755 (executable)
--- 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 0613978..d862c8c 100755 (executable)
--- 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 9ddbc3c..ef3a9cc 100644 (file)
--- 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 fc653d4..87edfc9 100755 (executable)
--- 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 bf07bac..9b803ce 100755 (executable)
--- 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 9bc8caa..24131a2 100755 (executable)
--- 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 fc653d4..87edfc9 100755 (executable)
--- 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 1ea09aa..17bb1fb 100755 (executable)
--- 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 80d5836..38bc5ef 100755 (executable)
--- 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 032409e..3760c8f 100755 (executable)
--- 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 82dbf22..98c7059 100644 (file)
--- 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 ad4814f..432a906 100755 (executable)
--- 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 0e7bb46..51da7d2 100644 (file)
--- 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 a155e38..8a662d2 100755 (executable)
--- 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 ddccc98..d9b093a 100755 (executable)
--- 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 d3c9229..1a1d791 100755 (executable)
--- 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 0c2cfe1..60b6aa9 100644 (file)
--- 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 f259381..cbbb59a 100644 (file)
--- 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 3947280..5bdb6a3 100644 (file)
--- 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 0683764..4eb8b9e 100644 (file)
--- 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 12ce7c4..9561e01 100755 (executable)
--- 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 a5fb6bc..59f3a26 100755 (executable)
--- 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 63f7db7..9673306 100755 (executable)
--- 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 3de11f6..fbb8992 100755 (executable)
--- 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 bb91a4f..9e67887 100755 (executable)
--- 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 901e618..b5c7451 100644 (file)
--- 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 8d5abb6..100ada5 100755 (executable)
--- 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 25e32e8..e61dae9 100755 (executable)
--- 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 03802fe..eb8e531 100755 (executable)
--- 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 7908a5a..cac4ce4 100644 (file)
--- 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 659fbe5..ebdbf83 100755 (executable)
--- 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 4133251..83ee2d2 100644 (file)
--- 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 3349087..c860832 100644 (file)
--- 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 2bf428d..7bd4472 100644 (file)
--- 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 8a8a61b..4af9ee3 100644 (file)
--- 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 e29a2bf..7c39e93 100755 (executable)
--- 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 7a91c4e..eb845d0 100755 (executable)
--- 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 c150f54..2c63668 100755 (executable)
--- 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 eb75afe..45c86e1 100755 (executable)
--- 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 8e0fd53..264465f 100755 (executable)
--- 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 7a3abb5..1f4e6b3 100755 (executable)
--- 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 8e0fd53..264465f 100755 (executable)
--- 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 8e0fd53..264465f 100755 (executable)
--- 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 da6391d..da4503d 100755 (executable)
--- 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 910e36b..f75ebb0 100755 (executable)
--- 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 bb60fe9..f26b53c 100755 (executable)
--- 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 49d7e9b..d273344 100755 (executable)
--- 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 b36771c..71a7672 100755 (executable)
--- 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 2d8d9ce..fdfd08b 100755 (executable)
--- 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 2c58a00..a436656 100755 (executable)
--- 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 e644bf5..63b0790 100755 (executable)
--- 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 e644bf5..63b0790 100755 (executable)
--- 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 (executable)
index 8ae7eae..0000000
--- 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 3af7b08..967035b 100755 (executable)
--- 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 6bb6ba3..e6f28b2 100755 (executable)
--- 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 226b0c5..5477c27 100644 (file)
--- 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

diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp
index 8a8292a..243c931 100755 (executable)
--- a/src/bp_sim.cpp
+++ b/src/bp_sim.cpp
@@ -2882,14 +2882,6 @@ void operator >> (const YAML::Node& node, CFlowsYamlInfo & flows_info) {
        flows_info.m_mac_replace_by_ip =false;
    }
 
-   const YAML::Node& mac_info = node["mac"];
-   for(unsigned i=0;i<mac_info.size();i++) {
-       uint32_t fi;
-       const YAML::Node & node =mac_info;
-       node[i]  >> fi;
-       flows_info.m_mac_base.push_back(fi);
-   }
-
    const YAML::Node& cap_info = node["cap_info"];
    for(unsigned i=0;i<cap_info.size();i++) {
        CFlowYamlInfo fi;
@@ -2958,20 +2950,9 @@ void CFlowsYamlInfo::Dump(FILE *fd){
 
     m_vlan_info.Dump(fd);
 
-    fprintf(fd," mac base   : ");
-    int i;
-    for (i=0; i<(int)m_mac_base.size(); i++) {
-        if (i< (int)(m_mac_base.size()-1) ) {
-            fprintf(fd,"0x%02x,",m_mac_base[i]);
-        }else{
-            fprintf(fd,"0x%02x",m_mac_base[i]);
-        }
-    }
-    fprintf(fd,"\n");
-
     fprintf(fd," cap file info \n");
     fprintf(fd," ------------- \n");
-    for (i=0; i<(int)m_vec.size(); i++) {
+    for (int i=0; i<(int)m_vec.size(); i++) {
         m_vec[i].Dump(fd);
     }
     m_tw.Dump(fd);
@@ -5081,11 +5062,6 @@ int CFlowGenList::load_from_yaml(std::string file_name,
     }
     CGlobalInfo::m_options.preview.set_mac_ip_overide_enable(m_yaml_info.m_mac_replace_by_ip);
 
-    if ( m_yaml_info.m_mac_base.size() != 6 ){
-        printf(" mac addr is not valid \n");
-        exit(0);
-    }
-
     if (m_yaml_info.m_ipv6_set == true) {
         // Copy the most significant 96-bits from yaml data
         for (idx=0; idx<6; idx++){

diff --git a/src/bp_sim.h b/src/bp_sim.h
index 53ff33e..8c882c5 100755 (executable)
--- a/src/bp_sim.h
+++ b/src/bp_sim.h
@@ -3643,9 +3643,6 @@ inline CFlowPktInfo * CCapFileFlowInfo::GetPacket(uint32_t index){
 struct CFlowsYamlInfo {
 public:
     double          m_duration_sec;    //duration in sec for the cap file
-
-// IPv4 addressing
-
 // IPv6 addressing
     std::vector     <uint16_t> m_src_ipv6;
     std::vector     <uint16_t> m_dst_ipv6;
@@ -3671,12 +3668,7 @@ public:
     CVlanYamlInfo   m_vlan_info;
     CTupleGenYamlInfo m_tuple_gen;
     bool              m_tuple_gen_was_set;
-
-
-    std::vector     <uint8_t> m_mac_base;
-
     std::vector     <CFlowYamlInfo> m_vec;
-
     bool            m_is_plugin_configured; /* any plugin  is configured */
 
     CTimerWheelYamlInfo         m_tw;