X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2Flib%2Fopenstack%2Ffixtures.py;h=5b654a98edf283ba7b6306d8d40abebdf84e88c6;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=7c1ec7f53ea6e4b575853c49338d592e7db51b1d;hpb=08f042835a504f0bafe1cb83fc8f5008502ade78;p=osm%2Fdevops.git diff --git a/systest/lib/openstack/fixtures.py b/systest/lib/openstack/fixtures.py index 7c1ec7f5..5b654a98 100644 --- a/systest/lib/openstack/fixtures.py +++ b/systest/lib/openstack/fixtures.py @@ -23,16 +23,18 @@ def openstack_add_options(parser): parser.addoption("--os-username", default="", help="openstack username") parser.addoption("--os-password", default="", help="openstack password") parser.addoption("--os-project-name", default="", help="openstack project name") + parser.addoption("--vim-config", default="", help="vim/openstack specific configuration") @pytest.fixture def openstack(request): from lib.openstack import openstack access = {} - access['os-url'] = request.config.getoption("--os-url") - access['os-username'] = request.config.getoption("--os-username") - access['os-password'] = request.config.getoption("--os-password") - access['os-project-name'] = request.config.getoption("--os-project-name") + access['vim-url'] = request.config.getoption("--os-url") + access['vim-username'] = request.config.getoption("--os-username") + access['vim-password'] = request.config.getoption("--os-password") + access['vim-tenant-name'] = request.config.getoption("--os-project-name") access['vim-type'] = 'openstack' access['description'] = 'pytest system test' + access['config'] = request.config.getoption("--vim-config") return openstack.Openstack(access)