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 <richard@bit42.se>
This commit is contained in:
Richard Alpe
2024-02-05 18:01:30 +01:00
committed by Joachim Wiberg
parent 104a70d46c
commit d73d5440c5
17 changed files with 0 additions and 58 deletions
@@ -20,7 +20,6 @@ with infamy.Test() as test:
"interfaces": {
"interface": [{
"name": f"{tport}",
"type": "infix-if-type:ethernet",
"phys-address": f"{cmac}"
}]
}
@@ -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}",
@@ -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,
-1
View File
@@ -33,7 +33,6 @@ with infamy.Test() as test:
"interface": [
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
},
{
-5
View File
@@ -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": {
-18
View File
@@ -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": [{
@@ -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": {
-5
View File
@@ -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": {
@@ -33,7 +33,6 @@ with infamy.Test() as test:
},
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"infix-interfaces:bridge-port": {
"bridge": "br0"
@@ -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",
@@ -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"
@@ -25,7 +25,6 @@ with infamy.Test() as test:
},
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"infix-interfaces:bridge-port": {
"bridge": "br0"
@@ -56,7 +56,6 @@ with infamy.Test() as test:
},
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"infix-interfaces:bridge-port": {
"pvid": 10,
@@ -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",
@@ -60,7 +60,6 @@ with infamy.Test() as test:
},
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"infix-interfaces:bridge-port": {
"bridge": "br0"
@@ -18,7 +18,6 @@ with infamy.Test() as test:
"interface": [
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"ipv4": {
"autoconf": {
@@ -54,7 +54,6 @@ with infamy.Test() as test:
"interface": [
{
"name": tport,
"type": "infix-if-type:ethernet",
"enabled": True,
"ipv4": {
"address": [