Merge branch 'trex-173' of git://github.com/wofanli/trex-core into wofanli-trex-173

12 files changed, 4 insertions, 17 deletions

diff --git a/scripts/avl/sfr_branch_profile_delay_10.yaml b/scripts/avl/sfr_branch_profile_delay_10.yaml
index 04671b3e..1d7e92a0 100755
--- a/scripts/avl/sfr_branch_profile_delay_10.yaml
+++ b/scripts/avl/sfr_branch_profile_delay_10.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 100
-  one_app_server : false 
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 432.576 
diff --git a/scripts/avl/sfr_delay_10.yaml b/scripts/avl/sfr_delay_10.yaml
index 2bb70fe4..71be2101 100755
--- a/scripts/avl/sfr_delay_10.yaml
+++ b/scripts/avl/sfr_delay_10.yaml
@@ -17,7 +17,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 102.0
diff --git a/scripts/avl/sfr_delay_10_1g.yaml b/scripts/avl/sfr_delay_10_1g.yaml
index 065fe855..5aa9dbea 100755
--- a/scripts/avl/sfr_delay_10_1g.yaml
+++ b/scripts/avl/sfr_delay_10_1g.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   #wlength    : 107
-  #one_app_server : false
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 404.52
diff --git a/scripts/avl/sfr_delay_10_1g_asa_nat.yaml b/scripts/avl/sfr_delay_10_1g_asa_nat.yaml
index 5fbd0af1..d40a28ca 100755
--- a/scripts/avl/sfr_delay_10_1g_asa_nat.yaml
+++ b/scripts/avl/sfr_delay_10_1g_asa_nat.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 404.52
diff --git a/scripts/avl/sfr_delay_10_1g_no_bundeling.yaml b/scripts/avl/sfr_delay_10_1g_no_bundeling.yaml
index 361d32cc..241504a2 100755
--- a/scripts/avl/sfr_delay_10_1g_no_bundeling.yaml
+++ b/scripts/avl/sfr_delay_10_1g_no_bundeling.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 404.52
diff --git a/scripts/avl/sfr_delay_10_no_bundeling.yaml b/scripts/avl/sfr_delay_10_no_bundeling.yaml
index 8374eab4..607259f8 100755
--- a/scripts/avl/sfr_delay_10_no_bundeling.yaml
+++ b/scripts/avl/sfr_delay_10_no_bundeling.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info : 
      - name: avl/delay_10_http_get_0.pcap
        cps : 102.0
diff --git a/scripts/avl/sfr_delay_50_tunnel_no_bundeling.yaml b/scripts/avl/sfr_delay_50_tunnel_no_bundeling.yaml
index cd8e3c64..3b8a7e27 100755
--- a/scripts/avl/sfr_delay_50_tunnel_no_bundeling.yaml
+++ b/scripts/avl/sfr_delay_50_tunnel_no_bundeling.yaml
@@ -15,7 +15,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info : 
      - name: avl/_tun_http_get_0_fixed.pcap
        cps : 102.0
diff --git a/scripts/cap2/dns_single_server.yaml b/scripts/cap2/dns_single_server.yaml
index e2513484..0613978a 100755
--- a/scripts/cap2/dns_single_server.yaml
+++ b/scripts/cap2/dns_single_server.yaml
@@ -13,7 +13,6 @@
   #cap_ipg    : true
   #cap_ipg_min    : 100
   #cap_override_ipg    : 200
-  one_app_server : true
   wlength    : 7
   mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
diff --git a/scripts/cap2/dns_wlen2.yaml b/scripts/cap2/dns_wlen2.yaml
index 5488ae8e..9bc8caae 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
-  one_app_server : true
   mac        : [0x00,0x00,0x00,0x01,0x00,0x00]
   cap_info : 
      - name: cap2/dns.pcap
diff --git a/scripts/cap2/lb_ex1.yaml b/scripts/cap2/lb_ex1.yaml
index ea7c38e7..8d5abb61 100755
--- a/scripts/cap2/lb_ex1.yaml
+++ b/scripts/cap2/lb_ex1.yaml
@@ -12,7 +12,6 @@
           udp_aging      : 0
   mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
   cap_ipg    : true
-  one_app_server : false
   cap_info : 
      - name: avl/delay_10_https_0.pcap
        cps : 33.0
diff --git a/scripts/cap2/nat_test.yaml b/scripts/cap2/nat_test.yaml
index d4fdc7db..659fbe55 100755
--- a/scripts/cap2/nat_test.yaml
+++ b/scripts/cap2/nat_test.yaml
@@ -16,7 +16,6 @@
   #cap_ipg_min    : 30
   #cap_override_ipg    : 200
   wlength    : 107
-  one_app_server : false
   cap_info :
      - name: avl/delay_10_video_call_0.pcap
        cps : 30
diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp
index a7fadf93..bb1eb073 100755
--- a/src/bp_sim.cpp
+++ b/src/bp_sim.cpp
@@ -2615,13 +2615,11 @@ void operator >> (const YAML::Node& node, CFlowsYamlInfo & flows_info) {
    }
 
    if (node.FindValue("one_app_server")) {
-       node["one_app_server"] >> flows_info.m_one_app_server;
-       flows_info.m_one_app_server_was_set=true;
-   }else{
-       flows_info.m_one_app_server =false;
-       flows_info.m_one_app_server_was_set=false;
+       printf("one_app_server should be configured per template. \n"
+              "Will ignore this configuration\n");
    }
-
+   flows_info.m_one_app_server =false;
+   flows_info.m_one_app_server_was_set=false;
 
    if (node.FindValue("vlan")) {
        node["vlan"] >> flows_info.m_vlan_info;