Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[sonic-cfggen] Loading the configuration from init_cfg.json and then from config_db.json #4148

Merged
merged 4 commits into from
Mar 5, 2020
Merged

[sonic-cfggen] Loading the configuration from init_cfg.json and then from config_db.json #4148

merged 4 commits into from
Mar 5, 2020

Commits on Feb 13, 2020

  1. [sonic-cfggen] Change the configuration file loading orders and first 

    loading the init_cfg.json and then loading config_db.json.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
    @yozhao101
    yozhao101 committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    c370285 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. [sonic-cfggen] Undo the changes for the command sonic-cfggen -H -m -j 

    /etc/sonic/init_cfg.json.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
    @yozhao101
    yozhao101 committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    807ed8a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. [sonic_cfggen] Add a logic to determine whether the files config_db.json 

    and init_cfg.json are existing. Otherwise sonic-cfggen will only load
one of them if it does exist.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
    @yozhao101
    yozhao101 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    4828153 View commit details
    Browse the repository at this point in the history

  2. [sonic-cfggen] Change the logic at line 111 if init_cfg.json and conf… 

    …ig_db.json exit, we

will load them. Otherwise we only load config_db.json.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
    @yozhao101
    yozhao101 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    9d3104c View commit details
    Browse the repository at this point in the history