Merge "Cleanup of redundant files from Prox directory"

7 files changed, 0 insertions, 314 deletions

diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
deleted file mode 100644
index 73fea8122..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: "yardstick:task:0.1"
-
-scenarios:
--
-  type: NSPerf
-  traffic_profile: ../../../../traffic_profiles/http_tests/FileSize-1K_Requests-1M_Concurrency-100.yaml
-  topology: ../../acl-tg-topology-http.yaml
-
-  nodes:
-    vnf__0: vnf.yardstick
-    tg__0: trafficgen_1.yardstick
-    tg__1: trafficgen_2.yardstick
-
-  options:
-    acl:
-      rules: ../../acl_rules.yaml
-      cfg: "../../acl_config"
-      script: "../../acl_script"
-
-  runner:
-    type: Duration
-    duration: 2
-
-context:
-  type: Node-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
deleted file mode 100644
index 0ca0005b2..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
deleted file mode 100644
index d51b42f84..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
deleted file mode 100644
index 37da8e6c7..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
deleted file mode 100644
index cbe3e97ae..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
deleted file mode 100644
index 707b46e7f..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
deleted file mode 100644
index b1003df3d..000000000
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-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-ovs
-  name: yardstick
-  nfvi_type: ovs
-  vm_deploy: True
-  file: /etc/yardstick/nodes/pod_ovs.yaml