test: refactor test environment

test/case/all.yaml

@@ -3,30 +3,31 @@
 - case: meta/wait.py
 
 - name: Misc tests
-  suite: misc/all.yaml
+  suite: misc/misc.yaml
 
 - name:  ietf-system
-  suite: ietf_system/all.yaml
+  suite: ietf_system/ietf_system.yaml
 
 - name:  ietf-syslog
-  suite: ietf_syslog/all.yaml
+  suite: ietf_syslog/ietf_syslog.yaml
 
 - name:  ietf-interfaces
-  suite: ietf_interfaces/all.yaml
+  suite: ietf_interfaces/ietf_interfaces.yaml
 
 - name:  infix-interfaces
-  suite: infix_interfaces/all.yaml
+  suite: infix_interfaces/infix_interfaces.yaml
 
 - name:  ietf-routing
-  suite: ietf_routing/all.yaml
+  suite: ietf_routing/ietf_routing.yaml
 
 - name:  infix-containers
-  suite: infix_containers/all.yaml
+  suite: infix_containers/infix_containers.yaml
 
 - name:  infix-dhcp
-  suite: infix_dhcp/all.yaml
+  suite: infix_dhcp/infix_dhcp.yaml
 
 - name:  ietf-hardware
-  suite: ietf_hardware/all.yaml
-#- name:  infix-services
-#  suite: infix_services/all.yaml
+  suite: ietf_hardware/ietf_hardware.yaml
+
+- name:  infix-services
+  suite: infix_services/infix_services.yaml

test/case/ietf_hardware/ietf_hardware.yaml

@@ -0,0 +1,3 @@
+---
+- name: usb
+  case: usb/test.py

test/case/ietf_hardware/usb.py → test/case/ietf_hardware/usb/test.py

@@ -9,7 +9,7 @@
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("1x1"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
         available=usb.get_usb_ports(target)
 

test/case/ietf_hardware/usb/topology.dot

@@ -0,0 +1,23 @@
+graph "1x1" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+}

test/case/ietf_interfaces/ietf_interfaces.yaml

@@ -0,0 +1,18 @@
+---
+- name: vlan_ping
+  case: vlan_ping/test.py
+
+- name: ipv4_address
+  case: ipv4_address/test.py
+
+- name: ipv6_address
+  case: ipv6_address/test.py
+
+- name: iface_phys_address
+  case: iface_phys_address/test.py
+
+- name: iface_status
+  case: iface_status/test.py
+
+- name: routing_basic
+  case: routing_basic/test.py

test/case/ietf_interfaces/iface_phys_address.py → test/case/ietf_interfaces/iface_phys_address/test.py

@@ -8,7 +8,7 @@
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("1x2"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
         _, tport = env.ltop.xlate("target", "data")
         pmac = iface.get_phys_address(target, tport)

test/case/ietf_interfaces/iface_phys_address/topology.dot

@@ -0,0 +1,24 @@
+graph "1x2" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt | <data> | data }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt | <data> data } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+	host:data -- target:data
+}

test/case/ietf_interfaces/iface_status.py → test/case/ietf_interfaces/iface_status/test.py

@@ -2,6 +2,7 @@
 
 import infamy
 import infamy.iface as iface
+import os
 
 
 def print_err_msg(interface, param, val):
@@ -27,7 +28,7 @@ def asser_iface_exists(target, interface):
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("1x1"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
 
     iface.print_all(target)

test/case/ietf_interfaces/iface_status/topology.dot

@@ -0,0 +1,23 @@
+graph "1x1" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+}

test/case/ietf_interfaces/ipv4_address.py → test/case/ietf_interfaces/ipv4_address/test.py

@@ -12,7 +12,7 @@
 
 with infamy.Test() as test:
     with test.step("Setup"):
-        env = infamy.Env(infamy.std_topology("1x1"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
         _, interface_name = env.ltop.xlate("target", "mgmt")
 

test/case/ietf_interfaces/ipv4_address/topology.dot

@@ -0,0 +1,23 @@
+graph "1x1" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+}

test/case/ietf_interfaces/ipv6_address.py → test/case/ietf_interfaces/ipv6_address/test.py

@@ -6,7 +6,7 @@
 
 with infamy.Test() as test:
     with test.step("Initializing ..."):
-        env = infamy.Env(infamy.std_topology("1x2"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
         tgtssh = env.attach("target", "mgmt", "ssh")
 

test/case/ietf_interfaces/ipv6_address/topology.dot

@@ -0,0 +1,24 @@
+graph "1x2" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt | <data> | data }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt | <data> data } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+	host:data -- target:data
+}

