Merge "Use all_recource_types from vnc_api_client_gen"

Juniper · Mar 2, 2016 · 7fb1f94 · 7fb1f94
2 parents 4a81880 + a8ea164
commit 7fb1f94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/config/api-server/SConscript b/src/config/api-server/SConscript
@@ -29,15 +29,7 @@ autogen_sources = [
 autogen_script = File('#tools/generateds/generateDS.py').path
 autogen_cmd = '%s -f -o %s -g ifmap-frontend' % (autogen_script, Dir('vnc_cfg_api_server/gen/resource').path)
 
-generated_files = [ 
-                  'vnc_cfg_api_server/gen/__init__.py',
-                  'vnc_cfg_api_server/gen/resource_xsd.py',
-                  'vnc_cfg_api_server/gen/resource_common.py',
-                  'vnc_cfg_api_server/gen/resource_test.py',
-                  'vnc_cfg_api_server/gen/vnc_api_server_gen.py',
-                  'vnc_cfg_api_server/gen/vnc_ifmap_client_gen.py',
-                  'vnc_cfg_api_server/gen/vnc_cassandra_client_gen.py',
-                ]
+generated_files = ['vnc_cfg_api_server/gen/__init__.py']
 env.Append(ENV = {'HEAT_BUILDTOP' : Dir(env['TOP']).abspath})
 
 generated_rule = env.Command(generated_files,

diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py
@@ -74,7 +74,7 @@
 from vnc_quota import *
 from gen.resource_xsd import *
 from gen.resource_common import *
-import gen.vnc_api_server_gen
+from gen.vnc_api_client_gen import all_resource_types
 import cfgm_common
 from cfgm_common.utils import cgitb_hook
 from cfgm_common.rest import LinkObject, hdr_server_tenant
@@ -1055,7 +1055,7 @@ def delete_default_children(self, resource_type, parent_dict):
 
     @classmethod
     def _generate_resource_crud_methods(cls, obj):
-        for resource_type in gen.vnc_api_server_gen.all_resource_types:
+        for resource_type in all_resource_types:
             obj_type = resource_type.replace('-', '_')
             create_method = functools.partial(obj.http_resource_create,
                                               resource_type)
@@ -1099,7 +1099,7 @@ def _generate_resource_crud_methods(cls, obj):
 
     @classmethod
     def _generate_resource_crud_uri(cls, obj):
-        for resource_type in gen.vnc_api_server_gen.all_resource_types:
+        for resource_type in all_resource_types:
             # CRUD + list URIs of the form
             # obj.route('/virtual-network/<id>', 'GET', obj.virtual_network_http_get)
             # obj.route('/virtual-network/<id>', 'PUT', obj.virtual_network_http_put)
@@ -1133,7 +1133,7 @@ def __init__(self, args_str=None):
         self._post_common = None
 
         self._resource_classes = {}
-        for resource_type in gen.vnc_api_server_gen.all_resource_types:
+        for resource_type in all_resource_types:
             camel_name = cfgm_common.utils.CamelCase(resource_type)
             r_class_name = '%sServer' %(camel_name)
             common_class = cfgm_common.utils.str_to_class(camel_name, __name__)
@@ -1162,13 +1162,13 @@ def __init__(self, args_str=None):
         links.append(LinkObject('root', self._base_url , '/config-root',
                                 'config-root'))
 
-        for resource_type in gen.vnc_api_server_gen.all_resource_types:
+        for resource_type in all_resource_types:
             link = LinkObject('collection',
                            self._base_url , '/%ss' %(resource_type),
                            '%s' %(resource_type))
             links.append(link)
 
-        for resource_type in gen.vnc_api_server_gen.all_resource_types:
+        for resource_type in all_resource_types:
             link = LinkObject('resource-base',
                            self._base_url , '/%s' %(resource_type),
                            '%s' %(resource_type))