From e10cf9f42514799d10b9c495d585bb9f41fd2330 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Thu, 9 Nov 2023 17:53:17 +0000
Subject: T1797: Remove vpp packages and mentions

---
 debian/control                         | 7 -------
 debian/vyos-1x.preinst                 | 1 -
 op-mode-definitions/monitor-log.xml.in | 6 ------
 op-mode-definitions/show-log.xml.in    | 6 ------
 4 files changed, 20 deletions(-)

diff --git a/debian/control b/debian/control
index d2ed3991a..98c064417 100644
--- a/debian/control
+++ b/debian/control
@@ -295,13 +295,6 @@ Depends:
 # For "run monitor bandwidth"
   bmon,
 # End Operational mode
-## VPP
-  vpp [amd64],
-  vpp-plugin-core [amd64],
-  vpp-plugin-dpdk [amd64],
-  python3-vpp-api [amd64],
-  libvppinfra [amd64],
-## End VPP
 ## Optional utilities
   easy-rsa,
   tcptraceroute,
diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst
index 08f48cac2..fbfc85566 100644
--- a/debian/vyos-1x.preinst
+++ b/debian/vyos-1x.preinst
@@ -5,7 +5,6 @@ dpkg-divert --package vyos-1x --add --no-rename /etc/logrotate.d/conntrackd
 dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.conf
 dpkg-divert --package vyos-1x --add --no-rename /etc/skel/.bashrc
 dpkg-divert --package vyos-1x --add --no-rename /etc/skel/.profile
-dpkg-divert --package vyos-1x --add --no-rename /etc/sysctl.d/80-vpp.conf
 dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplugd.conf
 dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplug
 dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.d/45-frr.conf
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index ee066b39b..44628a112 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -341,12 +341,6 @@
               </tagNode>
             </children>
           </node>
-          <leafNode name="vpp">
-            <properties>
-              <help>Monitor last lines of Vector Packet Processor log</help>
-            </properties>
-            <command>journalctl --no-hostname --boot --follow --unit vpp.service</command>
-          </leafNode>
           <leafNode name="vrrp">
             <properties>
               <help>Monitor last lines of Virtual Router Redundancy Protocol log</help>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 39d69c64e..3a622cfb5 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -700,12 +700,6 @@
               </tagNode>
             </children>
           </node>
-          <leafNode name="vpp">
-            <properties>
-              <help>Show log for Vector Packet Processor (VPP)</help>
-            </properties>
-            <command>journalctl --no-hostname --boot --unit vpp.service</command>
-          </leafNode>
           <leafNode name="vrrp">
             <properties>
               <help>Show log for Virtual Router Redundancy Protocol (VRRP)</help>
-- 
cgit v1.2.3