Merge "Added traffic update capability to Ixload TG"

[yardstick.git] / yardstick / benchmark / scenarios / lib / migrate.py

diff --git a/yardstick/benchmark/scenarios/lib/migrate.py b/yardstick/benchmark/scenarios/lib/migrate.py
index 116bae6..dd244c7 100644 (file)
--- a/yardstick/benchmark/scenarios/lib/migrate.py
+++ b/yardstick/benchmark/scenarios/lib/migrate.py
@@ -16,7 +16,7 @@ import threading
 import time
 
 from datetime import datetime
-import ping
+
 
 from yardstick.common import openstack_utils
 from yardstick.common.utils import change_obj_to_dict
@@ -28,6 +28,15 @@ TIMEOUT = 0.05
 PACKAGE_SIZE = 64
 
 
+try:
+    import ping
+except ImportError:
+    # temp fix for ping module import error on Python3
+    # we need to replace the ping module anyway
+    import mock
+    ping = mock.MagicMock()
+
+
 class Migrate(base.Scenario):       # pragma: no cover
     """
     Execute a live migration for two hosts