Merge "DRAFT: remove apexlake"

4 files changed, 0 insertions, 205 deletions

diff --git a/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation.py b/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation.py
deleted file mode 100644
index 07b3da992..000000000
--- a/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# 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
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.networking.iperf3.Iperf
-
-from __future__ import absolute_import
-import unittest
-
-from yardstick.benchmark.scenarios.networking import \
-    vtc_instantiation_validation
-
-
-class VtcInstantiationValidationTestCase(unittest.TestCase):
-
-    def setUp(self):
-        scenario = dict()
-        scenario['options'] = dict()
-        scenario['options']['default_net_name'] = ''
-        scenario['options']['default_subnet_name'] = ''
-        scenario['options']['vlan_net_1_name'] = ''
-        scenario['options']['vlan_subnet_1_name'] = ''
-        scenario['options']['vlan_net_2_name'] = ''
-        scenario['options']['vlan_subnet_2_name'] = ''
-        scenario['options']['vnic_type'] = ''
-        scenario['options']['vtc_flavor'] = ''
-        scenario['options']['packet_size'] = ''
-        scenario['options']['vlan_sender'] = ''
-        scenario['options']['vlan_receiver'] = ''
-
-        self.vt = vtc_instantiation_validation.VtcInstantiationValidation(
-            scenario, '')
-
-    def test_run_for_success(self):
-        result = {}
-        self.vt.run(result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation_noisy.py b/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation_noisy.py
deleted file mode 100644
index 34f3610b1..000000000
--- a/tests/unit/benchmark/scenarios/networking/test_vtc_instantiation_validation_noisy.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# 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
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.networking.iperf3.Iperf
-
-from __future__ import absolute_import
-import unittest
-
-from yardstick.benchmark.scenarios.networking import \
-    vtc_instantiation_validation_noisy
-
-
-class VtcInstantiationValidationiNoisyTestCase(unittest.TestCase):
-
-    def setUp(self):
-        scenario = dict()
-        scenario['options'] = dict()
-        scenario['options']['default_net_name'] = ''
-        scenario['options']['default_subnet_name'] = ''
-        scenario['options']['vlan_net_1_name'] = ''
-        scenario['options']['vlan_subnet_1_name'] = ''
-        scenario['options']['vlan_net_2_name'] = ''
-        scenario['options']['vlan_subnet_2_name'] = ''
-        scenario['options']['vnic_type'] = ''
-        scenario['options']['vtc_flavor'] = ''
-        scenario['options']['packet_size'] = ''
-        scenario['options']['vlan_sender'] = ''
-        scenario['options']['vlan_receiver'] = ''
-        scenario['options']['num_of_neighbours'] = '1'
-        scenario['options']['amount_of_ram'] = '1G'
-        scenario['options']['number_of_cores'] = '1'
-
-        self.vt = \
-            vtc_instantiation_validation_noisy.VtcInstantiationValidationNoisy(
-                scenario, '')
-
-    def test_run_for_success(self):
-        result = {}
-        self.vt.run(result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/networking/test_vtc_throughput.py b/tests/unit/benchmark/scenarios/networking/test_vtc_throughput.py
deleted file mode 100644
index a73fad5a8..000000000
--- a/tests/unit/benchmark/scenarios/networking/test_vtc_throughput.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# 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
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.networking.iperf3.Iperf
-
-from __future__ import absolute_import
-import mock
-import unittest
-
-from yardstick.benchmark.scenarios.networking import vtc_throughput
-
-
-class VtcThroughputTestCase(unittest.TestCase):
-
-    def setUp(self):
-        scenario = dict()
-        scenario['options'] = dict()
-        scenario['options']['default_net_name'] = ''
-        scenario['options']['default_subnet_name'] = ''
-        scenario['options']['vlan_net_1_name'] = ''
-        scenario['options']['vlan_subnet_1_name'] = ''
-        scenario['options']['vlan_net_2_name'] = ''
-        scenario['options']['vlan_subnet_2_name'] = ''
-        scenario['options']['vnic_type'] = ''
-        scenario['options']['vtc_flavor'] = ''
-        scenario['options']['packet_size'] = ''
-        scenario['options']['vlan_sender'] = ''
-        scenario['options']['vlan_receiver'] = ''
-
-        self.vt = vtc_throughput.VtcThroughput(scenario, '')
-
-    def test_run_for_success(self):
-        result = {}
-        self.vt.run(result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/networking/test_vtc_throughput_noisy_test.py b/tests/unit/benchmark/scenarios/networking/test_vtc_throughput_noisy_test.py
deleted file mode 100644
index e1b162c79..000000000
--- a/tests/unit/benchmark/scenarios/networking/test_vtc_throughput_noisy_test.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# 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
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.networking.iperf3.Iperf
-
-from __future__ import absolute_import
-import mock
-import unittest
-
-from yardstick.benchmark.scenarios.networking import vtc_throughput_noisy
-
-
-class VtcThroughputNoisyTestCase(unittest.TestCase):
-
-    def setUp(self):
-        scenario = dict()
-        scenario['options'] = dict()
-        scenario['options']['default_net_name'] = ''
-        scenario['options']['default_subnet_name'] = ''
-        scenario['options']['vlan_net_1_name'] = ''
-        scenario['options']['vlan_subnet_1_name'] = ''
-        scenario['options']['vlan_net_2_name'] = ''
-        scenario['options']['vlan_subnet_2_name'] = ''
-        scenario['options']['vnic_type'] = ''
-        scenario['options']['vtc_flavor'] = ''
-        scenario['options']['packet_size'] = ''
-        scenario['options']['vlan_sender'] = ''
-        scenario['options']['vlan_receiver'] = ''
-        scenario['options']['num_of_neighbours'] = '1'
-        scenario['options']['amount_of_ram'] = '1G'
-        scenario['options']['number_of_cores'] = '1'
-
-        self.vt = vtc_throughput_noisy.VtcThroughputNoisy(scenario, '')
-
-    def test_run_for_success(self):
-        result = {}
-        self.vt.run(result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()