Skip to content

[sonic-cfggen] Support multiple input yaml files in -y option #729

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

Merged
stcheng merged 2 commits into from
Jun 22, 2017
Merged

[sonic-cfggen] Support multiple input yaml files in -y option #729

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a0a5a
[sonic-cfggen] Support multiple -y option and an optional -Y option
taoyl-ms Jun 20, 2017
dbfa6e3
Remove optional-yml
taoyl-ms Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/sonic-config-engine/sonic-cfggen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ def main():
parser=argparse.ArgumentParser(description="Render configuration file from minigraph data and jinja2 template.")
parser.add_argument("-m", "--minigraph", help="minigraph xml file")
parser.add_argument("-p", "--port-config", help="port config file, used with -m")
parser.add_argument("-y", "--yaml", help="yaml file that contains addtional variables")
parser.add_argument("-y", "--yaml", help="yaml file that contains addtional variables", action='append', default=[])
parser.add_argument("-Y", "--optional-yaml", help="optional yaml file that contains addtional variables", action='append', default=[])
Copy link
Collaborator

@lguohan lguohan Jun 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i feel this is error prone. can we do this check this outside sonic-cfggen?

like [ -f $file ] && sonic-cfggen -y $file.

Copy link
Contributor Author

@taoyl-ms taoyl-ms Jun 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what we are doing now.

parser.add_argument("-a", "--additional-data", help="addition data, in json string")
group = parser.add_mutually_exclusive_group()
group.add_argument("-t", "--template", help="render the data with the template file")
Expand Down Expand Up @@ -79,11 +80,17 @@ def main():
else:
data.update(parse_xml(minigraph))

if args.yaml != None:
with open(args.yaml, 'r') as stream:
for yaml_file in args.yaml:
with open(yaml_file, 'r') as stream:
additional_data = yaml.load(stream)
data.update(additional_data)

for optional_yaml in args.optional_yaml:
if os.path.isfile(optional_yaml):
with open(optional_yaml, 'r') as stream:
additional_data = yaml.load(stream)
data.update(additional_data)

if args.additional_data != None:
data.update(json.loads(args.additional_data))

Expand Down