From aaa577339f5df47c0ebe2060da782b71ddec8b68 Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Mon, 3 Apr 2017 13:48:18 -0700 Subject: [PATCH 1/3] [snmp] Fix a bug in SNMP alias mapping Which was introduced in #448. --- dockers/docker-snmp-sv2/alias_map.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-snmp-sv2/alias_map.j2 b/dockers/docker-snmp-sv2/alias_map.j2 index 76acb057480e..0f91fa26eabe 100644 --- a/dockers/docker-snmp-sv2/alias_map.j2 +++ b/dockers/docker-snmp-sv2/alias_map.j2 @@ -1,5 +1,5 @@ { {% for member in minigraph_ports.keys() %} - "{{member}}": "{{minigraph_ports[member]['alias']}}" + "{{member}}": "{{minigraph_ports[member]['alias']}}"{% if not loop.last %},{% endif %} {% endfor %} } From e952c66fa94eaeeed03613b7a0825bad6247ce15 Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Mon, 3 Apr 2017 14:11:51 -0700 Subject: [PATCH 2/3] Add test for alias_map.j2 --- src/sonic-config-engine/tests/test_j2files.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index 30a67f0b6cd3..516bac56c3a5 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -21,6 +21,13 @@ def test_interfaces(self): argument = '-m "' + self.t0_minigraph + '" -p "' + self.t0_port_config + '" -t "' + interfaces_template + '"' output = self.run_script(argument) + def test_alias_map(self): + alias_map_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-snmp-sv2', 'alias_map.j2') + argument = '-m "' + self.t0_minigraph + '" -p "' + self.t0_port_config + '" -t "' + alias_map_template + '"' + output = self.run_script(argument) + data = json.loads(output) + self.assertEqual(data["Ethernet4"], "fortyGigE0/4") + def test_teamd(self): argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -v "minigraph_portchannels.keys() | join(\' \')"' output = self.run_script(argument) # Mock the output via config.sh in docker-teamd From 25f744a0dd6484bcaaf09afeb5bde684de78894b Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Mon, 3 Apr 2017 14:12:32 -0700 Subject: [PATCH 3/3] Update test_j2files.py --- src/sonic-config-engine/tests/test_j2files.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index 516bac56c3a5..cf1e32aea519 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -1,6 +1,7 @@ import filecmp import os import subprocess +import json from unittest import TestCase