openstack/fuel-qa
Code Issues Proposed changes

Fix for enable DVS plugin

Browse Source 
Change-Id: Ie5c0556f919f517b8d370bdda47c8e84e2f03631
Closes-bug: #1577686
This commit is contained in:
Ilya Bumarskov 2016-05-03 11:19:32 +03:00
parent 0744ad1867
commit 892ac13cbf
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
system_test/actions/vcenter_actions.py
View File

@ -34,27 +34,6 @@ class VMwareActions(object):
plugin_version = None plugin_version = None
@deferred_decorator([make_snapshot_if_step_fail])
@action
def enable_plugin(self):
"""Enable plugin for Fuel"""
assert_true(self.plugin_name, "plugin_name is not specified")
msg = "Plugin couldn't be enabled. Check plugin version. Test aborted"
assert_true(
self.fuel_web.check_plugin_exists(
self.cluster_id,
self.plugin_name),
msg)
plugin_data = self.fuel_web.get_plugin_data(self.cluster_id,
self.plugin_name,
self.plugin_version)
options = {'metadata/enabled': True,
'metadata/chosen_id': plugin_data['metadata']['plugin_id']}
self.fuel_web.update_plugin_data(self.cluster_id,
self.plugin_name, options)
@deferred_decorator([make_snapshot_if_step_fail]) @deferred_decorator([make_snapshot_if_step_fail])
@action @action
def configure_dvs_plugin(self): def configure_dvs_plugin(self):
@ -76,7 +55,8 @@ class VMwareActions(object):
'dvswitch_name'] 'dvswitch_name']
} }
self.fuel_web.update_plugin_settings( self.fuel_web.update_plugin_settings(
self.cluster_id, self.plugin_name, self.plugin_version, options) self.cluster_id, self.plugin_name, self.plugin_version, options,
enabled=True)
@deferred_decorator([make_snapshot_if_step_fail]) @deferred_decorator([make_snapshot_if_step_fail])
@action @action

8
system_test/tests/vcenter/test_vcenter_dvs.py
View File

@ -48,7 +48,6 @@ class DeployWithVMware(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -87,7 +86,6 @@ class ScaleWithVMware(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -131,7 +129,6 @@ class ScaleWithVMwareSkipSrvCheck(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -171,7 +168,6 @@ class DeployWithCustomHostname(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'set_custom_node_names', 'set_custom_node_names',
@ -209,7 +205,6 @@ class CheckNovaConfig(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -247,7 +242,6 @@ class CheckNovaSrv(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -285,7 +279,6 @@ class CheckCinderVmwareSrv(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',
@ -322,7 +315,6 @@ class DeployNeutronPublicNet(ActionTest, BaseActions, VMwareActions):
actions_order = [ actions_order = [
'prepare_env_with_plugin', 'prepare_env_with_plugin',
'create_env', 'create_env',
'enable_plugin',
'configure_dvs_plugin', 'configure_dvs_plugin',
'add_nodes', 'add_nodes',
'configure_vcenter', 'configure_vcenter',