Skip to content

Commit 599ae57

Browse files
feat(crc): Remove gre_tunnel_add_del
VPP introduced gre_tunnel_add_del_v2, but CSIT has no test that would use it. This deletes the orphaned create_gre_tunnel_interface keyword and removes the crc comment about create_gre_tunnel_interface. + The rest of the CRC collection is renamed to 25.10-release. Change-Id: Ib5a27150f05025c687f9dfe71eeef8df5887bbac Signed-off-by: Vratko Polak <vrpolak@cisco.com>
1 parent 4dfa33a commit 599ae57

File tree

2 files changed

+2
-43
lines changed

2 files changed

+2
-43
lines changed

resources/api/vpp/supported_crcs.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# TODO: Update comments, as we removed device tests.
3030

3131
# https://packagecloud.io/app/fdio/release
32-
# /search?q=24.10&filter=debs&filter=all&dist=debian
33-
24.10-release:
32+
# /search?q=25.10&filter=debs&filter=all&dist=debian
33+
25.10-release:
3434
# plugins/acl/acl.api
3535
acl_add_replace: '0xee5c2f18' # dev
3636
acl_add_replace_reply: '0xac407b0c' # dev
@@ -149,8 +149,6 @@
149149
gpe_enable_disable: '0xc264d7bf' # dev
150150
gpe_enable_disable_reply: '0xe8d4e804' # dev
151151

152-
# gre_tunnel_add_del / reply # unused L1 keyword: create_gre_tunnel_interface
153-
154152
# plugins/gtpu/gtpu.api
155153
gtpu_add_del_tunnel_v2: '0xa0c30713' # perf
156154
gtpu_add_del_tunnel_v2_reply: '0x62b41304' # perf

resources/libraries/python/InterfaceUtil.py

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,45 +1010,6 @@ def create_subinterface(
10101010

10111011
return f"{interface}.{sub_id}", sw_if_index
10121012

1013-
@staticmethod
1014-
def create_gre_tunnel_interface(node, source_ip, destination_ip):
1015-
"""Create GRE tunnel interface on node.
1016-
1017-
:param node: VPP node to add tunnel interface.
1018-
:param source_ip: Source of the GRE tunnel.
1019-
:param destination_ip: Destination of the GRE tunnel.
1020-
:type node: dict
1021-
:type source_ip: str
1022-
:type destination_ip: str
1023-
:returns: Name and index of created GRE tunnel interface.
1024-
:rtype: tuple
1025-
:raises RuntimeError: If unable to create GRE tunnel interface.
1026-
"""
1027-
cmd = u"gre_tunnel_add_del"
1028-
tunnel = dict(
1029-
type=0,
1030-
instance=Constants.BITWISE_NON_ZERO,
1031-
src=str(source_ip),
1032-
dst=str(destination_ip),
1033-
outer_fib_id=0,
1034-
session_id=0
1035-
)
1036-
args = dict(
1037-
is_add=1,
1038-
tunnel=tunnel
1039-
)
1040-
err_msg = f"Failed to create GRE tunnel interface " \
1041-
f"on host {node[u'host']}"
1042-
with PapiSocketExecutor(node) as papi_exec:
1043-
sw_if_index = papi_exec.add(cmd, **args).get_sw_if_index(err_msg)
1044-
1045-
if_key = Topology.add_new_port(node, u"gre_tunnel")
1046-
Topology.update_interface_sw_if_index(node, if_key, sw_if_index)
1047-
ifc_name = InterfaceUtil.vpp_get_interface_name(node, sw_if_index)
1048-
Topology.update_interface_name(node, if_key, ifc_name)
1049-
1050-
return ifc_name, sw_if_index
1051-
10521013
@staticmethod
10531014
def create_gtpu_tunnel_interface(node, teid, source_ip, destination_ip):
10541015
"""Create GTPU interface and return sw if index of created interface.

0 commit comments

Comments
 (0)