Skip to content

Commit

Permalink
[config] use generated code from Contrail API client lib
Browse files Browse the repository at this point in the history
- Patch I72c8307d308ef048c099fc40a55b7b01fd67d653 move some python
genereteds files, update scons file to follow that change
- use the generated code from the contrail API client lib instead
of re-generate it in the API server
- move generated API documentation to the contrail API client lib

Change-Id: I752f7f920945d2d168524122806f44d56609a6c5
Depends-On: I5645ea81dea7169667ba90ce8af4f7a4c80e5e24
Depends-On: I8cee2576fe95131497c21ad9fe307fe411ff0683
Depends-On: I87d93769a21e2d8a498f33c75de9a5480f6dbf84
Partial-Bug: #1711447
Closes-Bug: #1764278
  • Loading branch information
Édouard Thuleau committed Jun 11, 2018
1 parent 12d1cd5 commit af57ec2
Show file tree
Hide file tree
Showing 39 changed files with 35 additions and 4,559 deletions.
66 changes: 4 additions & 62 deletions src/config/api-server/SConscript
@@ -1,5 +1,3 @@
# -*- mode: python; -*-

#
# Copyright (c) 2013 Juniper Networks, Inc. All rights reserved.
#
Expand All @@ -8,32 +6,6 @@ import os
Import('CfgmEnv')
env = CfgmEnv.Clone()

autogen_infra_sources = [
'#/src/contrail-api-client/generateds/generateDS.py',
'#/src/contrail-api-client/generateds/TypeGenerator.py',
'#/src/contrail-api-client/generateds/ccmap.py',
'#/src/contrail-api-client/generateds/idl_parser.py',
'#/src/contrail-api-client/generateds/ifmap_global.py',
'#/src/contrail-api-client/generateds/ifmap_model.py',
'#/src/contrail-api-client/generateds/ifmap_frontend.py',
]

autogen_sources = [
'#src/contrail-api-client/schema/all_cfg.xsd',
'#src/contrail-api-client/schema/vnc_cfg.xsd',
'#src/contrail-api-client/schema/bgp_schema.xsd',
'#src/contrail-api-client/schema/ietf-l3vpn-schema.xsd',
'#src/contrail-api-client/schema/smi-base.xsd',
]

generated_dependencies = [
env['TOP'] + '/api-lib/vnc_api/gen/__init__.py',
env['TOP'] + '/api-lib/vnc_api/gen/resource_xsd.py',
env['TOP'] + '/api-lib/vnc_api/gen/resource_common.py',
env['TOP'] + '/api-lib/vnc_api/gen/resource_client.py',
env['TOP'] + '/api-lib/vnc_api/gen/vnc_api_client_gen.py',
]

setup_sources = [
'.coveragerc',
'.pylintrc',
Expand All @@ -46,49 +18,23 @@ setup_sources = [
'test-requirements.txt',
'tox.ini',
'vnc_cfg_api_server',
'doc',
]

setup_sources_rules = []
for file in setup_sources:
setup_sources_rules.append(
env.Install(Dir('.'), "#controller/src/config/api-server/" + file))

autogen_script = File('#src/contrail-api-client/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']
env.Append(ENV = {'HEAT_BUILDTOP' : Dir(env['TOP']).abspath})

generated_rule = env.Command(generated_files,
'#/src/contrail-api-client/schema/all_cfg.xsd',
autogen_cmd + ' $SOURCE')

generateds_rule = env.Install("vnc_cfg_api_server/gen", "#src/contrail-api-client/api-lib/generatedssuper.py")
cfixture_rule = env.Install("vnc_cfg_api_server/gen", "#src/contrail-api-client/api-lib/cfixture.py")

doc_sources_rules = SConscript(dirs=['doc'], exports = 'CfgmEnv')

sandesh_trace_pkg = env.SandeshGenPy('traces.sandesh', 'vnc_cfg_api_server/sandesh/', False)

sdist_depends = [generated_rule, generateds_rule, cfixture_rule]
sdist_depends.extend(setup_sources_rules)
sdist_depends.extend(doc_sources_rules)
sdist_depends.extend(sandesh_trace_pkg)
sandesh_trace_pkg = env.SandeshGenPy(
'traces.sandesh', 'vnc_cfg_api_server/sandesh/', False)

sdist_depends = setup_sources_rules + sandesh_trace_pkg
cd_cmd = 'cd ' + Dir('.').path + ' && '
# TODO: deprecate
sdist_gen = env.Command('dist/contrail-api-server-0.1dev.tar.gz', 'setup.py',
cd_cmd + 'python setup.py sdist')

env.Default(sdist_gen)

# generated files depend on autogeneration infra parts

env.Depends(generated_rule, [autogen_infra_sources, autogen_sources, generated_dependencies])

# install everything before building distribution
env.Depends(sdist_gen, sdist_depends)
env.Default(sdist_gen)

# Documentation
doc_files = []
Expand Down Expand Up @@ -119,7 +65,3 @@ env.Alias('install', env.Install(
env['INSTALL_MESSAGE_DOC'] + '/contrail-api/', doc_files))

env.SetupPyTestSuite(sdist_gen, use_tox=True)

# Local Variables:
# mode: python
# End:
39 changes: 0 additions & 39 deletions src/config/api-server/doc/SConscript

This file was deleted.

153 changes: 0 additions & 153 deletions src/config/api-server/doc/source/Makefile

This file was deleted.

Empty file.

0 comments on commit af57ec2

Please sign in to comment.