Skip to content

Commit

Permalink
Merge "Update section name to [CONFIGDB] instead of [IFMAP] as ifmap …
Browse files Browse the repository at this point in the history 
…is deprecated."
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Apr 4, 2017
2 parents d2c1e19 + 1e9efd2 commit 78215f1
Show file tree
Hide file tree
Showing 10 changed files with 285 additions and 383 deletions.
10 changes: 1 addition & 9 deletions src/control-node/contrail-control.conf
View file
Expand Up @@ -31,15 +31,7 @@ log_local=1
# second. System logs are dropped if the sending rate is exceeded
# sandesh_send_rate_limit=

[IFMAP]
# certs_store=
# password=control-node
# server_url= # e.g. https://127.0.0.1:8443
# user=control-node
# stale_entries_cleanup_timeout=300 # in seconds
# end_of_rib_timeout=10 # in seconds
# peer_response_wait_time=60 # in seconds
#
[CONFIGDB]
# AMQP related configs
# rabbitmq_server_list=ip1:port1 ip2:por1
# rabbitmq_user=guest
Expand Down
2 changes: 1 addition & 1 deletion src/control-node/main.cc
View file
Expand Up @@ -265,7 +265,7 @@ int main(int argc, char *argv[]) {
// TODO Coming Soon
ConfigClientManager *config_client_manager =
new ConfigClientManager(&evm, &ifmap_server, options.hostname(),
module_name, options.ifmap_config_options());
module_name, options.configdb_options());
IFMap_Initialize(&ifmap_server, config_client_manager);
ifmap_server.set_config_manager(config_client_manager);

Expand Down
101 changes: 30 additions & 71 deletions src/control-node/options.cc
View file
Expand Up @@ -158,57 +158,36 @@ void Options::Initialize(EventManager &evm,
g_sandesh_constants.DEFAULT_SANDESH_SEND_RATELIMIT),
"Sandesh send rate limit in messages/sec")

("IFMAP.certs_store", opt::value<string>(),
"Certificates store to use for communication with IFMAP server")
("IFMAP.password", opt::value<string>()->default_value("control-node"),
"IFMAP server password")
("IFMAP.server_url", opt::value<string>()->default_value(
ifmap_config_options_.server_url), "IFMAP server URL")
("IFMAP.user", opt::value<string>()->default_value("control-node"),
"IFMAP server username")
("IFMAP.config_user",
opt::value<string>()->default_value("control-node"),
"Config database username")
("IFMAP.config_password",
opt::value<string>()->default_value("control-node"),
"Config database password")
("IFMAP.config_db_server_list",
("CONFIGDB.config_db_server_list",
opt::value<vector<string> >()->default_value(
default_config_db_server_list, default_config_db_server),
"Config database server list")
("IFMAP.stale_entries_cleanup_timeout",
opt::value<int>()->default_value(300),
"IFMAP stale entries cleanup timeout")
("IFMAP.end_of_rib_timeout", opt::value<int>()->default_value(10),
"IFMAP end of rib timeout")
("IFMAP.peer_response_wait_time", opt::value<int>()->default_value(60),
"IFMAP peer response wait time")
("IFMAP.rabbitmq_server_list",
("CONFIGDB.rabbitmq_server_list",
opt::value<vector<string> >()->default_value(
default_rabbitmq_server_list, default_rabbitmq_server),
"RabbitMQ server list")
("IFMAP.rabbitmq_user",
("CONFIGDB.rabbitmq_user",
opt::value<string>()->default_value("guest"),
"RabbitMQ user")
("IFMAP.rabbitmq_password",
("CONFIGDB.rabbitmq_password",
opt::value<string>()->default_value("guest"),
"RabbitMQ password")
("IFMAP.rabbitmq_vhost",
("CONFIGDB.rabbitmq_vhost",
opt::value<string>()->default_value(""),
"RabbitMQ vhost")
("IFMAP.rabbitmq_use_ssl",
("CONFIGDB.rabbitmq_use_ssl",
opt::value<bool>()->default_value(false),
"Use SSL for RabbitMQ connection")
("IFMAP.rabbitmq_ssl_version",
("CONFIGDB.rabbitmq_ssl_version",
opt::value<string>()->default_value(""),
"SSL version for RabbitMQ connection")
("IFMAP.rabbitmq_ssl_keyfile",
("CONFIGDB.rabbitmq_ssl_keyfile",
opt::value<string>()->default_value(""),
"Keyfile for SSL RabbitMQ connection")
("IFMAP.rabbitmq_ssl_certfile",
("CONFIGDB.rabbitmq_ssl_certfile",
opt::value<string>()->default_value(""),
"Certificate file for SSL RabbitMQ connection")
("IFMAP.rabbitmq_ssl_ca_certs",
("CONFIGDB.rabbitmq_ssl_ca_certs",
opt::value<string>()->default_value(""),
"CA Certificate file for SSL RabbitMQ connection")

Expand Down Expand Up @@ -360,56 +339,36 @@ bool Options::Process(int argc, char *argv[],
GetOptValue<uint32_t>(var_map, sandesh_ratelimit_,
"DEFAULT.sandesh_send_rate_limit");

GetOptValue<string>(var_map, ifmap_config_options_.password,
"IFMAP.password");
GetOptValue<string>(var_map, ifmap_config_options_.server_url,
"IFMAP.server_url");
GetOptValue<string>(var_map, ifmap_config_options_.user,
"IFMAP.user");
GetOptValue<string>(var_map, ifmap_config_options_.certs_store,
"IFMAP.certs_store");
GetOptValue<string>(var_map, ifmap_config_options_.config_db_username,
"IFMAP.config_user");
GetOptValue<string>(var_map, ifmap_config_options_.config_db_password,
"IFMAP.config_password");
GetOptValue< vector<string> >(var_map,
ifmap_config_options_.config_db_server_list,
"IFMAP.config_db_server_list");
GetOptValue<int>(var_map,
ifmap_config_options_.stale_entries_cleanup_timeout,
"IFMAP.stale_entries_cleanup_timeout");
GetOptValue<int>(var_map, ifmap_config_options_.end_of_rib_timeout,
"IFMAP.end_of_rib_timeout");
GetOptValue<int>(var_map,
ifmap_config_options_.peer_response_wait_time,
"IFMAP.peer_response_wait_time");
configdb_options_.config_db_server_list,
"CONFIGDB.config_db_server_list");
GetOptValue< vector<string> >(var_map,
ifmap_config_options_.rabbitmq_server_list,
"IFMAP.rabbitmq_server_list");
configdb_options_.rabbitmq_server_list,
"CONFIGDB.rabbitmq_server_list");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_user,
"IFMAP.rabbitmq_user");
configdb_options_.rabbitmq_user,
"CONFIGDB.rabbitmq_user");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_password,
"IFMAP.rabbitmq_password");
configdb_options_.rabbitmq_password,
"CONFIGDB.rabbitmq_password");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_vhost,
"IFMAP.rabbitmq_vhost");
configdb_options_.rabbitmq_vhost,
"CONFIGDB.rabbitmq_vhost");
GetOptValue<bool>(var_map,
ifmap_config_options_.rabbitmq_use_ssl,
"IFMAP.rabbitmq_use_ssl");
configdb_options_.rabbitmq_use_ssl,
"CONFIGDB.rabbitmq_use_ssl");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_ssl_version,
"IFMAP.rabbitmq_ssl_version");
configdb_options_.rabbitmq_ssl_version,
"CONFIGDB.rabbitmq_ssl_version");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_ssl_keyfile,
"IFMAP.rabbitmq_ssl_keyfile");
configdb_options_.rabbitmq_ssl_keyfile,
"CONFIGDB.rabbitmq_ssl_keyfile");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_ssl_certfile,
"IFMAP.rabbitmq_ssl_certfile");
configdb_options_.rabbitmq_ssl_certfile,
"CONFIGDB.rabbitmq_ssl_certfile");
GetOptValue<string>(var_map,
ifmap_config_options_.rabbitmq_ssl_ca_certs,
"IFMAP.rabbitmq_ssl_ca_certs");
configdb_options_.rabbitmq_ssl_ca_certs,
"CONFIGDB.rabbitmq_ssl_ca_certs");

