From d73d5440c5d079e7c982199e5eb4cb0dbde44da6 Mon Sep 17 00:00:00 2001 From: Richard Alpe Date: Mon, 5 Feb 2024 15:34:41 +0100 Subject: [PATCH] test: remove hardcoded interface type This can now a days be inferred and isn't needed. Also, the interface type in virtual testing is now etherlike not ethernet. Signed-off-by: Richard Alpe --- .../case/ietf_interfaces/iface_phys_address.py | 1 - test/case/ietf_interfaces/ipv4_address.py | 1 - test/case/ietf_interfaces/routing_basic.py | 2 -- test/case/ietf_interfaces/vlan_ping.py | 1 - test/case/ietf_routing/ospf_basic.py | 5 ----- test/case/ietf_routing/ospf_multiarea.py | 18 ------------------ .../ietf_routing/ospf_unnumbered_interface.py | 5 ----- test/case/ietf_routing/static_routing.py | 5 ----- test/case/infix_interfaces/bridge_basic.py | 1 - .../infix_interfaces/bridge_fwd_dual_dut.py | 6 ------ .../infix_interfaces/bridge_fwd_sgl_dut.py | 2 -- test/case/infix_interfaces/bridge_veth.py | 1 - test/case/infix_interfaces/bridge_vlan.py | 1 - .../infix_interfaces/bridge_vlan_separation.py | 6 ------ test/case/infix_interfaces/dual_bridge.py | 1 - test/case/infix_interfaces/ipv4_autoconf.py | 1 - test/case/infix_services/services_basic.py | 1 - 17 files changed, 58 deletions(-) diff --git a/test/case/ietf_interfaces/iface_phys_address.py b/test/case/ietf_interfaces/iface_phys_address.py index 414f2221..e9e1689c 100755 --- a/test/case/ietf_interfaces/iface_phys_address.py +++ b/test/case/ietf_interfaces/iface_phys_address.py @@ -20,7 +20,6 @@ with infamy.Test() as test: "interfaces": { "interface": [{ "name": f"{tport}", - "type": "infix-if-type:ethernet", "phys-address": f"{cmac}" }] } diff --git a/test/case/ietf_interfaces/ipv4_address.py b/test/case/ietf_interfaces/ipv4_address.py index c3b93d79..c897507b 100755 --- a/test/case/ietf_interfaces/ipv4_address.py +++ b/test/case/ietf_interfaces/ipv4_address.py @@ -79,7 +79,6 @@ with infamy.Test() as test: "interfaces": { "interface": [{ "name": f"{interface_name}", - "type": "infix-if-type:ethernet", "ipv4": { "address": [{ "ip": f"{new_ip_address}", diff --git a/test/case/ietf_interfaces/routing_basic.py b/test/case/ietf_interfaces/routing_basic.py index 8adadd1b..3f16e001 100755 --- a/test/case/ietf_interfaces/routing_basic.py +++ b/test/case/ietf_interfaces/routing_basic.py @@ -24,7 +24,6 @@ def config_target(target, tport0, tport1, enable_fwd): "interface": [ { "name": tport0, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": enable_fwd, @@ -36,7 +35,6 @@ def config_target(target, tport0, tport1, enable_fwd): }, { "name": tport1, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": enable_fwd, diff --git a/test/case/ietf_interfaces/vlan_ping.py b/test/case/ietf_interfaces/vlan_ping.py index 761d5283..139cfa1d 100755 --- a/test/case/ietf_interfaces/vlan_ping.py +++ b/test/case/ietf_interfaces/vlan_ping.py @@ -33,7 +33,6 @@ with infamy.Test() as test: "interface": [ { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, }, { diff --git a/test/case/ietf_routing/ospf_basic.py b/test/case/ietf_routing/ospf_basic.py index 6335c7c7..1bdf4b31 100755 --- a/test/case/ietf_routing/ospf_basic.py +++ b/test/case/ietf_routing/ospf_basic.py @@ -9,7 +9,6 @@ def config_target1(target, data, link): "interface": [ { "name": data, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -20,7 +19,6 @@ def config_target1(target, data, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -32,7 +30,6 @@ def config_target1(target, data, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -89,7 +86,6 @@ def config_target2(target, link): "interface": [ { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -101,7 +97,6 @@ def config_target2(target, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "forwarding": True, "ipv4": { diff --git a/test/case/ietf_routing/ospf_multiarea.py b/test/case/ietf_routing/ospf_multiarea.py index 948405f6..cb01ca81 100755 --- a/test/case/ietf_routing/ospf_multiarea.py +++ b/test/case/ietf_routing/ospf_multiarea.py @@ -35,7 +35,6 @@ def config_target1(target, ring1, ring2, cross, link): "interface": [ { "name": ring1, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -46,7 +45,6 @@ def config_target1(target, ring1, ring2, cross, link): }, { "name": ring2, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -57,7 +55,6 @@ def config_target1(target, ring1, ring2, cross, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -72,7 +69,6 @@ def config_target1(target, ring1, ring2, cross, link): }, { "name": cross, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -84,7 +80,6 @@ def config_target1(target, ring1, ring2, cross, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -180,7 +175,6 @@ def config_target2(target, ring1, ring2, cross, link): "interface": [ { "name": ring1, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -191,7 +185,6 @@ def config_target2(target, ring1, ring2, cross, link): }, { "name": ring2, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -202,7 +195,6 @@ def config_target2(target, ring1, ring2, cross, link): }, { "name": cross, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -213,7 +205,6 @@ def config_target2(target, ring1, ring2, cross, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -247,7 +238,6 @@ def config_target2(target, ring1, ring2, cross, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -341,7 +331,6 @@ def config_target3(target, ring1, ring2, cross, link): "interface": [ { "name": ring2, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -353,7 +342,6 @@ def config_target3(target, ring1, ring2, cross, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -365,7 +353,6 @@ def config_target3(target, ring1, ring2, cross, link): }, { "name": cross, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -377,7 +364,6 @@ def config_target3(target, ring1, ring2, cross, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -449,7 +435,6 @@ def config_target4(target, ring1, ring2, cross, link): "interface": [ { "name": ring1, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -460,7 +445,6 @@ def config_target4(target, ring1, ring2, cross, link): }, { "name": cross, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -471,7 +455,6 @@ def config_target4(target, ring1, ring2, cross, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -483,7 +466,6 @@ def config_target4(target, ring1, ring2, cross, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ diff --git a/test/case/ietf_routing/ospf_unnumbered_interface.py b/test/case/ietf_routing/ospf_unnumbered_interface.py index bd547691..b8c86362 100755 --- a/test/case/ietf_routing/ospf_unnumbered_interface.py +++ b/test/case/ietf_routing/ospf_unnumbered_interface.py @@ -13,7 +13,6 @@ def config_target1(target, data, link): "interface": [ { "name": data, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -24,7 +23,6 @@ def config_target1(target, data, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -36,7 +34,6 @@ def config_target1(target, data, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -96,7 +93,6 @@ def config_target2(target, link): "interface": [ { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -108,7 +104,6 @@ def config_target2(target, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "forwarding": True, "ipv4": { diff --git a/test/case/ietf_routing/static_routing.py b/test/case/ietf_routing/static_routing.py index cdb3ee98..f56c9d49 100755 --- a/test/case/ietf_routing/static_routing.py +++ b/test/case/ietf_routing/static_routing.py @@ -29,7 +29,6 @@ def config_target1(target, data, link): "interface": [ { "name": data, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -47,7 +46,6 @@ def config_target1(target, data, link): }, { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -66,7 +64,6 @@ def config_target1(target, data, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [{ @@ -119,7 +116,6 @@ def config_target2(target, link): "interface": [ { "name": link, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "forwarding": True, @@ -138,7 +134,6 @@ def config_target2(target, link): }, { "name": "lo", - "type": "infix-if-type:ethernet", "enabled": True, "forwarding": True, "ipv4": { diff --git a/test/case/infix_interfaces/bridge_basic.py b/test/case/infix_interfaces/bridge_basic.py index 4c927b8d..37b4e693 100755 --- a/test/case/infix_interfaces/bridge_basic.py +++ b/test/case/infix_interfaces/bridge_basic.py @@ -33,7 +33,6 @@ with infamy.Test() as test: }, { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0" diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut.py b/test/case/infix_interfaces/bridge_fwd_dual_dut.py index d33fc50a..ff8d5781 100755 --- a/test/case/infix_interfaces/bridge_fwd_dual_dut.py +++ b/test/case/infix_interfaces/bridge_fwd_dual_dut.py @@ -52,7 +52,6 @@ with infamy.Test() as test: }, { "name": tport10, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -61,7 +60,6 @@ with infamy.Test() as test: }, { "name": tport11, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -70,7 +68,6 @@ with infamy.Test() as test: }, { "name": tport12, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0", @@ -101,7 +98,6 @@ with infamy.Test() as test: }, { "name": tport20, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -110,7 +106,6 @@ with infamy.Test() as test: }, { "name": tport21, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -119,7 +114,6 @@ with infamy.Test() as test: }, { "name": tport22, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0", diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut.py b/test/case/infix_interfaces/bridge_fwd_sgl_dut.py index fc0272e4..dd7a6ae6 100755 --- a/test/case/infix_interfaces/bridge_fwd_sgl_dut.py +++ b/test/case/infix_interfaces/bridge_fwd_sgl_dut.py @@ -36,7 +36,6 @@ with infamy.Test() as test: }, { "name": tport0, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0" @@ -44,7 +43,6 @@ with infamy.Test() as test: }, { "name": tport1, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0" diff --git a/test/case/infix_interfaces/bridge_veth.py b/test/case/infix_interfaces/bridge_veth.py index 034b92e9..b97771f8 100755 --- a/test/case/infix_interfaces/bridge_veth.py +++ b/test/case/infix_interfaces/bridge_veth.py @@ -25,7 +25,6 @@ with infamy.Test() as test: }, { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0" diff --git a/test/case/infix_interfaces/bridge_vlan.py b/test/case/infix_interfaces/bridge_vlan.py index f7505cd9..7fd5abce 100755 --- a/test/case/infix_interfaces/bridge_vlan.py +++ b/test/case/infix_interfaces/bridge_vlan.py @@ -56,7 +56,6 @@ with infamy.Test() as test: }, { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, diff --git a/test/case/infix_interfaces/bridge_vlan_separation.py b/test/case/infix_interfaces/bridge_vlan_separation.py index 78bc7f11..6e9bf2f7 100755 --- a/test/case/infix_interfaces/bridge_vlan_separation.py +++ b/test/case/infix_interfaces/bridge_vlan_separation.py @@ -57,7 +57,6 @@ with infamy.Test() as test: }, { "name": tport10, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -66,7 +65,6 @@ with infamy.Test() as test: }, { "name": tport11, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 20, @@ -75,7 +73,6 @@ with infamy.Test() as test: }, { "name": tport12, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0", @@ -111,7 +108,6 @@ with infamy.Test() as test: }, { "name": tport20, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 10, @@ -120,7 +116,6 @@ with infamy.Test() as test: }, { "name": tport21, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "pvid": 20, @@ -129,7 +124,6 @@ with infamy.Test() as test: }, { "name": tport22, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0", diff --git a/test/case/infix_interfaces/dual_bridge.py b/test/case/infix_interfaces/dual_bridge.py index 4a964cef..889bc414 100755 --- a/test/case/infix_interfaces/dual_bridge.py +++ b/test/case/infix_interfaces/dual_bridge.py @@ -60,7 +60,6 @@ with infamy.Test() as test: }, { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "infix-interfaces:bridge-port": { "bridge": "br0" diff --git a/test/case/infix_interfaces/ipv4_autoconf.py b/test/case/infix_interfaces/ipv4_autoconf.py index c7f982e1..936281a9 100755 --- a/test/case/infix_interfaces/ipv4_autoconf.py +++ b/test/case/infix_interfaces/ipv4_autoconf.py @@ -18,7 +18,6 @@ with infamy.Test() as test: "interface": [ { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "autoconf": { diff --git a/test/case/infix_services/services_basic.py b/test/case/infix_services/services_basic.py index 6bb7a0fa..f8d487b8 100755 --- a/test/case/infix_services/services_basic.py +++ b/test/case/infix_services/services_basic.py @@ -54,7 +54,6 @@ with infamy.Test() as test: "interface": [ { "name": tport, - "type": "infix-if-type:ethernet", "enabled": True, "ipv4": { "address": [