Removed unnecessary image definitions and flavor names.

Change-Id: I13464d997ff9aba09a6cff7d3ff62f29df770a38
Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>

diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 6fe8266..3c92e87 100644 (file)
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   flavor:
-    name: yardstick-dpdk-flavor
     vcpus: 10
     ram: 20480
     disk: 4
@@ -60,11 +59,9 @@ context:
     vnf:
       floating_ip: true
       placement: "pgrp1"
-      image: yardstick-vnfs
     trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
-      image: yardstick-trex
   networks:
     mgmt:
       cidr: '10.0.1.0/24'

diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 56d26be..516c727 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -43,7 +43,6 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   flavor:
-    name: yardstick-dpdk-flavor
     vcpus: 10
     ram: 20480
     disk: 4

diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 2e7ef3d..82e89a2 100644 (file)
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   flavor:
-    name: yardstick-dpdk-flavor
     vcpus: 10
     ram: 20480
     disk: 4