Merge "Cleanup of redundant files from Prox directory"

6 files changed, 0 insertions, 240 deletions

diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
deleted file mode 100644
index 1238ed41c..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_1rule.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_storage.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
deleted file mode 100644
index 059a6502f..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_1rule.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_voice.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
deleted file mode 100644
index b6aa48a0e..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_1rule.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_video.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
deleted file mode 100644
index baa4b5997..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_worstcaserules.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_storage.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
deleted file mode 100644
index 590150602..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_worstcaserules.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_voice.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
deleted file mode 100644
index 517dd9024..000000000
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright 2012 - 2016 Intel Corporation All Rights Reserved.
-# deepak.s@intel.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
-  topology: ../../acl-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
-  tc_options:
-    rfc2544:
-      allowed_drop_rate: 0.8 - 1
-  options:
-    acl:
-      rules: ../../acl_worstcaserules.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-  runner:
-    type: Duration
-    duration: 400
-    interval: 35
-  traffic_options:
-    flow: "../../../../traffic_profiles/ipv4_1flow_Packets.yaml"
-    imix: "../../../../traffic_profiles/imix_video.yaml"
-context:
-  type: Node-sriov
-  name: yardstick
-  nfvi_type: sriov
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_sriov.yaml