Merge "Fix analytics systemless test failure due to incompatible geve…

…nt library" into R3.2

src/analytics/contrail-broadview/contrail_broadview/controller.py

@@ -7,7 +7,7 @@
 import time, socket, os
 from bv_uve import BroadViewOL
 import gevent
-from gevent.coros import Semaphore
+from gevent.lock import Semaphore
 from opserver.consistent_schdlr import ConsistentScheduler
 from bottle import Bottle, request, run
 import json

src/analytics/contrail-snmp-collector/contrail_snmp_collector/snmpctrlr.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
 #
 from gevent.queue import Queue as GQueue
-from gevent.coros import Semaphore
+from gevent.lock import Semaphore
 import os, json, sys, subprocess, time, gevent, socket
 from tempfile import NamedTemporaryFile, mkdtemp
 import cPickle as pickle

src/analytics/contrail-topology/contrail_topology/controller.py

@@ -5,7 +5,7 @@
 import time, socket, os
 from topology_uve import LinkUve
 import gevent
-from gevent.coros import Semaphore
+from gevent.lock import Semaphore
 from opserver.consistent_schdlr import ConsistentScheduler
 import traceback
 

src/config/common/zkclient.py

@@ -13,7 +13,7 @@
 
 from bitarray import bitarray
 from cfgm_common.exceptions import ResourceExhaustionError, ResourceExistsError
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 
 import uuid
 

src/discovery/disc_cassdb.py

@@ -9,7 +9,7 @@
 import disc_consts
 import disc_exceptions
 from datetime import datetime
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 
 import pycassa
 import pycassa.util

src/discovery/disc_server.py

@@ -50,7 +50,7 @@
 from sandesh_common.vns.constants import ModuleNames, Module2NodeType, NodeTypeNames,\
     INSTANCE_ID_DEFAULT
 
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 from cfgm_common.rest import LinkObject
 
 import disc_auth_keystone

src/discovery/disc_server_zk.py

@@ -43,7 +43,7 @@
     INSTANCE_ID_DEFAULT    
 from sandesh.discovery_introspect import ttypes as sandesh
 
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 from cfgm_common.rest import LinkObject
 
 

src/discovery/disc_zk.py

@@ -15,7 +15,7 @@
 import time
 import disc_consts
 
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 
 
 class DiscoveryZkClient(object):

src/opserver/partition_handler.py

@@ -4,7 +4,7 @@
 monkey.patch_all()
 import logging
 import gevent
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 from kafka import KafkaClient, KeyedProducer, SimpleConsumer, common
 from uveserver import UVEServer
 import os

src/opserver/uveserver.py

@@ -17,7 +17,7 @@
 import sys
 from opserver_util import OpServerUtils
 import re
-from gevent.coros import BoundedSemaphore
+from gevent.lock import BoundedSemaphore
 from pysandesh.util import UTCTimestampUsec
 from pysandesh.connection_info import ConnectionState
 from sandesh.viz.constants import UVE_MAP