Skip to content

Commit

Permalink
[L2 switch mode] Update l2switch.j2 template (#5981)
Browse files Browse the repository at this point in the history
- Why I did it
The l2switch.j2 template does not include all fields for PORT. This could be incompatible with the 201911 image or later.

- How I did it
Update l2switch.j2 template and add a unit test.
  • Loading branch information
shi-su committed Nov 21, 2020
1 parent 5b31996 commit e0781f4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/sonic-config-engine/data/l2switch.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
"DEVICE_METADATA": {{ DEVICE_METADATA | tojson }},
{% set ns = {'firstPrinted': False} -%}
"PORT": {
{%- for key,value in PORT.items() -%}
{%- for key, value in PORT.items() -%}
{%- if ns.firstPrinted %},{% endif %}

"{{ key }}": {
"alias": "{{ value.alias }}",
"lanes": "{{ value.lanes }}",
"admin_status": "up"
{%- for keyPort, valuePort in value.items() %}

{% if keyPort != "admin_status" %}"{{ keyPort }}": "{{ valuePort }}",{% endif %}
{%- endfor %}

"admin_status": "{{ value.admin_status|default("up") }}"
}
{%- if ns.update({'firstPrinted': True}) %}{% endif -%}
{%- endfor %}
Expand Down
7 changes: 7 additions & 0 deletions src/sonic-config-engine/tests/test_j2files.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ def test_l2switch_template(self):

self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))

template_dir = os.path.join(self.test_dir, '..', 'data', 'l2switch.j2')
argument = '-t ' + template_dir + ' -k Mellanox-SN2700 -p ' + self.t0_port_config
output = self.run_script(argument)
output_json = json.loads(output)

self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))

def test_qos_arista7050_render_template(self):
arista_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'arista', 'x86_64-arista_7050_qx32s', 'Arista-7050-QX-32S')
qos_file = os.path.join(arista_dir_path, 'qos.json.j2')
Expand Down

0 comments on commit e0781f4

Please sign in to comment.