test/case/ietf_interfaces/routing_basic.py → test/case/ietf_interfaces/routing_basic/test.py

@@ -50,7 +50,7 @@ def config_target(target, tport0, tport1, enable_fwd):
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("1x3"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
         _, tport0 = env.ltop.xlate("target", "data0")
         _, tport1 = env.ltop.xlate("target", "data1")

test/case/ietf_interfaces/routing_basic/topology.dot

@@ -0,0 +1,25 @@
+graph "1x3" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt | <data0> data0 | <data1>  data1 }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt | <data0> data0 | <data1> data1 } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+	host:data0 -- target:data0
+	host:data1 -- target:data1
+}

test/case/ietf_interfaces/vlan_ping.py → test/case/ietf_interfaces/vlan_ping/test.py

@@ -22,7 +22,7 @@ def test_ping(hport, should_pass):
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("1x2"))
+        env = infamy.Env()
         target = env.attach("target", "mgmt")
 
     with test.step("Configure VLAN 10 on target:data with IP 10.0.0.2"):

test/case/ietf_interfaces/vlan_ping/topology.dot

@@ -0,0 +1,24 @@
+graph "1x2" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <tgt> tgt | <data> | data }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target [
+	    label="{ <mgmt> mgmt | <data> data } | target",
+	    pos="10,12!",
+
+	    kind="infix",
+	];
+
+	host:tgt -- target:mgmt [kind=mgmt]
+	host:data -- target:data
+}

test/case/ietf_routing/ietf_routing.yaml

@@ -0,0 +1,12 @@
+---
+- name: static_routing
+  case: static_routing/test.py
+
+- name: ospf_basic
+  case: ospf_basic/test.py
+
+- name: ospf_unnumbered_interface
+  case: ospf_unnumbered_interface/test.py
+
+- name: ospf_multiarea
+  case: ospf_multiarea/test.py

test/case/ietf_routing/ospf_basic.py → test/case/ietf_routing/ospf_basic/test.py

@@ -153,7 +153,7 @@ def config_target2(target, link):
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("2x2"))
+        env = infamy.Env()
         target1 = env.attach("target1", "mgmt")
         target2 = env.attach("target2", "mgmt")
 

test/case/ietf_routing/ospf_basic/topology.dot

@@ -0,0 +1,32 @@
+graph "2x2" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	host [
+	    label="host | { <mgmt1> mgmt1 | <data1> data1 | <mgmt2> mgmt2 | <data2> data2 }",
+	    pos="0,12!",
+	    kind="controller",
+	];
+
+        target1 [
+	    label="{ <mgmt> mgmt | <data> data | <target2> target2} | target1",
+	    pos="10,18!",
+
+	    kind="infix",
+	];
+	target2 [
+	    label="{ <target1> target1 |<mgmt> mgmt | <data> data  } | target2",
+	    pos="10,6!",
+
+	    kind="infix",
+	];
+	host:mgmt1 -- target1:mgmt [kind=mgmt]
+        host:mgmt2 -- target2:mgmt [kind=mgmt]
+	host:data1 -- target1:data
+	host:data2 -- target2:data
+	target1:target2 -- target2:target1
+}

test/case/ietf_routing/ospf_multiarea.py → test/case/ietf_routing/ospf_multiarea/test.py

@@ -424,7 +424,6 @@ def config_target3(target, ring1, ring2, cross, link):
         }
     })
 
-
 def config_target4(target, ring1, ring2, cross, link):
     target.put_config_dict("ietf-interfaces", {
         "interfaces": {
@@ -540,7 +539,7 @@ def disable_link(target, link):
 
 with infamy.Test() as test:
     with test.step("Initialize"):
-        env = infamy.Env(infamy.std_topology("ring-4-duts"))
+        env = infamy.Env()
         dut1 = env.attach("dut1", "mgmt")
         dut2 = env.attach("dut2", "mgmt")
         dut3 = env.attach("dut3", "mgmt")