openstack
/
ovsdbapp
Code Issues Proposed changes

Fix debug_venv for ovn split 

Change-Id: Ia710b8f394e9446f0da83221e314d73d2edcfb08
This commit is contained in:
Terry Wilson 2019-11-04 20:52:37 -06:00
parent 5a61df8407
commit 0bd24c269d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ovsdbapp/venv.py
View File

@ -134,7 +134,7 @@ class OvsOvnVenvFixture(OvsVenvFixture):
def __init__(self, *args, **kwargs):
self.add_chassis = kwargs.pop('add_chassis', False)
self.ovndir = kwargs.pop('ovndir') or const.OVN_INSTALL_SHARE_PATH
self.ovndir = kwargs.pop('ovndir', const.OVN_INSTALL_SHARE_PATH)
self.PATH_VAR_TEMPLATE += (
":{0}/controller:{0}/northd:{0}/utilities".format(
self.ovndir))

2
tools/debug_venv
View File

@ -60,4 +60,4 @@ if [ -n "$regex" -a -z "$ovsvenv" ]; then
ovsvenv=$(head -1 $test_file)
fi
echo "Debugging OVS virtual environment: $ovsvenv$test_match"
tools/debug_venv.py $ovsvenv $VIRTUAL_ENV/src/ovs
tools/debug_venv.py $ovsvenv $VIRTUAL_ENV/src/ovs $VIRTUAL_ENV/src/ovn

7
tools/debug_venv.py
View File

@ -22,8 +22,8 @@ from fixtures import fixture
from ovsdbapp import venv
if len(sys.argv) != 3:
print("Requires two arguments: venvdir ovsdir", file=sys.stderr)
if len(sys.argv) != 4:
print("Requires three arguments: venvdir ovsdir ovndir", file=sys.stderr)
sys.exit(1)
for d in sys.argv[1:]:
@ -33,8 +33,9 @@ for d in sys.argv[1:]:
venvdir = os.path.abspath(sys.argv[1])
ovsdir = os.path.abspath(sys.argv[2])
ovndir = os.path.abspath(sys.argv[3])
v = venv.OvsOvnVenvFixture(venvdir, ovsdir)
v = venv.OvsOvnVenvFixture(venvdir, ovsdir, ovndir=ovndir)
try:
atexit.register(v.cleanUp)
v.setUp()