Merge "Initial RDBMS backend support for api server"

Juniper · Oct 26, 2016 · f02c9b0 · f02c9b0
2 parents a1521e0 + 1edcaaa
commit f02c9b0
Show file tree

Hide file tree

Showing 20 changed files with 3,063 additions and 745 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+.venv
+*.pyc
+*.testrepository
+build
+gen
+*.egg-info
+*.log
+*.db
+dist
diff --git a/src/config/api-server/.testr.conf b/src/config/api-server/.testr.conf
@@ -6,3 +6,4 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
 
 test_id_option=--load-list $IDFILE
 test_list_option=--list
+group_regex=([^\.]+\.)+
diff --git a/src/config/api-server/SConscript b/src/config/api-server/SConscript
@@ -63,6 +63,7 @@ local_sources = [
            'vnc_rbac.py',
            'vnc_addr_mgmt.py',
            'vnc_quota.py',
+           'vnc_rdbms.py',
            'provision_defaults.py',
            'utils.py',
            'context.py',
@@ -119,17 +120,17 @@ if 'install' in BUILD_TARGETS:
     env.Alias('install', install_cmd)
 
 env.Alias('install', env.Install(env['INSTALL_CONF'], 'contrail-api.conf'))
-env.Alias('install', env.InstallAs(env['INSTALL_INITD'] + 
+env.Alias('install', env.InstallAs(env['INSTALL_INITD'] +
     '/contrail-api', 'contrail-api.initd.supervisord'))
-env.Alias('install', env.Install(env['INSTALL_CONF'], 
+env.Alias('install', env.Install(env['INSTALL_CONF'],
     'supervisord_config.conf'))
-env.Alias('install', env.Install(env['INSTALL_CONF']+ 
+env.Alias('install', env.Install(env['INSTALL_CONF']+
     '/supervisord_config_files', 'contrail-api.ini'))
-env.Alias('install', env.InstallAs(env['INSTALL_INITD'] + 
+env.Alias('install', env.InstallAs(env['INSTALL_INITD'] +
     '/ifmap', 'ifmap.initd.supervisord'))
-env.Alias('install', env.Install(env['INSTALL_CONF']+ 
+env.Alias('install', env.Install(env['INSTALL_CONF']+
     '/supervisord_config_files', 'ifmap.ini'))
-env.Alias('install', env.Install(env['INSTALL_CONF']+ 
+env.Alias('install', env.Install(env['INSTALL_CONF']+
     '/supervisord_config_files', 'contrail-config.rules'))
 env.Alias('install', env.Install(
     env['INSTALL_MESSAGE_DOC'] + '/contrail-api/', doc_files))

diff --git a/src/config/api-server/tests/test_case.py b/src/config/api-server/tests/test_case.py
@@ -1,3 +1,4 @@
+import os
 import sys
 sys.path.append("../common/tests")
 from vnc_api import vnc_api
@@ -54,4 +55,19 @@ def _create_vn_ri_vmi(self, obj_count=1):
 
         return vn_objs, ipam_objs, ri_objs, vmi_objs
     # end _create_vn_ri_vmi
+
+    def assert_ifmap_doesnt_have_ident(self, test_obj):
+        self.assertTill(self.ifmap_doesnt_have_ident, obj=test_obj)
+
+    def assert_ifmap_has_ident(self, test_obj):
+        self.assertTill(self.ifmap_has_ident, obj=test_obj)
 # end class ApiServerTestCase
+
+class ApiServerRDBMSTestCase(ApiServerTestCase):
+    @classmethod
+    def setUpClass(cls, extra_config_knobs=None, extra_mocks=None):
+
+        super(ApiServerRDBMSTestCase, cls).setUpClass(
+            db="rdbms", extra_config_knobs=extra_config_knobs,
+            extra_mocks=extra_mocks)
+#end class ApiServerRDBMSTestCase