x
/
fuel-plugin-vmware-dvs
Code Issues Proposed changes

Fix issues with suspended cluster after snapshot creating. 

Enable snapshot reverting for tests which is used dvs_vcenter_systest_setup.

Change-Id: If1bba1301fc29e412c206866076bb79b057bc2b7
Closes-Bug: #1616025
This commit is contained in:
Vasily Gorin 2016-08-23 14:41:43 +03:00
parent 433eeac5a2
commit 89ee57e1f5
2 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin_test/tests/test_plugin_vmware_dvs_destructive.py
View File

@ -165,14 +165,15 @@ class TestDVSDestructive(TestBasic):
Scenario:
1. Revert snapshot to dvs_vcenter_systest_setup.
2. Try to uninstall dvs plugin.
3. Check that plugin is not removed
Duration: 1.8 hours
"""
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.show_step(1)
self.env.revert_snapshot("dvs_vcenter_systest_setup")
# Try to uninstall dvs plugin
self.show_step(2)
cmd = 'fuel plugins --remove {0}=={1}'.format(
plugin.plugin_name, plugin.DVS_PLUGIN_VERSION)
@ -182,7 +183,7 @@ class TestDVSDestructive(TestBasic):
assert_ec_equal=[1]
)
# Check that plugin is not removed
self.show_step(3)
output = self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip, cmd='fuel plugins list')['stdout']
assert_true(
@ -197,7 +198,7 @@ class TestDVSDestructive(TestBasic):
"""Check abilities to bind port on DVS to VM, disable/enable this port.
Scenario:
1. Revert snapshot to dvs_vcenter_destructive_setup
1. Revert snapshot to dvs_vcenter_systest_setup
2. Create private networks net01 with sunet.
3. Launch instances VM_1 and VM_2 in the net01
with image TestVM and flavor m1.micro in nova az.
@ -213,8 +214,7 @@ class TestDVSDestructive(TestBasic):
Duration: 1,5 hours
"""
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()

54
plugin_test/tests/test_plugin_vmware_dvs_system.py
View File

@ -167,8 +167,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -256,8 +255,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -331,8 +329,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -423,8 +420,7 @@ class TestDVSSystem(TestBasic):
wait_to_update_rules_on_dvs_ports = 30
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -597,8 +593,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -711,8 +706,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -960,8 +954,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1029,8 +1022,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1126,8 +1118,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1240,8 +1231,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -1384,8 +1374,7 @@ class TestDVSSystem(TestBasic):
template_path = 'plugin_test/templates/dvs_stack.yaml'
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -1455,8 +1444,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1610,8 +1598,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1761,8 +1748,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -1897,8 +1883,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -2037,8 +2022,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
os_ip = self.fuel_web.get_public_vip(cluster_id)
@ -2211,8 +2195,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -2278,8 +2261,7 @@ class TestDVSSystem(TestBasic):
"""
self.show_step(1)
# TODO(vgorin) Uncomment when reverting of WS snapshot is available
# self.env.revert_snapshot("dvs_vcenter_systest_setup")
self.env.revert_snapshot("dvs_vcenter_systest_setup")
cluster_id = self.fuel_web.get_last_created_cluster()