Merge "BigSwitch: Use eventlet.sleep in watchdog"

neutron/plugins/bigswitch/servermanager.py

@@ -37,7 +37,6 @@ import json
 import os
 import socket
 import ssl
-import time
 
 import eventlet
 from oslo.config import cfg
@@ -556,7 +555,7 @@ class ServerPool(object):
             # rest call and the consistency header will be added. If it
             # doesn't match, the backend will return a synchronization error
             # that will be handled by the rest_call.
-            time.sleep(polling_interval)
+            eventlet.sleep(polling_interval)
             self.rest_call('GET', HEALTH_PATH)
 
 

neutron/tests/unit/bigswitch/test_servermanager.py

@@ -58,7 +58,7 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase):
         pl.servers.capabilities = []
         self.watch_p.stop()
         with nested(
-            mock.patch('time.sleep'),
+            mock.patch('eventlet.sleep'),
             mock.patch(
                 SERVERMANAGER + '.ServerPool.rest_call',
                 side_effect=servermanager.RemoteRestError(