Merge "Update tests to run on 9.0"

This commit is contained in:
Jenkins 2016-03-22 15:26:24 +00:00 committed by Gerrit Code Review
commit 6f2b85249b
3 changed files with 12 additions and 11 deletions

2
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "plugin_test/fuel-qa"]
path = plugin_test/fuel-qa
url = https://github.com/openstack/fuel-qa
branch = stable/8.0
branch = master

@ -1 +1 @@
Subproject commit b54b6a58d8d8148d5a434dbf596baa1b0f23e1a5
Subproject commit 207f06ecf11ebe41d090ebb5232a815a3418e87b

View File

@ -21,8 +21,8 @@ from devops.error import TimeoutError
from devops.helpers.helpers import wait
from fuelweb_test import logger
from fuelweb_test.helpers import checkers
from fuelweb_test.helpers import os_actions
from fuelweb_test.helpers import utils
from fuelweb_test.helpers.common import Common
from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE
@ -43,9 +43,9 @@ class TestNSXvPlugin(TestBasic):
_common = None
plugin_name = 'nsxv'
plugin_version = '2.0.0'
plugin_version = '3.0.0'
NSXV_PLUGIN_PATH = os.environ.get('NSXV_PLUGIN_PATH')
nsxv_plugin_path = os.environ.get('NSXV_PLUGIN_PATH')
nsxv_manager_ip = os.environ.get('NSXV_MANAGER_IP')
nsxv_insecure = True if os.environ.get(
'NSXV_INSECURE') == 'true' else False
@ -82,13 +82,14 @@ class TestNSXvPlugin(TestBasic):
def install_nsxv_plugin(self):
"""Install plugin on fuel node."""
admin_remote = self.env.d_env.get_admin_remote()
utils.upload_tarball(
ip=self.ssh_manager.admin_ip,
tar_path=self.nsxv_plugin_path,
tar_target='/var')
checkers.upload_tarball(admin_remote, self.NSXV_PLUGIN_PATH, "/var")
checkers.install_plugin_check_code(admin_remote,
plugin=os.path.
basename(self.NSXV_PLUGIN_PATH))
utils.install_plugin_check_code(
ip=self.ssh_manager.admin_ip,
plugin=os.path.basename(self.nsxv_plugin_path))
def enable_plugin(self, cluster_id):
"""Fill the necessary fields with required values.