Merge "Change tc_trex files to execute standalone tests"

9 files changed, 53 insertions, 53 deletions

diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 00bd186ee..e62425ad7 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_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.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf__0.yardstick
   options:
     framesize:
@@ -42,10 +42,10 @@ 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/host_ovs.yaml
+     file: /etc/yardstick/nodes/standalone/host_ovs.yaml
      vm_deploy: True
      ovs_properties:
        version:
@@ -62,7 +62,7 @@ contexts:
 
      flavor:
        images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
-       ram: 4096
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 6
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 8b3241620..77df5b18c 100644
--- a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_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,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf__0.yardstick
   options:
     framesize:
       uplink: {64B: 100}
@@ -42,14 +42,14 @@ scenarios:
 contexts:
    - name: yardstick
      type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
+     file: /etc/yardstick/nodes/standalone/trex_bm.yaml
    - type: StandaloneSriov
      file: /etc/yardstick/nodes/standalone/host_sriov.yaml
      name: yardstick
      vm_deploy: True
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 6
@@ -57,7 +57,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf:
+       vnf__0:
          network_ports:
            mgmt:
              cidr: '1.1.1.61/24'
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
index 52becd3c6..170b2c539 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/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_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf__0.yardstick
   options:
     framesize:
@@ -42,7 +42,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 +59,8 @@ contexts:
        vpath: "/usr/local"
 
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 7
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
index ec517bbef..523cb2eb3 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_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,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf__0.yardstick
   options:
     framesize:
       uplink: {64B: 100}
@@ -42,14 +42,14 @@ scenarios:
 contexts:
    - name: yardstick
      type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
+     file: /etc/yardstick/nodes/standalone/trex_bm.yaml
    - type: StandaloneSriov
      file: /etc/yardstick/nodes/standalone/host_sriov.yaml
      name: yardstick
      vm_deploy: True
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 7
@@ -57,7 +57,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf:
+       vnf__0:
          network_ports:
            mgmt:
              cidr: '1.1.1.61/24'
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
index bea9c8261..86c8f6ea8 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/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.yaml
   topology: udp_replay-vnf-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf__0.yardstick
   options:
     framesize:
@@ -41,7 +41,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
@@ -58,8 +58,8 @@ contexts:
        vpath: "/usr/local"
 
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 7
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
index 0867d6b51..f9bc8119e 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_sriov_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,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: udp_replay-vnf-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf__0.yardstick
   options:
     framesize:
       uplink: {64B: 100}
@@ -41,14 +41,14 @@ scenarios:
 contexts:
    - name: yardstick
      type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
+     file: /etc/yardstick/nodes/standalone/trex_bm.yaml
    - type: StandaloneSriov
      file: /etc/yardstick/nodes/standalone/host_sriov.yaml
      name: yardstick
      vm_deploy: True
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 7
@@ -56,7 +56,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf:
+       vnf__0:
          network_ports:
            mgmt:
              cidr: '1.1.1.61/24'
diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 6b9ccb111..4aeadc6db 100644
--- a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_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.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf__0.yardstick
   options:
     framesize:
@@ -42,7 +42,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 +59,8 @@ contexts:
        vpath: "/usr/local"
 
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 6
diff --git a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 0f1560183..221ead4f9 100644
--- a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_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,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__0: tg__0.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf__0.yardstick
   options:
     framesize:
       uplink: {64B: 100}
@@ -42,14 +42,14 @@ scenarios:
 contexts:
    - name: yardstick
      type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
+     file: /etc/yardstick/nodes/standalone/trex_bm.yaml
    - type: StandaloneSriov
      file: /etc/yardstick/nodes/standalone/host_sriov.yaml
      name: yardstick
      vm_deploy: True
      flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
+       images: "/var/lib/libvirt/images/yardstick-nsb-image.img"
+       ram: 16384
        extra_specs:
          hw:cpu_sockets: 1
          hw:cpu_cores: 6
@@ -57,7 +57,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf:
+       vnf__0:
          network_ports:
            mgmt:
              cidr: '1.1.1.61/24'
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 2382e0292..ce239808e 100644
--- 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:
@@ -42,7 +42,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 +59,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