From 922f61dadfbae81b26426d4722ef5a55bd1eb38e Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Mon, 17 Aug 2015 17:40:21 -0700 Subject: [PATCH] changed the scons aliases to easily rememberable contrail service names Change-Id: Ibc5b6f58269faa3d6edb4cb5b12e18abc98e3051 Closes-Bug: #1469415 --- src/analytics/SConscript | 2 +- src/analytics/database/SConscript | 1 + src/control-node/SConscript | 1 + src/discovery/SConscript | 1 + src/dns/SConscript | 2 +- src/libpartition/SConscript | 2 +- src/nodemgr/SConscript | 1 + src/opserver/SConscript | 2 +- src/query_engine/SConscript | 2 +- src/vnsw/agent/contrail/SConscript | 2 +- 10 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/analytics/SConscript b/src/analytics/SConscript index c97c60c393f..f751cfd7bd2 100644 --- a/src/analytics/SConscript +++ b/src/analytics/SConscript @@ -177,7 +177,7 @@ vizd = AnalyticsEnv.Program(target = 'vizd', syslog_collector_obj, parser_util_obj, ]) -AnalyticsEnv.Alias('src/analytics:vizd', vizd) +AnalyticsEnv.Alias('contrail-collector', vizd) AnalyticsEnv.Default(vizd) AnalyticsEnv.Requires(OpServerProxy_obj, '#/build/include/rapidjson') diff --git a/src/analytics/database/SConscript b/src/analytics/database/SConscript index 0f725342729..475b2ef7ee9 100755 --- a/src/analytics/database/SConscript +++ b/src/analytics/database/SConscript @@ -37,5 +37,6 @@ DatabaseEnv.Default(sdist_gen) DatabaseEnv.Alias("database:node_mgr", sdist_gen) DatabaseEnv.Alias("src/analytics/database:database", sdist_gen) +DatabaseEnv.Alias("contrail-database", sdist_gen) DatabaseEnv['DATABASE_PKG'] = sdist_gen diff --git a/src/control-node/SConscript b/src/control-node/SConscript index 01a2c1ee8bc..1c4bfe793ef 100644 --- a/src/control-node/SConscript +++ b/src/control-node/SConscript @@ -215,6 +215,7 @@ env.Depends(ctrlnode, lib_rtarget) env.Depends(ctrlnode, lib_ifmap_server) env.Alias('control-node', ctrlnode) +env.Alias('contrail-control', ctrlnode) env.SConscript('test/SConscript', exports='BuildEnv', duplicate = 0) diff --git a/src/discovery/SConscript b/src/discovery/SConscript index f355bbebfe4..1e14e2c0d96 100644 --- a/src/discovery/SConscript +++ b/src/discovery/SConscript @@ -76,6 +76,7 @@ env.Depends(local_sources_rules, autogen_infra_sources) # install everything before building distribution env.Depends(sdist_gen, sdist_depends) env.Alias('src/discovery:discovery', sdist_gen) +env.Alias('contrail-discovery', sdist_gen) if 'install' in BUILD_TARGETS: install_cmd = env.Command(None, 'setup.py', diff --git a/src/dns/SConscript b/src/dns/SConscript index d73f4638968..470dc4e7e9d 100644 --- a/src/dns/SConscript +++ b/src/dns/SConscript @@ -45,7 +45,7 @@ if sys.platform != 'darwin': '-Wl,--no-whole-archive']) contrail_dns = env.Program(target = 'contrail-dns', source = ['main.cc']) -env.Alias('src/dns:contrail-dns', contrail_dns) +env.Alias('contrail-dns', contrail_dns) env.Default(contrail_dns) # Please update sandesh/common/vns.sandesh on process name change diff --git a/src/libpartition/SConscript b/src/libpartition/SConscript index 621bac875b1..72591d18714 100644 --- a/src/libpartition/SConscript +++ b/src/libpartition/SConscript @@ -48,4 +48,4 @@ PartEnv['LIBPARTITION_PKG'] = sdist_gen #PartEnv.SConscript('docs/SConscript', exports='PartEnv', duplicate = 0) PartEnv.Default(sdist_gen) -PartEnv.Alias("src/libpartition:libpartition", sdist_gen) +PartEnv.Alias("contrail:libpartition", sdist_gen) diff --git a/src/nodemgr/SConscript b/src/nodemgr/SConscript index 100d27e7ac1..471bdf073af 100644 --- a/src/nodemgr/SConscript +++ b/src/nodemgr/SConscript @@ -94,3 +94,4 @@ OpEnv.Depends(sdist_gen, sdist_depends) OpEnv.Default(sdist_gen) OpEnv.Alias("src:nodemgr", sdist_gen) +OpEnv.Alias("contrail-nodemgr", sdist_gen) diff --git a/src/opserver/SConscript b/src/opserver/SConscript index f04cdaeebe5..c5539ea4bb2 100644 --- a/src/opserver/SConscript +++ b/src/opserver/SConscript @@ -93,7 +93,7 @@ OpEnv.SConscript('plugins/alarm_vrouter_interface/SConscript', exports='OpEnv', OpEnv.SConscript('docs/SConscript', exports='OpEnv', duplicate = 0) OpEnv.Default(sdist_gen) -OpEnv.Alias("src/opserver:opserver", sdist_gen) +OpEnv.Alias("contrail-analytics-api", sdist_gen) OpEnv.SConscript('node_mgr/SConscript', exports='BuildEnv', duplicate = 0) OpEnv.Alias('install', OpEnv.Install( diff --git a/src/query_engine/SConscript b/src/query_engine/SConscript index 2c111dd008d..30932533797 100644 --- a/src/query_engine/SConscript +++ b/src/query_engine/SConscript @@ -163,7 +163,7 @@ qedt = env.UnitTest( ['../analytics/vizd_table_desc.o', rac, '../analytics/viz_constants.o']) -env.Alias("src/query_engine:qed", qed) +env.Alias("contrail-query-engine", qed) env.Alias("src/query_engine:qedt", qedt) env.Depends(qed, '#/build/include/hiredis/hiredis.h') diff --git a/src/vnsw/agent/contrail/SConscript b/src/vnsw/agent/contrail/SConscript index 79e40225916..230f0373c19 100644 --- a/src/vnsw/agent/contrail/SConscript +++ b/src/vnsw/agent/contrail/SConscript @@ -108,7 +108,7 @@ contrail_vrouter_agent = env.Program(target = 'contrail-vrouter-agent', 'pkt0_interface_base.cc', platform_dependent]) -env.Alias('agent:contrail-vrouter-agent', contrail_vrouter_agent) +env.Alias('contrail-vrouter-agent', contrail_vrouter_agent) env.Default(contrail_vrouter_agent) # Please update sandesh/common/vns.sandesh on process name change