Remove support for VPP 21.06 (#112)

* Remove support for VPP 21.06 * Remove mentions of VPP 21.06 from vpp.Dockerfile * Remove legacy NAT configuration * Remove abx and isisx plugins for VPP 2106 Signed-off-by: Peter Motičák <[email protected]>
PANTHEONtech · Aug 17, 2023 · 28bf8d8 · 28bf8d8
1 parent c5444da
commit 28bf8d8
Show file tree

Hide file tree

Showing 77 changed files with 5 additions and 17,061 deletions.
diff --git a/Makefile b/Makefile
@@ -250,7 +250,6 @@ generate-binapi: get-binapi-generator
     # generated from vpp json api files copied into StoneWork repository (plugins/binapi/vppXXXX/api)
     # from VPP (/usr/share/vpp/api/(core|plugins))
 	@echo "=> generating binary API"
-	@cd plugins/binapi/vpp2106 && VPP_VERSION=21.06 go generate .
 	@cd plugins/binapi/vpp2202 && VPP_VERSION=22.02 go generate .
 	@cd plugins/binapi/vpp2210 && VPP_VERSION=22.10 go generate .
 	@cd plugins/binapi/vpp2306 && VPP_VERSION=23.06 go generate .

diff --git a/docker/dev.Dockerfile b/docker/dev.Dockerfile
@@ -106,12 +106,6 @@ COPY ./docker/init_hook.sh /usr/bin/
 ENV CONFIG_DIR /etc/stonework/
 ENV CNF_MODE STONEWORK
 
-# handle differences in vpp.conf which are between supported VPP versions
-ARG VPP_VERSION
-COPY ./docker/legacy-nat.conf /tmp/legacy-nat.conf
-RUN bash -c "if [[ \"$VPP_VERSION\" < "21.01" ]]; then cat /tmp/legacy-nat.conf >> /etc/vpp/vpp.conf; fi"
-RUN rm /tmp/legacy-nat.conf
-
 # Install script for packet tracing on VPP
 COPY ./docker/vpptrace.sh /usr/bin/vpptrace.sh
 RUN chmod u+x /usr/bin/vpptrace.sh

diff --git a/docker/legacy-nat.conf b/docker/legacy-nat.conf
diff --git a/docker/vpp.Dockerfile b/docker/vpp.Dockerfile
@@ -73,18 +73,14 @@ RUN set -ex; \
 	cp /opt/dev/isisx/build/isisx/isisx.api.json \
        /usr/share/vpp/api/core/
 
-# there is a bug in VPP 21.06 that api files are not built on standard location
-# for external plugins, to reproduce it is enough to try to build sample-plugin
+# copy built VPP api files
 RUN set -ex; \
-    if [ "$VPP_VERSION" = "23.06" ] || [ "$VPP_VERSION" = "22.10" ] || [ "$VPP_VERSION" = "22.02" ]; \
-    then \
-      cp abx/build/CMakeFiles/vpp-api/vapi/* /usr/include/vapi/; \
-    elif [ "$VPP_VERSION" = "21.06" ]; \
+	if [ "$VPP_VERSION" = "23.06" ] || [ "$VPP_VERSION" = "22.10" ] || [ "$VPP_VERSION" = "22.02" ]; \
 	then \
-	  cp /vpp-api/vapi/* /usr/include/vapi/; \
+		cp abx/build/CMakeFiles/vpp-api/vapi/* /usr/include/vapi/; \
 	else \
-      cp /opt/dev/abx/build/vpp-api/vapi/* /usr/include/vapi/; \
-    fi
+		cp /opt/dev/abx/build/vpp-api/vapi/* /usr/include/vapi/; \
+	fi
 
 COPY docker/vpp-startup.conf /etc/vpp/startup.conf
 

diff --git a/plugins/abx/abxplugin.go b/plugins/abx/abxplugin.go
@@ -32,7 +32,6 @@ import (
 	"go.pantheon.tech/stonework/plugins/abx/descriptor"
 	"go.pantheon.tech/stonework/plugins/abx/vppcalls"
 
-	_ "go.pantheon.tech/stonework/plugins/abx/vppcalls/vpp2106"
 	_ "go.pantheon.tech/stonework/plugins/abx/vppcalls/vpp2202"
 	_ "go.pantheon.tech/stonework/plugins/abx/vppcalls/vpp2210"
 	_ "go.pantheon.tech/stonework/plugins/abx/vppcalls/vpp2306"

diff --git a/plugins/abx/vppcalls/vpp2106/abx_vppcalls.go b/plugins/abx/vppcalls/vpp2106/abx_vppcalls.go
diff --git a/plugins/abx/vppcalls/vpp2106/abx_vppcalls_test.go b/plugins/abx/vppcalls/vpp2106/abx_vppcalls_test.go