Merge "Fix block_migration parameter in function live_migration for _live_migrate_server in test_network_basic_ops" into mcp/caracal
diff --git a/tempest/config.py b/tempest/config.py
index 167a0c6..0a220a3 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -961,7 +961,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 5806bc7..da33412 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -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):