Add neutron jobs to certification task arguments

Also minor issues fixed:
 - add neutron quota info only if neutron service is available
 - add missing task args to test command

Change-Id: If514dea99f2e7e6d0d09d097b8e2e8886abaf4d5
This commit is contained in:
Sergey Skripnick 2015-10-14 21:42:03 +02:00
parent e13ab7142f
commit 2064ea7239
3 changed files with 9 additions and 3 deletions

View File

@ -80,14 +80,16 @@
{%- endmacro %}
{%- macro unlimited_neutron() %}
{% if "neutron" in service_list %}
neutron:
network: -1
port: -1
subnet: -1
{% endif %}
{%- endmacro %}
{%- macro glance_args(location, container="bare", type="qcow2") %}
image_container: {{ container }}
image_type: {{ type }}
image_location: {{ location }}
{%- endmacro %}
{%- endmacro %}

View File

@ -2,6 +2,7 @@
service_list:
- authentication
- nova
- neutron
- keystone
- cinder
- glance

View File

@ -27,10 +27,13 @@ class TestCertificationTask(unittest.TestCase):
rally = utils.Rally()
full_path = os.path.join(
os.path.dirname(__file__), os.pardir, os.pardir,
"certification", "openstack", "task.yaml")
"certification", "openstack")
task_path = os.path.join(full_path, "task.yaml")
args_path = os.path.join(full_path, "task_arguments.yaml")
try:
rally("task validate --task %s" % full_path)
rally("task validate --task %s --task-args-file %s" % (task_path,
args_path))
except Exception:
print(traceback.format_exc())
self.assertTrue(False, "Wrong task config %s" % full_path)