diff --git a/ovsdbapp/constants.py b/ovsdbapp/constants.py index 5cd48666..63c6be1e 100644 --- a/ovsdbapp/constants.py +++ b/ovsdbapp/constants.py @@ -12,6 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +import os + + DEFAULT_OVSDB_CONNECTION = 'tcp:127.0.0.1:6640' DEFAULT_OVNNB_CONNECTION = 'tcp:127.0.0.1:6641' DEFAULT_TIMEOUT = 5 @@ -29,3 +32,8 @@ NAT_TYPES = (NAT_SNAT, NAT_DNAT, NAT_BOTH) PROTO_TCP = 'tcp' PROTO_UDP = 'udp' + +OVS_INSTALL_SHARE_PATH = os.path.join(os.path.sep, 'usr', 'local', 'share', + 'openvswitch') +OVN_INSTALL_SHARE_PATH = os.path.join(os.path.sep, 'usr', 'local', 'share', + 'ovn') diff --git a/ovsdbapp/venv.py b/ovsdbapp/venv.py index dcc5dc6e..51cff106 100644 --- a/ovsdbapp/venv.py +++ b/ovsdbapp/venv.py @@ -18,6 +18,7 @@ import subprocess import time import fixtures +from ovsdbapp import constants as const # These are the valid dummy values for ovs-vswitchd process. They are here just # to get user enumeration. See man ovs-vswitchd(8) for more information. @@ -48,7 +49,7 @@ class OvsVenvFixture(fixtures.Fixture): ":%s" % os.getenv('PATH')) else: self.env['PATH'] = os.getenv('PATH') - self.ovsdir = os.path.join('/usr', 'local', 'share', 'openvswitch') + self.ovsdir = const.OVS_INSTALL_SHARE_PATH if not os.path.isdir(self.ovsdir): self.ovsdir = os.path.join('/usr', 'share', 'openvswitch') if not os.path.isdir(self.ovsdir): @@ -133,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 '/usr/local/share/ovn' + self.ovndir = kwargs.pop('ovndir') or const.OVN_INSTALL_SHARE_PATH self.PATH_VAR_TEMPLATE += ( ":{0}/controller:{0}/northd:{0}/utilities".format( self.ovndir))