diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2 index f308527856..1e554e4ed7 100644 --- a/files/image_config/interfaces/interfaces.j2 +++ b/files/image_config/interfaces/interfaces.j2 @@ -30,27 +30,19 @@ iface lo inet loopback {% block mgmt_interface %} # The management network interface -{% if MGMT_INTERFACE %} -{% for (name, prefix) in MGMT_INTERFACE|pfx_filter|unique(attribute=0) %} -auto {{ name }} -{% endfor %} -{% endif %} +auto eth0 {% if (ZTP_DHCP_DISABLED is not defined) and (ZTP is defined) and (ZTP['mode'] is defined and ZTP['mode']['profile'] == 'active') %} # ZTP out-of-band interface -{% if MGMT_INTERFACE %} -{% for (name, prefix) in MGMT_INTERFACE|pfx_filter|unique(attribute=0) %} -allow-hotplug {{ name }} +allow-hotplug eth0 {% if ZTP['mode']['ipv4'] == 'true' %} -iface {{ name }} inet dhcp +iface eth0 inet dhcp {% endif %} {% if ZTP['mode']['ipv6'] == 'true' %} -iface {{ name }} inet6 dhcp - up sysctl net.ipv6.conf.{{ name }}.accept_ra=1 - down sysctl net.ipv6.conf.{{ name }}.accept_ra=0 -{% endif %} -{% endfor %} +iface eth0 inet6 dhcp + up sysctl net.ipv6.conf.eth0.accept_ra=1 + down sysctl net.ipv6.conf.eth0.accept_ra=0 {% endif %} {% if ZTP['mode']['inband'] == 'true' %} @@ -73,7 +65,7 @@ iface {{ port }} inet6 dhcp {% else %} {% if MGMT_INTERFACE %} {% for (name, prefix) in MGMT_INTERFACE|pfx_filter %} -iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static +iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static address {{ prefix | ip }} netmask {{ prefix | netmask if prefix | ipv4 else prefix | prefixlen }} network {{ prefix | network }} @@ -85,15 +77,15 @@ iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static {% endif %} ########## management network policy routing rules # management port up rules - up ip {{ '-4' if prefix | ipv4 else '-6' }} route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev {{ name }} table {{ vrf_table }} metric 201 - up ip {{ '-4' if prefix | ipv4 else '-6' }} route add {{ prefix | network }}/{{ prefix | prefixlen }} dev {{ name }} table {{ vrf_table }} + up ip {{ '-4' if prefix | ipv4 else '-6' }} route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table {{ vrf_table }} metric 201 + up ip {{ '-4' if prefix | ipv4 else '-6' }} route add {{ prefix | network }}/{{ prefix | prefixlen }} dev eth0 table {{ vrf_table }} up ip {{ '-4' if prefix | ipv4 else '-6' }} rule add pref 32765 from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table {{ vrf_table }} {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %} up ip rule add pref 32764 to {{ route }} table {{ vrf_table }} {% endfor %} # management port down rules - pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev {{ name }} table {{ vrf_table }} - pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete {{ prefix | network }}/{{ prefix | prefixlen }} dev {{ name }} table {{ vrf_table }} + pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table {{ vrf_table }} + pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete {{ prefix | network }}/{{ prefix | prefixlen }} dev eth0 table {{ vrf_table }} pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} rule delete pref 32765 from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table {{ vrf_table }} {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %} pre-down ip rule delete pref 32764 to {{ route }} table {{ vrf_table }} diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 5a044c8f9e..b1ad117d25 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -10,7 +10,6 @@ from collections import defaultdict from lxml import etree as ET from lxml.etree import QName -from natsort import natsorted from portconfig import get_port_config from sonic_py_common.interface import backplane_prefix @@ -1433,8 +1432,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw results['MGMT_INTERFACE'] = {} mgmt_intf_count = 0 mgmt_alias_reverse_mapping = {} - sorted_keys = natsorted(mgmt_intf.keys(), key=lambda x : x[0].lower()) - for key in sorted_keys: + for key in mgmt_intf: alias = key[0] if alias in mgmt_alias_reverse_mapping: name = mgmt_alias_reverse_mapping[alias] diff --git a/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces b/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces deleted file mode 100644 index 12136a316a..0000000000 --- a/src/sonic-config-engine/tests/sample_output/py2/two_mgmt_interfaces +++ /dev/null @@ -1,76 +0,0 @@ -# -# =============== Managed by SONiC Config Engine DO NOT EDIT! =============== -# generated from /usr/share/sonic/templates/interfaces.j2 using sonic-cfggen -# file: /etc/network/interfaces -# -# The loopback network interface -auto lo -iface lo inet loopback - address 127.0.0.1 - netmask 255.255.0.0 - scope host - post-up ip addr del 127.0.0.1/8 dev lo - -# The management network interface -auto eth1 -auto eth0 -iface eth1 inet static - address 10.0.10.100 - netmask 255.255.255.0 - network 10.0.10.0 - broadcast 10.0.10.255 - ########## management network policy routing rules - # management port up rules - up ip -4 route add default via 10.0.10.1 dev eth1 table default metric 201 - up ip -4 route add 10.0.10.0/24 dev eth1 table default - up ip -4 rule add pref 32765 from 10.0.10.100/32 table default - # management port down rules - pre-down ip -4 route delete default via 10.0.10.1 dev eth1 table default - pre-down ip -4 route delete 10.0.10.0/24 dev eth1 table default - pre-down ip -4 rule delete pref 32765 from 10.0.10.100/32 table default -iface eth0 inet static - address 10.0.0.100 - netmask 255.255.255.0 - network 10.0.0.0 - broadcast 10.0.0.255 - ########## management network policy routing rules - # management port up rules - up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201 - up ip -4 route add 10.0.0.0/24 dev eth0 table default - up ip -4 rule add pref 32765 from 10.0.0.100/32 table default - # management port down rules - pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default - pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default - pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default -iface eth1 inet6 static - address 2603:10e2:0:abcd::8 - netmask 64 - network 2603:10e2:0:abcd:: - broadcast 2603:10e2:0:abcd:ffff:ffff:ffff:ffff - ########## management network policy routing rules - # management port up rules - up ip -6 route add default via 2603:10e2:0:abcd::1 dev eth1 table default metric 201 - up ip -6 route add 2603:10e2:0:abcd::/64 dev eth1 table default - up ip -6 rule add pref 32765 from 2603:10e2:0:abcd::8/128 table default - # management port down rules - pre-down ip -6 route delete default via 2603:10e2:0:abcd::1 dev eth1 table default - pre-down ip -6 route delete 2603:10e2:0:abcd::/64 dev eth1 table default - pre-down ip -6 rule delete pref 32765 from 2603:10e2:0:abcd::8/128 table default -iface eth0 inet6 static - address 2603:10e2:0:2902::8 - netmask 64 - network 2603:10e2:0:2902:: - broadcast 2603:10e2:0:2902:ffff:ffff:ffff:ffff - ########## management network policy routing rules - # management port up rules - up ip -6 route add default via 2603:10e2:0:2902::1 dev eth0 table default metric 201 - up ip -6 route add 2603:10e2:0:2902::/64 dev eth0 table default - up ip -6 rule add pref 32765 from 2603:10e2:0:2902::8/128 table default - # management port down rules - pre-down ip -6 route delete default via 2603:10e2:0:2902::1 dev eth0 table default - pre-down ip -6 route delete 2603:10e2:0:2902::/64 dev eth0 table default - pre-down ip -6 rule delete pref 32765 from 2603:10e2:0:2902::8/128 table default -# -source /etc/network/interfaces.d/* -# - diff --git a/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces b/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces deleted file mode 100644 index 7fa99896e8..0000000000 --- a/src/sonic-config-engine/tests/sample_output/py3/two_mgmt_interfaces +++ /dev/null @@ -1,76 +0,0 @@ -# -# =============== Managed by SONiC Config Engine DO NOT EDIT! =============== -# generated from /usr/share/sonic/templates/interfaces.j2 using sonic-cfggen -# file: /etc/network/interfaces -# -# The loopback network interface -auto lo -iface lo inet loopback - address 127.0.0.1 - netmask 255.255.0.0 - scope host - post-up ip addr del 127.0.0.1/8 dev lo - -# The management network interface -auto eth0 -auto eth1 -iface eth0 inet static - address 10.0.0.100 - netmask 255.255.255.0 - network 10.0.0.0 - broadcast 10.0.0.255 - ########## management network policy routing rules - # management port up rules - up ip -4 route add default via 10.0.0.1 dev eth0 table default metric 201 - up ip -4 route add 10.0.0.0/24 dev eth0 table default - up ip -4 rule add pref 32765 from 10.0.0.100/32 table default - # management port down rules - pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table default - pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table default - pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table default -iface eth0 inet6 static - address 2603:10e2:0:2902::8 - netmask 64 - network 2603:10e2:0:2902:: - broadcast 2603:10e2:0:2902:ffff:ffff:ffff:ffff - ########## management network policy routing rules - # management port up rules - up ip -6 route add default via 2603:10e2:0:2902::1 dev eth0 table default metric 201 - up ip -6 route add 2603:10e2:0:2902::/64 dev eth0 table default - up ip -6 rule add pref 32765 from 2603:10e2:0:2902::8/128 table default - # management port down rules - pre-down ip -6 route delete default via 2603:10e2:0:2902::1 dev eth0 table default - pre-down ip -6 route delete 2603:10e2:0:2902::/64 dev eth0 table default - pre-down ip -6 rule delete pref 32765 from 2603:10e2:0:2902::8/128 table default -iface eth1 inet static - address 10.0.10.100 - netmask 255.255.255.0 - network 10.0.10.0 - broadcast 10.0.10.255 - ########## management network policy routing rules - # management port up rules - up ip -4 route add default via 10.0.10.1 dev eth1 table default metric 201 - up ip -4 route add 10.0.10.0/24 dev eth1 table default - up ip -4 rule add pref 32765 from 10.0.10.100/32 table default - # management port down rules - pre-down ip -4 route delete default via 10.0.10.1 dev eth1 table default - pre-down ip -4 route delete 10.0.10.0/24 dev eth1 table default - pre-down ip -4 rule delete pref 32765 from 10.0.10.100/32 table default -iface eth1 inet6 static - address 2603:10e2:0:abcd::8 - netmask 64 - network 2603:10e2:0:abcd:: - broadcast 2603:10e2:0:abcd:ffff:ffff:ffff:ffff - ########## management network policy routing rules - # management port up rules - up ip -6 route add default via 2603:10e2:0:abcd::1 dev eth1 table default metric 201 - up ip -6 route add 2603:10e2:0:abcd::/64 dev eth1 table default - up ip -6 rule add pref 32765 from 2603:10e2:0:abcd::8/128 table default - # management port down rules - pre-down ip -6 route delete default via 2603:10e2:0:abcd::1 dev eth1 table default - pre-down ip -6 route delete 2603:10e2:0:abcd::/64 dev eth1 table default - pre-down ip -6 rule delete pref 32765 from 2603:10e2:0:abcd::8/128 table default -# -source /etc/network/interfaces.d/* -# - diff --git a/src/sonic-config-engine/tests/t0-sample-graph-two-mgmt.xml b/src/sonic-config-engine/tests/t0-sample-graph-two-mgmt.xml deleted file mode 100644 index da1b56fe13..0000000000 --- a/src/sonic-config-engine/tests/t0-sample-graph-two-mgmt.xml +++ /dev/null @@ -1,953 +0,0 @@ - - - - - - switch-t0 - 10.1.0.32 - BGPMonitor - 10.20.30.40 - 30 - 10 - 3 - - - false - switch-t0 - 10.0.0.56 - ARISTA01T1 - 10.0.0.57 - 1 - 180 - 60 - - - switch-t0 - FC00::71 - ARISTA01T1 - FC00::72 - 1 - 180 - 60 - - - false - switch-t0 - 10.0.0.58 - ARISTA02T1 - 10.0.0.59 - 1 - 180 - 60 - - - switch-t0 - FC00::75 - ARISTA02T1 - FC00::76 - 1 - 180 - 60 - - - false - switch-t0 - 10.0.0.60 - ARISTA03T1 - 10.0.0.61 - 1 - 180 - 60 - - - switch-t0 - FC00::79 - ARISTA03T1 - FC00::7A - 1 - 180 - 60 - - - false - switch-t0 - 10.0.0.62 - ARISTA04T1 - 10.0.0.63 - 1 - 180 - 60 - - - switch-t0 - FC00::7D - ARISTA04T1 - FC00::7E - 1 - 180 - 60 - - - - - 1 - - BGPMonitor - - - BGPPeer -
10.1.0.32
- - - - - - - - - 65100 - switch-t0 - - -
10.0.0.57
- - - - - -
10.0.0.59
- - - - - -
10.0.0.61
- - - - - -
10.0.0.63
- - - - - - - - - 64600 - ARISTA01T1 - - - - 64600 - ARISTA02T1 - - - - 64600 - ARISTA03T1 - - - - 64600 - ARISTA04T1 - - - - - - - - - - HostIP - Loopback0 - - 10.1.0.32/32 - - 10.1.0.32/32 - - - HostIP1 - Loopback0 - - FC00:1::32/128 - - FC00:1::32/128 - - - LoopbackIP1 - Loopback1 - - 10.10.0.99/32 - - 10.10.0.99/32 - - - LoopbackIP2 - Loopback2 - - 10.21.0.64/32 - - 10.21.0.64/32 - - - LoopbackIP3 - Loopback3 - - 10.21.64.2/32 - - 10.21.64.2/32 - - - - - HostIP - eth0 - - 10.0.0.100/24 - - 10.0.0.100/24 - - - HostIP - eth0 - - 2603:10e2:0:2902::8/64 - - 2603:10e2:0:2902::8/64 - - - HostIP1 - eth1 - - 10.0.10.100/24 - - 10.0.10.100/24 - - - HostIP1 - eth1 - - 2603:10e2:0:abcd::8/64 - - 2603:10e2:0:abcd::8/64 - - - - - - - switch-t0 - - - PortChannel01 - fortyGigE0/112 - - - - PortChannel02 - fortyGigE0/116 - - - - PortChannel03 - fortyGigE0/120 - - - - PortChannel04 - fortyGigE0/124 - - - - - - Vlan1000 - fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96 - False - 0.0.0.0/0 - - - 192.0.0.1;192.0.0.2 - fc02:2000::1;fc02:2000::2 - 1000 - 1000 - 192.168.0.0/27 - - - - - Vlan2000 - fortyGigE0/112;fortyGigE0/116;fortyGigE0/120 - False - 0.0.0.0/0 - - - - 2000 - 2000 - 192.168.200.0/27 - - - - - Vlan99 - fortyGigE0/100 - False - 0.0.0.0/0 - - UserDefinedL2Vlan - 192.0.0.1;192.0.0.2 - 99 - 99 - - - - - - Vlan98 - fortyGigE0/100;PortChannel01;PortChannel03 - False - 0.0.0.0/0 - - UserDefinedL2Vlan - 192.0.0.1;192.0.0.2 - 98 - 98 - - - - - - - - - PortChannel01 - 10.0.0.56/31 - - - - PortChannel01 - FC00::71/126 - - - - PortChannel02 - 10.0.0.58/31 - - - - PortChannel02 - FC00::75/126 - - - - PortChannel03 - 10.0.0.60/31 - - - - PortChannel03 - FC00::79/126 - - - - PortChannel04 - 10.0.0.62/31 - - - - PortChannel04 - FC00::7D/126 - - - - Vlan1000 - 192.168.0.1/27 - - - - Vlan2000 - 192.168.200.1/27 - - - - - - ERSPAN - everflow - Everflow - - - ERSPANv6 - everflowV6 - Everflow - - - EGRESS_ERSPAN - everflow_egress - Everflow - - - PortChannel01;PortChannel02;PortChannel03;PortChannel04 - DataAclIngress - DataPlane - - - PortChannel01;PortChannel02;Vlan98 - DataAclEgress - DataPlane - - - SNMP - SNMP_ACL - SNMP - - - NTP - NTP_ACL - NTP - - - SSH - SSH_ACL - SSH - - - SSH - ROUTER-PROTECT - SSH - - - SNMP - ROUTER-PROTECT - SNMP - - - NTP - NTP_ACL - - - - - - - - - - DeviceInterfaceLink - ARISTA01T1 - Ethernet1/1 - switch-t0 - fortyGigE0/112 - - - DeviceInterfaceLink - ARISTA02T1 - Ethernet1/1 - switch-t0 - fortyGigE0/116 - - - DeviceInterfaceLink - ARISTA03T1 - Ethernet1/1 - switch-t0 - fortyGigE0/120 - - - DeviceInterfaceLink - ARISTA04T1 - Ethernet1/1 - switch-t0 - fortyGigE0/124 - 100000 - - - DeviceInterfaceLink - 100000 - switch-t0 - fortyGigE0/4 - true - ARISTA05T1 - Ethernet1/33 - true - - - DeviceInterfaceLink - Servers0 - eth0 - switch-t0 - fortyGigE0/4 - - - DeviceInterfaceLink - Servers100 - eth0 - switch-t0 - fortyGigE0/100 - - - - - switch-t0 - Force10-S6000 - - - ARISTA01T1 - Arista - - - ARISTA02T1 - Arista - - - ARISTA03T1 - Arista - - - ARISTA04T1 - Arista - - - - - - - - DeviceInterface - - true - 1 - Ethernet0 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet8 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet12 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet16 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet20 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet24 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet28 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet32 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet36 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet40 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet44 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet48 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet52 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet56 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet60 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet64 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet68 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet72 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet76 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet80 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet84 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet88 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet92 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet96 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet100 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet104 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet108 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet112 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet116 - - false - 0 - 0 - 40000 - - - DeviceInterface - - true - 1 - Ethernet120 - - false - 0 - 0 - 40000 - - - Force10-S6000 - - - - - - - switch-t0 - - - ErspanDestinationIpv4 - - 2.2.2.2 - - - - - - - - - - - - - AutoNegotiation - - True - - - FECDisabled - - True - - - ARISTA05T1:Ethernet1/33;switch-t0:fortyGigE0/4 - - - - - - AutoNegotiation - - False - - - FECDisabled - - True - - - ARISTA06T1:Ethernet1/34;switch-t0:fortyGigE0/8 - - - - - - - switch-t0 - - - DeploymentId - - 1 - - - - - - - switch-t0 - Force10-S6000 - diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index fc8eb3fb02..a82e108f68 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -14,7 +14,6 @@ class TestJ2Files(TestCase): self.simple_minigraph = os.path.join(self.test_dir, 'simple-sample-graph.xml') self.t0_minigraph = os.path.join(self.test_dir, 't0-sample-graph.xml') self.t0_mvrf_minigraph = os.path.join(self.test_dir, 't0-sample-graph-mvrf.xml') - self.t0_two_mgmt_minigraph = os.path.join(self.test_dir, 't0-sample-graph-two-mgmt.xml') self.pc_minigraph = os.path.join(self.test_dir, 'pc-test-graph.xml') self.t0_port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini') self.l1_l3_port_config = os.path.join(self.test_dir, 'l1-l3-sample-port-config.ini') @@ -93,10 +92,6 @@ class TestJ2Files(TestCase): self.run_script(argument) self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'mvrf_interfaces'), self.output_file)) - argument = '-m ' + self.t0_two_mgmt_minigraph + ' -p ' + self.t0_port_config + ' -a \'{\"hwaddr\":\"e4:1d:2d:a5:f3:ad\"}\' -t ' + interfaces_template + ' > ' + self.output_file - self.run_script(argument) - self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'two_mgmt_interfaces'), self.output_file), self.output_file) - 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