Merge "Add option to pass config file to vPE"

[yardstick.git] / samples / vnf_samples / nsut / vpe / tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml

diff --git a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
index 2382e02..39aea13 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_vpe.yaml
   topology: vpe_vnf_topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf__0.yardstick
   options:
     framesize:
@@ -34,7 +34,9 @@ scenarios:
       allowed_drop_rate: 0.0001 - 0.0001
     vnf__0:
       nfvi_enable: True
-      vnf_config: vpe_config
+      vnf_config: {file: './vpe_config/vpe_config_2_ports',
+                   action_bulk_file: './vpe_config/action_bulk_512.txt',
+                   full_tm_profile_file: './vpe_config/full_tm_profile_10G.cfg'}
   runner:
     type: Iteration
     iterations: 10
@@ -42,7 +44,7 @@ scenarios:
 contexts:
    - name: yardstick
      type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
+     file: /etc/yardstick/nodes/standalone/trex_bm.yaml
    - type: StandaloneOvsDpdk
      name: yardstick
      file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
@@ -59,8 +61,8 @@ contexts:
        vpath: "/usr/local"
 
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 16364
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 20480
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 7