tests: py: osf is ip-only

Pending kernel patch rejects osf in inet/ip6, move this to ip to
prevent CI failure.

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/py/inet/osf.t b/tests/py/ip/osf.t
similarity index 92%
rename from tests/py/inet/osf.t
rename to tests/py/ip/osf.t
index c82854191adfe24146b517c6e1833ff28a6788f3..368baefd844d38200db47ea05803fc632523c6d3 100644 (file)
--- a/tests/py/inet/osf.t
+++ b/tests/py/ip/osf.t
@@ -1,8 +1,6 @@
 :osfchain;type filter hook input priority 0
 
 *ip;osfip;osfchain
-*ip6;osfip6;osfchain
-*inet;osfinet;osfchain
 
 osf name "Linux";ok
 osf ttl loose name "Linux";ok

diff --git a/tests/py/inet/osf.t.json b/tests/py/ip/osf.t.json
similarity index 100%
rename from tests/py/inet/osf.t.json
rename to tests/py/ip/osf.t.json

diff --git a/tests/py/inet/osf.t.json.output b/tests/py/ip/osf.t.json.output
similarity index 100%
rename from tests/py/inet/osf.t.json.output
rename to tests/py/ip/osf.t.json.output

diff --git a/tests/py/inet/osf.t.payload b/tests/py/ip/osf.t.payload
similarity index 79%
rename from tests/py/inet/osf.t.payload
rename to tests/py/ip/osf.t.payload
index 65d0a2e01a8d62882fc7d064e591c08fd6749ac2..373637aa53907a43a94d8266f52d940afd47512a 100644 (file)
--- a/tests/py/inet/osf.t.payload
+++ b/tests/py/ip/osf.t.payload
@@ -1,53 +1,53 @@
 # osf name "Linux"
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ]
 
 # osf ttl loose name "Linux"
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ]
 
 # osf ttl skip name "Linux"
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ]
 
 # osf ttl skip version "Linux:3.0"
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x4c696e75 0x783a332e 0x30000000 0x00000000 ]
 
 # osf name { "Windows", "MacOs" }
-__set%d osfinet 3 size 2
-__set%d osfinet 0
+__set%d osfip 3 size 2
+__set%d osfip 0
        element 57696e64 6f777300 00000000 00000000     element 4d61634f 73000000 00000000 00000000
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __set%d ]
 
 # osf version { "Windows:XP", "MacOs:Sierra" }
-__set%d osfinet 3 size 2
-__set%d osfinet 0
+__set%d osfip 3 size 2
+__set%d osfip 0
        element 57696e64 6f77733a 58500000 00000000     element 4d61634f 733a5369 65727261 00000000
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __set%d ]
 
 # ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
-__map%d osfinet b size 2
-__map%d osfinet 0
+__map%d osfip b size 2
+__map%d osfip 0
        element 57696e64 6f777300 00000000 00000000 : 00000001  element 4d61634f 73000000 00000000 00000000 : 00000002
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __map%d dreg 1 ]
   [ ct set mark with reg 1 ]
 
 # ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
-__map%d osfinet b size 2
-__map%d osfinet 0
+__map%d osfip b size 2
+__map%d osfip 0
        element 57696e64 6f77733a 58500000 00000000 : 00000003  element 4d61634f 733a5369 65727261 00000000 : 00000004
-inet osfinet osfchain
+ip osfip osfchain
   [ osf dreg 1 ]
   [ lookup reg 1 set __map%d dreg 1 ]
   [ ct set mark with reg 1 ]