ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: http static - skip if cannot create namespaces

Browse Source 
Type: test

Change-Id: I5fddb293f1b56853613ca2823dbb6d3d887d9929
Signed-off-by: adrianvillin <avillin@cisco.com>
This commit is contained in:
adrianvillin
2023-10-31 13:15:53 +01:00
committed by Andrew Yourtchenko
parent 4a8fde0e51
commit e908fe7e47
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/asf/test_http_static.py
View File

@ -6,7 +6,6 @@ import tempfile
from vpp_qemu_utils import ( from vpp_qemu_utils import (
create_host_interface, create_host_interface,
delete_host_interfaces, delete_host_interfaces,
can_create_namespaces,
create_namespace, create_namespace,
delete_namespace, delete_namespace,
) )
@ -15,8 +14,9 @@ from vpp_qemu_utils import (
@unittest.skipIf( @unittest.skipIf(
"http_static" in config.excluded_plugins, "Exclude HTTP Static Server plugin tests" "http_static" in config.excluded_plugins, "Exclude HTTP Static Server plugin tests"
) )
@unittest.skipIf(config.skip_netns_tests, "netns not available or disabled from cli")
class TestHttpStaticVapi(VppTestCase): class TestHttpStaticVapi(VppTestCase):
"""enable the http static server [VAPI]""" """enable the http static server and send requests [VAPI]"""
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
@ -28,11 +28,9 @@ class TestHttpStaticVapi(VppTestCase):
cls.temp2 = tempfile.NamedTemporaryFile() cls.temp2 = tempfile.NamedTemporaryFile()
cls.temp2.write(b"Hello world2") cls.temp2.write(b"Hello world2")
if not can_create_namespaces():
raise Exception("Unable to create namespace")
create_namespace("HttpStatic") create_namespace("HttpStatic")
create_host_interface("vppHost", "vppOut", "HttpStatic", "10.10.1.1/24") create_host_interface("vppHost", "vppOut", "HttpStatic", "10.10.1.1/24")
cls.vapi.cli("create host-interface name vppOut") cls.vapi.cli("create host-interface name vppOut")
cls.vapi.cli("set int state host-vppOut up") cls.vapi.cli("set int state host-vppOut up")
cls.vapi.cli("set int ip address host-vppOut 10.10.1.2/24") cls.vapi.cli("set int ip address host-vppOut 10.10.1.2/24")
@ -83,8 +81,9 @@ class TestHttpStaticVapi(VppTestCase):
@unittest.skipIf( @unittest.skipIf(
"http_static" in config.excluded_plugins, "Exclude HTTP Static Server plugin tests" "http_static" in config.excluded_plugins, "Exclude HTTP Static Server plugin tests"
) )
@unittest.skipIf(config.skip_netns_tests, "netns not available or disabled from cli")
class TestHttpStaticCli(VppTestCase): class TestHttpStaticCli(VppTestCase):
"""enable the static http server [CLI]""" """enable the static http server and send requests [CLI]"""
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
@ -96,11 +95,9 @@ class TestHttpStaticCli(VppTestCase):
cls.temp2 = tempfile.NamedTemporaryFile() cls.temp2 = tempfile.NamedTemporaryFile()
cls.temp2.write(b"Hello world2") cls.temp2.write(b"Hello world2")
if not can_create_namespaces("vpp_chk_4212_2"):
raise Exception("Unable to create namespace")
create_namespace("HttpStatic2") create_namespace("HttpStatic2")
create_host_interface("vppHost2", "vppOut2", "HttpStatic2", "10.10.1.1/24") create_host_interface("vppHost2", "vppOut2", "HttpStatic2", "10.10.1.1/24")
cls.vapi.cli("create host-interface name vppOut2") cls.vapi.cli("create host-interface name vppOut2")
cls.vapi.cli("set int state host-vppOut2 up") cls.vapi.cli("set int state host-vppOut2 up")
cls.vapi.cli("set int ip address host-vppOut2 10.10.1.2/24") cls.vapi.cli("set int ip address host-vppOut2 10.10.1.2/24")