aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/infra_deploy.yml1
-rw-r--r--ansible/roles/create_samplevnfs_image/tasks/main.yml2
-rw-r--r--ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml48
-rw-r--r--ansible/roles/infra_destroy_previous_configuration/tasks/main.yml47
-rwxr-xr-xsetup.py1
-rw-r--r--tests/unit/benchmark/scenarios/test_base.py53
-rwxr-xr-xtools/virt_ci_rampup.sh2
-rw-r--r--yardstick/benchmark/scenarios/base.py36
8 files changed, 175 insertions, 15 deletions
diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 10f53fbad..948dd338a 100644
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -16,3 +16,4 @@
roles:
- infra_check_requirements
+ - infra_destroy_previous_configuration
diff --git a/ansible/roles/create_samplevnfs_image/tasks/main.yml b/ansible/roles/create_samplevnfs_image/tasks/main.yml
index c83cccab5..ab7371a12 100644
--- a/ansible/roles/create_samplevnfs_image/tasks/main.yml
+++ b/ansible/roles/create_samplevnfs_image/tasks/main.yml
@@ -19,6 +19,6 @@
is_public: yes
disk_format: qcow2
container_format: bare
- filename: "{{ raw_imgfile }}"
+ filename: "{{ imgfile }}"
properties:
hw_vif_multiqueue_enabled: true
diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
new file mode 100644
index 000000000..314ee30af
--- /dev/null
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
@@ -0,0 +1,48 @@
+# Copyright (c) 2017-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.
+# 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.
+---
+- name: Destroy old networks created by virt
+ virt_net:
+ name: "{{ network_item.name }}"
+ command: destroy
+ when: network_item.name in virt_nets.list_nets
+
+# Ignoring erros as network can be created without being defined.
+# This can happen if a user manually creates a network using the virsh command.
+# If the network is not defined the undefine code will throw an error.
+- name: Undefine old networks defined by virt
+ virt_net:
+ name: "{{ network_item.name }}"
+ command: undefine
+ when: network_item.name in virt_nets.list_nets
+ ignore_errors: yes
+
+- name: Check if "ovs-vsctl" command is present
+ command: which ovs-vsctl
+ register: ovs_vsctl_present
+ ignore_errors: yes
+
+- name: Destroy OVS bridge if it exists
+ command: ovs-vsctl --if-exists -- del-br "{{ network_item.name }}"
+ when: ovs_vsctl_present.rc == 0
+
+- name: Check if linux bridge is present
+ stat: path="{{ '/sys/class/net/'+network_item.name+'/brif/' }}"
+ register: check_linux_bridge
+
+- name: Remove linux bridge if it exists
+ shell: |
+ ifconfig "{{ network_item.name }}" down
+ brctl delbr "{{ network_item.name }}"
+ when: check_linux_bridge.stat.exists
diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
new file mode 100644
index 000000000..5595cd501
--- /dev/null
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
@@ -0,0 +1,47 @@
+# Copyright (c) 2017-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.
+# 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.
+---
+- name: Include
+ include_vars:
+ file: "{{ rs_file }}"
+ name: infra_deploy_vars
+
+- name: List virt-nets
+ virt_net: command=list_nets
+ register: virt_nets
+
+- name: List VMs
+ virt: command=list_vms
+ register: virt_vms
+
+- name: Destroy old VMs
+ virt:
+ command: destroy
+ name: "{{ item.hostname }}"
+ when: item.hostname in virt_vms.list_vms
+ with_items: "{{ infra_deploy_vars.nodes }}"
+
+- name: Undefine old VMs
+ virt:
+ command: undefine
+ name: "{{ item.hostname }}"
+ when: item.hostname in virt_vms.list_vms
+ with_items: "{{ infra_deploy_vars.nodes }}"
+
+- name: Delete old networks
+ include_tasks: delete_network.yml
+ extra_vars: "{{ virt_nets }}"
+ loop_control:
+ loop_var: network_item
+ with_items: "{{ infra_deploy_vars.networks }}"
diff --git a/setup.py b/setup.py
index 7f6571d61..881ef9272 100755
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ setup(
'yardstick=yardstick.main:main',
'yardstick-plot=yardstick.plot.plotter:main [plot]'
],
+ 'yardstick.scenario': []
},
scripts=[
'tools/yardstick-img-modify',
diff --git a/tests/unit/benchmark/scenarios/test_base.py b/tests/unit/benchmark/scenarios/test_base.py
index 78e342978..a95e6bc86 100644
--- a/tests/unit/benchmark/scenarios/test_base.py
+++ b/tests/unit/benchmark/scenarios/test_base.py
@@ -51,3 +51,56 @@ class ScenarioTestCase(unittest.TestCase):
pass
self.assertEqual(str(None), DummyScenario.get_description())
+
+ def test_get_types(self):
+ scenario_names = set(
+ scenario.__scenario_type__ for scenario in
+ base.Scenario.get_types() if hasattr(scenario,
+ '__scenario_type__'))
+ existing_scenario_class_names = {
+ 'Iperf3', 'CACHEstat', 'SpecCPU2006', 'Dummy', 'NSPerf', 'Parser'}
+ self.assertTrue(existing_scenario_class_names.issubset(scenario_names))
+
+ def test_get_cls_existing_scenario(self):
+ scenario_name = 'NSPerf'
+ scenario = base.Scenario.get_cls(scenario_name)
+ self.assertEqual(scenario_name, scenario.__scenario_type__)
+
+ def test_get_cls_non_existing_scenario(self):
+ wrong_scenario_name = 'Non-existing-scenario'
+ with self.assertRaises(RuntimeError) as exc:
+ base.Scenario.get_cls(wrong_scenario_name)
+ self.assertEqual('No such scenario type %s' % wrong_scenario_name,
+ str(exc.exception))
+
+ def test_get_existing_scenario(self):
+ scenario_name = 'NSPerf'
+ scenario_module = ('yardstick.benchmark.scenarios.networking.'
+ 'vnf_generic.NetworkServiceTestCase')
+ self.assertEqual(scenario_module, base.Scenario.get(scenario_name))
+
+ def test_get_non_existing_scenario(self):
+ wrong_scenario_name = 'Non-existing-scenario'
+ with self.assertRaises(RuntimeError) as exc:
+ base.Scenario.get(wrong_scenario_name)
+ self.assertEqual('No such scenario type %s' % wrong_scenario_name,
+ str(exc.exception))
+
+
+class IterScenarioClassesTestCase(unittest.TestCase):
+
+ def test_no_scenario_type_defined(self):
+ some_existing_scenario_class_names = [
+ 'Iperf3', 'CACHEstat', 'SpecCPU2006', 'Dummy', 'NSPerf', 'Parser']
+ scenario_types = [scenario.__scenario_type__ for scenario
+ in base._iter_scenario_classes()]
+ for class_name in some_existing_scenario_class_names:
+ self.assertIn(class_name, scenario_types)
+
+ def test_scenario_type_defined(self):
+ some_existing_scenario_class_names = [
+ 'Iperf3', 'CACHEstat', 'SpecCPU2006', 'Dummy', 'NSPerf', 'Parser']
+ for class_name in some_existing_scenario_class_names:
+ scenario_class = next(base._iter_scenario_classes(
+ scenario_type=class_name))
+ self.assertEqual(class_name, scenario_class.__scenario_type__)
diff --git a/tools/virt_ci_rampup.sh b/tools/virt_ci_rampup.sh
index 210e6ed40..6a9f2e7cb 100755
--- a/tools/virt_ci_rampup.sh
+++ b/tools/virt_ci_rampup.sh
@@ -16,6 +16,6 @@
ANSIBLE_SCRIPTS="${0%/*}/../ansible"
cd ${ANSIBLE_SCRIPTS} &&\
-ansible-playbook \
+sudo -EH ansible-playbook \
-e rs_file='../etc/infra/infra_deploy.yaml' \
-i inventory.ini infra_deploy.yml
diff --git a/yardstick/benchmark/scenarios/base.py b/yardstick/benchmark/scenarios/base.py
index 7af85834c..10a728828 100644
--- a/yardstick/benchmark/scenarios/base.py
+++ b/yardstick/benchmark/scenarios/base.py
@@ -16,20 +16,34 @@
# yardstick comment: this is a modified copy of
# rally/rally/benchmark/scenarios/base.py
-""" Scenario base class
-"""
+from stevedore import extension
-from __future__ import absolute_import
import yardstick.common.utils as utils
+def _iter_scenario_classes(scenario_type=None):
+ """Generator over all 'Scenario' subclasses
+
+ This function will iterate over all 'Scenario' subclasses defined in this
+ project and will load any class introduced by any installed plugin project,
+ defined in 'entry_points' section, under 'yardstick.scenarios' subsection.
+ """
+ extension.ExtensionManager(namespace='yardstick.scenarios',
+ invoke_on_load=False)
+ for scenario in utils.itersubclasses(Scenario):
+ if not scenario_type:
+ yield scenario
+ elif getattr(scenario, '__scenario_type__', None) == scenario_type:
+ yield scenario
+
+
class Scenario(object):
def setup(self):
""" default impl for scenario setup """
pass
- def run(self, args):
+ def run(self, *args):
""" catcher for not implemented run methods in subclasses """
raise RuntimeError("run method not implemented")
@@ -41,16 +55,15 @@ class Scenario(object):
def get_types():
"""return a list of known runner type (class) names"""
scenarios = []
- for scenario in utils.itersubclasses(Scenario):
+ for scenario in _iter_scenario_classes():
scenarios.append(scenario)
return scenarios
@staticmethod
def get_cls(scenario_type):
"""return class of specified type"""
- for scenario in utils.itersubclasses(Scenario):
- if scenario_type == scenario.__scenario_type__:
- return scenario
+ for scenario in _iter_scenario_classes(scenario_type):
+ return scenario
raise RuntimeError("No such scenario type %s" % scenario_type)
@@ -58,11 +71,8 @@ class Scenario(object):
def get(scenario_type):
"""Returns instance of a scenario runner for execution type.
"""
- for scenario in utils.itersubclasses(Scenario):
- if scenario_type == scenario.__scenario_type__:
- return scenario.__module__ + "." + scenario.__name__
-
- raise RuntimeError("No such scenario type %s" % scenario_type)
+ scenario = Scenario.get_cls(scenario_type)
+ return scenario.__module__ + "." + scenario.__name__
@classmethod
def get_scenario_type(cls):