Update the upgrade tests

* documentation strings are synchronized with actual tests content
* the parameter "is_make" for make_snapshot() is wiped out
  for final tests in chain

Change-Id: I1db0374434225e5f5353ea8710e545ad1733f83b
This commit is contained in:
Alisa Tselovalnikova 2016-09-21 13:15:03 +03:00
parent d8f0cbc7d8
commit fdddb3da96
4 changed files with 31 additions and 28 deletions

View File

@ -164,7 +164,7 @@ class UpgradeCephHA(DataDrivenUpgradeBase):
@test(groups=['upgrade_ceph_ha_tests', 'upgrade_ceph_ha_restore'])
@log_snapshot_after_test
def upgrade_ceph_ha_restore(self):
"""Reinstall Fuel and restore data with Tun+Ceph+HA cluster
"""Reinstall Fuel and restore data with Vlan+Ceph+HA cluster
Scenario:
1. Revert "upgrade_ceph_ha_backup" snapshot

View File

@ -56,19 +56,20 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
Scenario:
1. Revert snapshot with 9 slaves
2. Create cluster (HA) with Neutron VLAN/VXLAN/GRE
3. Add 3 controller + ceph nodes
4. Add 2 compute + ceph nodes
5. Upload 'upgrades' network template
6. Create custom network groups basing
on template endpoints assignments
7. Run network verification
8. Deploy cluster
9. Run network verification
10. Run health checks (OSTF)
11. Check L3 network configuration on slaves
12. Check that services are listening on their networks only
13. Install fuel-octane package
14. Create backups for upgrade procedure
3. Add 3 controller
4. Add 3 ceph osd
5. Add 2 compute
6. Upload 'upgrades' network template
7. Create custom network groups basing on template endpoints
assignments
8. Run network verification
9. Deploy cluster
10. Run network verification
11. Run health checks (OSTF)
12. Check L3 network configuration on slaves
13. Check that services are listening on their networks only
14. Install fuel-octane package
15. Create backups for upgrade procedure
Duration 180m
Snapshot upgrade_net_tmpl_backup
@ -95,6 +96,7 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
self.show_step(3)
self.show_step(4)
self.show_step(5)
self.fuel_web.update_nodes(
cluster_id,
{'slave-01': ['controller'],
@ -107,11 +109,11 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
'slave-08': ['compute']},
update_interfaces=False)
self.show_step(5)
self.show_step(6)
network_template = get_network_template("upgrades")
self.fuel_web.client.upload_network_template(
cluster_id=cluster_id, network_template=network_template)
self.show_step(6)
self.show_step(7)
# pylint: disable=redefined-variable-type
if settings.UPGRADE_FUEL_FROM == "7.0":
network = '10.200.0.0/16'
@ -126,26 +128,26 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
logger.debug('Networks: {0}'.format(
self.fuel_web.client.get_network_groups()))
self.show_step(7)
self.fuel_web.verify_network(cluster_id)
self.show_step(8)
self.fuel_web.deploy_cluster_wait(cluster_id, timeout=180 * 60)
self.fuel_web.verify_network(cluster_id)
self.show_step(9)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.deploy_cluster_wait(cluster_id, timeout=180 * 60)
self.show_step(10)
self.fuel_web.verify_network(cluster_id)
self.show_step(11)
# Live migration test could fail
# https://bugs.launchpad.net/fuel/+bug/1471172
# https://bugs.launchpad.net/fuel/+bug/1604749
self.check_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'sanity', 'ha'],
ignore_known_issues=True)
self.show_step(11)
self.show_step(12)
self.check_ipconfig_for_template(cluster_id, network_template,
networks)
self.show_step(12)
self.show_step(13)
self.check_services_networks(cluster_id, network_template)
self.env.make_snapshot(intermediate_snapshot)
@ -266,7 +268,7 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
self.check_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'sanity', 'ha'],
ignore_known_issues=True)
self.env.make_snapshot("reset_deploy_net_tmpl", is_make=True)
self.env.make_snapshot("reset_deploy_net_tmpl")
@test(depends_on_groups=["upgrade_net_tmpl_restore"],
groups=["replace_controller_net_tmpl", "upgrade_net_tmpl_tests"])
@ -358,4 +360,4 @@ class TestUpgradeNetworkTemplates(TestNetworkTemplatesBase,
self.check_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'sanity', 'ha'],
ignore_known_issues=True)
self.env.make_snapshot("restart_node_net_tmpl", is_make=True)
self.env.make_snapshot("restart_node_net_tmpl")

View File

@ -146,7 +146,7 @@ class UpgradeNoCluster(DataDrivenUpgradeBase):
self.fuel_web.verify_network(cluster_id)
self.show_step(7)
self.check_ostf(cluster_id)
self.env.make_snapshot("upgrade_no_cluster_deploy", is_make=True)
self.env.make_snapshot("upgrade_no_cluster_deploy")
@test(groups=['upgrade_no_cluster_tests',
'upgrade_no_cluster_deploy_old_cluster'],

View File

@ -87,7 +87,7 @@ class UpgradeSmoke(DataDrivenUpgradeBase):
depends_on_groups=['prepare_upgrade_smoke_before_backup'])
@log_snapshot_after_test
def upgrade_smoke_backup(self):
"""Create upgrade backup file for ceph HA cluster
"""Create upgrade backup file for non-HA cluster
Scenario:
1. Revert "prepare_upgrade_smoke_before_backup" snapshot
@ -254,7 +254,7 @@ class UpgradeSmoke(DataDrivenUpgradeBase):
depends_on_groups=['upgrade_smoke_restore'])
@log_snapshot_after_test
def upgrade_smoke_reset_deploy(self):
"""Reset existing cluster 7.0 cluster and redeploy
"""Reset existing cluster and redeploy
Scenario:
1. Revert "upgrade_smoke_restore".
@ -362,6 +362,7 @@ class UpgradeSmoke(DataDrivenUpgradeBase):
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(8)
self.check_ostf(cluster_id)
self.env.make_snapshot("upgrade_smoke_new_deployment")
@test(depends_on_groups=["upgrade_smoke_scale"],
groups=["upgrade_smoke_tests", "upgrade_smoke_restart_node"])