diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-01-15 11:56:14 +0000 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-01-15 11:56:14 +0000 |
| commit | 00ebda993f95dc1dbc07320a7e236445314b9531 (patch) | |
| tree | a3ab41e7706bbc7d64d6306f4bbcf2adf9a26c0c | |
| parent | 405d3ee7ac909bbf458f522e6539a1f4eacdf7e6 (diff) | |
| download | vyos-1x-00ebda993f95dc1dbc07320a7e236445314b9531.tar.gz vyos-1x-00ebda993f95dc1dbc07320a7e236445314b9531.zip | |
Exclude GENEVE interfaces
| -rw-r--r-- | interface-definitions/vpp.xml.in | 17 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_vpp.py | 1 |
2 files changed, 10 insertions, 8 deletions
diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in index 329d313be..ac3121a6b 100644 --- a/interface-definitions/vpp.xml.in +++ b/interface-definitions/vpp.xml.in @@ -145,7 +145,8 @@ </node> </children> </tagNode> - <tagNode name="geneve" owner="${vyos_conf_scripts_dir}/vpp_interfaces_geneve.py"> + <!-- Disable as geneve interface index in the VPP always 0 and not configured --> + <!-- <tagNode name="geneve" owner="${vyos_conf_scripts_dir}/vpp_interfaces_geneve.py"> <properties> <priority>305</priority> <help>Generic Network Virtualization Encapsulation (GENEVE) Interface</help> @@ -158,13 +159,13 @@ <description>GENEVE interface name</description> </valueHelp> </properties> - <children> - #include <include/source-address-ipv4-ipv6.xml.i> - #include <include/interface/tunnel-remote.xml.i> - #include <include/vni.xml.i> - #include <include/kernel-interface-tun.xml.i> - </children> - </tagNode> + <children> --> + <!-- #include <include/source-address-ipv4-ipv6.xml.i> --> + <!-- #include <include/interface/tunnel-remote.xml.i> --> + <!-- #include <include/vni.xml.i> --> + <!-- #include <include/kernel-interface-tun.xml.i> --> + <!-- </children> --> + <!-- </tagNode> --> <tagNode name="gre" owner="${vyos_conf_scripts_dir}/vpp_interfaces_gre.py"> <properties> <priority>305</priority> diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py index ed9e4f942..be2164c19 100755 --- a/smoketest/scripts/cli/test_vpp.py +++ b/smoketest/scripts/cli/test_vpp.py @@ -313,6 +313,7 @@ class TestVPP(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['interfaces', 'gre', interface_gre]) self.cli_commit() + @unittest.skip("Skipping this test geneve index always is 0") def test_04_vpp_geneve(self): vni = '2' # Must be 'geneve0' to pass smoketest |