Merge "Remove duplicate definitions of exceptions" into R2.20

src/api-lib/SConscript

@@ -65,23 +65,12 @@ local_sources_rules = []
 for file in local_sources:
     local_sources_rules.append(env.Install("vnc_api", "#/controller/src/api-lib/" + file))
 
-common_sources = [
-                  '__init__.py',
-                  'rest.py',
-                  'exceptions.py'
-                 ]
-
-common_sources_rules = []
-for file in common_sources:
-    common_sources_rules.append(env.Install("vnc_api/common", "#/controller/src/config/common/" + file))
-
 generateds_rule = env.Install("vnc_api/gen", "#/controller/src/config/common/generatedssuper.py")
 cfixture_rule = env.Install("vnc_api/gen", "#/controller/src/config/common/cfixture.py")
 
 sdist_depends = [generated_rule, generateds_rule, cfixture_rule]
 sdist_depends.extend(setup_sources_rules)
 sdist_depends.extend(local_sources_rules)
-sdist_depends.extend(common_sources_rules)
 sdist_gen = env.Command('dist/vnc_api-0.1dev.tar.gz',
                         'setup.py', cd_cmd + 'python setup.py sdist')
 

src/api-lib/setup.py

@@ -23,7 +23,6 @@ def run(self):
     version='0.1dev',
     packages=['vnc_api',
               'vnc_api.gen',
-              'vnc_api.common',
              ],
     long_description="VNC API Library Package",
     install_requires=[

src/config/api-server/tests/test_askip.py

@@ -26,7 +26,6 @@
 import requests
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_api.gen.vnc_api_test_gen
 from vnc_api.gen.resource_test import *
 import cfgm_common

src/config/api-server/tests/test_crud_basic.py

@@ -31,7 +31,7 @@
 import stevedore
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
+from cfgm_common import exceptions as vnc_exceptions
 import vnc_api.gen.vnc_api_test_gen
 from vnc_api.gen.resource_test import *
 import cfgm_common

src/config/api-server/tests/test_ip_alloc.py

@@ -26,7 +26,6 @@
 import requests
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_api.gen.vnc_api_test_gen
 from vnc_api.gen.resource_test import *
 import cfgm_common

src/config/api-server/tests/test_logical_router.py

@@ -27,7 +27,6 @@
 import netaddr
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_api.gen.vnc_api_test_gen
 from vnc_api.gen.resource_test import *
 from netaddr import IPNetwork, IPAddress

src/config/api-server/tests/test_perms.py

@@ -6,7 +6,6 @@
 import uuid
 import argparse
 
-
 class TestPerms():
 
     def parse_args(self):

src/config/api-server/tests/test_subnet_ip_count.py

@@ -26,7 +26,6 @@
 import requests
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_api.gen.vnc_api_test_gen
 from vnc_api.gen.resource_test import *
 import cfgm_common

src/config/common/vnc_db.py

@@ -5,7 +5,7 @@
 """
 This file contains implementation of database model for contrail config daemons
 """
-from vnc_api.common.exceptions import NoIdError
+from exceptions import NoIdError
 
 class DBBase(object):
     # This is the base class for all DB objects. All derived objects must

src/config/device-manager/device_manager/db.py

@@ -6,7 +6,6 @@
 This file contains implementation of data model for physical router
 configuration manager
 """
-from vnc_api.common.exceptions import NoIdError
 from physical_router_config import PhysicalRouterConfig
 from physical_router_config import JunosInterface
 from physical_router_config import PushConfigState

src/config/device-manager/device_manager/device_manager.py

@@ -32,7 +32,7 @@
 from pysandesh.gen_py.process_info.ttypes import ConnectionType, \
     ConnectionStatus
 import discoveryclient.client as client
-from vnc_api.common.exceptions import ResourceExhaustionError
+from cfgm_common.exceptions import ResourceExhaustionError
 from vnc_api.vnc_api import VncApi
 from cfgm_common.uve.cfgm_cpuinfo.ttypes import NodeStatusUVE, \
     NodeStatus

src/config/utils/contrail-config.py

@@ -18,7 +18,6 @@
     os.path.realpath('/opt/contrail/api-venv/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 
 

src/config/utils/multi_tenancy.py

@@ -6,7 +6,7 @@
 import os
 
 from vnc_api.vnc_api import *
-import vnc_api
+import cfgm_common
 
 
 class MultiTenancy():
@@ -96,7 +96,7 @@ def get_ks_var(self, name):
     data = {'enabled': mt.args.on}
     try:
         rv = vnc._request_server(rest.OP_PUT, url, json.dumps(data))
-    except vnc_api.common.exceptions.PermissionDenied:
+    except cfgm_common.exceptions.PermissionDenied:
         print 'Permission denied'
         sys.exit(1)
 

src/config/utils/service-instance.py

@@ -16,7 +16,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 from novaclient import client as nc

src/config/utils/service-policy.py

@@ -15,7 +15,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 

src/config/utils/service-template.py

@@ -16,7 +16,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 

src/config/utils/service_instance.py

@@ -15,7 +15,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 from novaclient import client as nc

src/config/utils/service_policy.py

@@ -15,7 +15,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 

src/config/utils/service_template.py

@@ -16,7 +16,6 @@
     os.path.realpath('/usr/lib/python2.7/site-packages/vnc_cfg_api_server/'))
 
 from vnc_api.vnc_api import *
-from vnc_api.common import exceptions as vnc_exceptions
 import vnc_cfg_api_server
 from svc_monitor import svc_monitor
 

src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py

@@ -20,7 +20,7 @@
 
 from cfgm_common import exceptions as vnc_exc
 from vnc_api.vnc_api import *
-from vnc_api.common import SG_NO_RULE_FQ_NAME, SG_NO_RULE_NAME
+from cfgm_common import SG_NO_RULE_FQ_NAME, SG_NO_RULE_NAME
 import vnc_openstack
 
 _DEFAULT_HEADERS = {