matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-snmp]: Remove alias_map json since it is not needed anymore (#2159)

Browse Source 
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
This commit is contained in:
stepanblyschak 2018-10-16 19:33:59 +03:00 committed by lguohan
parent 3fb150a275
commit 7757bc2ddf
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dockers/docker-snmp-sv2/alias_map.j2
View File

@ -1,5 +0,0 @@
{
{% for member in PORT %}
"{{member}}": "{{PORT[member]['alias']}}"{% if not loop.last %},{% endif %}
{% endfor %}
}

1
dockers/docker-snmp-sv2/start.sh
View File

@ -5,7 +5,6 @@ sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t /usr/share/sonic/templates/sy
mkdir -p /etc/snmp
sonic-cfggen -d -y /etc/sonic/snmp.yml -t /usr/share/sonic/templates/snmpd.conf.j2 > /etc/snmp/snmpd.conf
sonic-cfggen -d -t /usr/share/sonic/templates/alias_map.j2 > /etc/snmp/alias_map.json
mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status

7
src/sonic-config-engine/tests/test_j2files.py
View File

@ -32,13 +32,6 @@ class TestJ2Files(TestCase):
self.run_script(argument)
self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', 'interfaces'), self.output_file))
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_ports_json(self):
ports_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ports.json.j2')
argument = '-m ' + self.simple_minigraph + ' -p ' + self.t0_port_config + ' -t ' + ports_template + ' > ' + self.output_file