Fix discovery dependency issue. Originally made in master branch

via https://review.opencontrail.org/#/c/15749

Change-Id: I5d874de3714074c66fa73bfd7c9119772dc681fd
Partial-Bug: #1530186
(cherry picked from commit 831d719)

src/discovery/SConscript

@@ -119,6 +119,15 @@ cov_cmd = env.Command('coveragetest.log', sdist_gen,
 test_cmd = env.Command('test.log', sdist_gen,
                       'bash -c "set -o pipefail && cd ' + Dir(top_dir).path + ' && python setup.py run_tests 2>&1 | tee test.log"')
 
+test_depends = ['/config/common/dist/cfgm_common-0.1dev.tar.gz',
+                '/api-lib/dist/vnc_api-0.1dev.tar.gz',
+                '/discovery/client/dist/discoveryclient-0.1dev.tar.gz',
+                '/tools/sandesh/library/python/dist/sandesh-0.1dev.tar.gz',
+                '/sandesh/common/dist/sandesh-common-0.1dev.tar.gz',
+                '/config/api-server/dist/vnc_cfg_api_server-0.1dev.tar.gz',]
+
+env.Depends(test_cmd, [env['TOP']+x for x in test_depends])
+env.Depends(cov_cmd, [env['TOP']+x for x in test_depends])
 
 env.Alias('controller/src/discovery:test', test_cmd)
 env.Alias('controller/src/discovery:coverage', cov_cmd)

src/discovery/requirements.txt

@@ -1,6 +1,4 @@
 gevent==1.1a2
 pycassa
-sandesh
-sandesh-common
 ConfigParser
 xmltodict

src/discovery/test-requirements.txt

@@ -9,7 +9,9 @@ distribute>=0.7.3
 lxml
 kombu
 kazoo
-vnc_api
-cfgm_common
 python-novaclient
+cfgm_common
+vnc_api
 discoveryclient
+sandesh
+sandesh-common