GetOptValue<string>(var_map, sandesh_config_.keyfile,
"SANDESH.sandesh_keyfile");
Expand Down
41 changes: 17 additions & 24 deletions src/control-node/options.h
View file
Expand Up @@ -36,36 +36,29 @@ class Options {
bool use_syslog() const { return use_syslog_; }
std::string syslog_facility() const { return syslog_facility_; }
bool task_track_run_time() const { return task_track_run_time_; }
std::string ifmap_server_url() const {
return ifmap_config_options_.server_url;
}
std::string ifmap_password() const {
return ifmap_config_options_.password;
}
std::string ifmap_user() const { return ifmap_config_options_.user; }
std::string ifmap_certs_store() const {
return ifmap_config_options_.certs_store;
std::string config_db_user() const {
return configdb_options_.config_db_username;
}
int ifmap_stale_entries_cleanup_timeout() const {
return ifmap_config_options_.stale_entries_cleanup_timeout;
std::string config_db_password() const {
return configdb_options_.config_db_password;
}
int ifmap_end_of_rib_timeout() const {
return ifmap_config_options_.end_of_rib_timeout;
std::vector<std::string> config_db_server_list() const {
return configdb_options_.config_db_server_list;
}
int ifmap_peer_response_wait_time() const {
return ifmap_config_options_.peer_response_wait_time;
std::vector<std::string> rabbitmq_server_list() const {
return configdb_options_.rabbitmq_server_list;
}
std::string config_db_user() const {
return ifmap_config_options_.config_db_username;
std::string rabbitmq_user() const {
return configdb_options_.rabbitmq_user;
}
std::string config_db_password() const {
return ifmap_config_options_.config_db_password;
std::string rabbitmq_password() const {
return configdb_options_.rabbitmq_password;
}
std::vector<std::string> config_db_server_list() const {
return ifmap_config_options_.config_db_server_list;
bool rabbitmq_ssl_enabled() const {
return configdb_options_.rabbitmq_use_ssl;
}
const IFMapConfigOptions &ifmap_config_options() const {
return ifmap_config_options_;
const IFMapConfigOptions &configdb_options() const {
return configdb_options_;
}
uint16_t xmpp_port() const { return xmpp_port_; }
bool xmpp_auth_enabled() const { return xmpp_auth_enable_; }
Expand Down Expand Up @@ -127,7 +120,7 @@ class Options {
bool use_syslog_;
std::string syslog_facility_;
bool task_track_run_time_;
IFMapConfigOptions ifmap_config_options_;
IFMapConfigOptions configdb_options_;
uint16_t xmpp_port_;
bool xmpp_auth_enable_;
std::string xmpp_server_cert_;
Expand Down

0 comments on commit 78215f1

Please sign in to comment.