Move kuryr_libnetwork/common/* to kuryr_libnetwork

Common files will be at kuryr-lib. Whatever is there in
kuryr_libnetwork/common is specific to libnetwork so it should
be moved accordingly

Change-Id: I84220aa358375920bd0a135d3eb8c23c7386d947
Closes-bug: #1617521

kuryr_libnetwork/config.py

@@ -27,7 +27,7 @@ from kuryr.lib import config as lib_config
 core_opts = [
     cfg.StrOpt('pybasedir',
                default=os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                                    '../../')),
+                                                    '../')),
                help=_('Directory where Kuryr python module is installed.')),
     cfg.StrOpt('kuryr_uri',
                default='http://127.0.0.1:23750',

kuryr_libnetwork/controllers.py

@@ -29,8 +29,8 @@ from kuryr.lib import exceptions
 from kuryr.lib import utils as lib_utils
 from kuryr.lib._i18n import _LE, _LI, _LW
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import config
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import config
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork import schemata
 from kuryr_libnetwork import utils
 
@@ -86,8 +86,8 @@ def get_neutron_client():
         return neutron_client
     except Exception:
             pass
-    cfg.CONF.import_group('neutron_client', 'kuryr_libnetwork.common.config')
-    cfg.CONF.import_group('keystone_client', 'kuryr_libnetwork.common.config')
+    cfg.CONF.import_group('neutron_client', 'kuryr_libnetwork.config')
+    cfg.CONF.import_group('keystone_client', 'kuryr_libnetwork.config')
 
     keystone_conf = cfg.CONF.keystone_client
     username = keystone_conf.admin_user

kuryr_libnetwork/opts.py

@@ -20,7 +20,7 @@ import itertools
 from oslo_log import _options
 
 from kuryr.lib import config as lib_config
-from kuryr_libnetwork.common import config
+from kuryr_libnetwork import config
 
 
 _core_opts_with_logging = config.core_opts

kuryr_libnetwork/server.py

@@ -16,7 +16,7 @@ from oslo_log import log
 from six.moves.urllib import parse
 
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import config
+from kuryr_libnetwork import config
 from kuryr_libnetwork import controllers
 
 

kuryr_libnetwork/tests/unit/base.py

@@ -14,7 +14,7 @@ from neutronclient.tests.unit import test_cli20
 
 from kuryr.lib import binding
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork import controllers
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_config.py

@@ -18,7 +18,7 @@ import sys
 from neutronclient.common import exceptions as n_exceptions
 
 from kuryr.lib import exceptions
-from kuryr_libnetwork.common import config
+from kuryr_libnetwork import config
 from kuryr_libnetwork import controllers
 from kuryr_libnetwork.server import start
 from kuryr_libnetwork.tests.unit import base
@@ -28,7 +28,7 @@ class ConfigurationTest(base.TestKuryrBase):
 
     def test_defaults(self):
         basepath = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                                '../../../'))
+                                                '../../..'))
         self.assertEqual(basepath,
                          config.CONF.pybasedir)
         self.assertEqual('/usr/libexec/kuryr',

kuryr_libnetwork/tests/unit/test_external_connectivity.py

@@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
 
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants
+from kuryr_libnetwork import constants
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_join.py

@@ -21,7 +21,7 @@ from kuryr.lib import binding
 from kuryr.lib import exceptions
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_kuryr.py

@@ -17,8 +17,8 @@ from oslo_serialization import jsonutils
 
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import config
-from kuryr_libnetwork.common import constants
+from kuryr_libnetwork import config
+from kuryr_libnetwork import constants
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_kuryr_endpoint.py

@@ -18,7 +18,7 @@ from oslo_serialization import jsonutils
 
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants
+from kuryr_libnetwork import constants
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_kuryr_existing_network.py

@@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
 
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_kuryr_ipam.py

@@ -15,8 +15,8 @@ from oslo_serialization import jsonutils
 import uuid
 
 from kuryr.lib import utils as lib_utils
-from kuryr_libnetwork.common import config
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import config
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork.controllers import app
 from kuryr_libnetwork.tests.unit import base
 

kuryr_libnetwork/tests/unit/test_kuryr_network.py

@@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
 
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/tests/unit/test_leave.py

@@ -21,7 +21,7 @@ from kuryr.lib import binding
 from kuryr.lib import exceptions
 from kuryr.lib import utils as lib_utils
 from kuryr_libnetwork import app
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 from kuryr_libnetwork.tests.unit import base
 from kuryr_libnetwork import utils
 

kuryr_libnetwork/utils.py

@@ -24,7 +24,7 @@ from werkzeug import exceptions as w_exceptions
 from kuryr.lib._i18n import _LE
 from kuryr.lib import exceptions
 from kuryr.lib import utils as lib_utils
-from kuryr_libnetwork.common import constants as const
+from kuryr_libnetwork import constants as const
 
 
 SG_POSTFIX = 'exposed_ports'