Merge "Add tempest tests to boot Windows VM" into mcp/caracal
diff --git a/tempest/config.py b/tempest/config.py
index e5da9ca..ff7e977 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -973,7 +973,7 @@
help='Type of key to use for ssh connections. '
'Valid types are rsa, ecdsa'),
cfg.FloatOpt('allowed_network_downtime',
- default=5.0,
+ default=10.0,
help="Allowed VM network connection downtime during live "
"migration, in seconds. "
"When the measured downtime exceeds this value, an "
diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index e40e548..da33412 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -403,7 +403,7 @@
self.os_adm.servers_client.live_migrate_server(
server_id=server['id'],
- block_migration=False,
+ block_migration=True,
host=host_id)
waiters.wait_for_server_status(
@@ -944,6 +944,8 @@
nic=spoof_nic, should_succeed=True)
@decorators.idempotent_id('463caa51-0967-4d6d-8ee9-11db1557c710')
+ @testtools.skipUnless(CONF.compute_feature_enabled.live_migration,
+ 'Live migration is not available.')
@decorators.attr(type='slow')
@utils.services('compute', 'network')
def test_connectivity_between_vms_after_live_migration(self):