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

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

diff --git a/debian/control b/debian/control
index ee45a5fe3..f31c5a510 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,6 @@ Depends:
   libqmi-utils,
   libstrongswan-extra-plugins (>=5.9),
   libstrongswan-standard-plugins (>=5.9),
-  libvppinfra [amd64],
   libvyosconfig0,
   linux-cpupower,
   lldpd,
@@ -145,7 +144,6 @@ Depends:
   python3-tabulate,
   python3-vici (>= 5.7.2),
   python3-voluptuous,
-  python3-vpp-api [amd64],
   python3-xmltodict,
   python3-zmq,
   qrencode,
@@ -180,9 +178,6 @@ Depends:
   uidmap,
   usb-modeswitch,
   usbutils,
-  vpp [amd64],
-  vpp-plugin-core [amd64],
-  vpp-plugin-dpdk [amd64],
   vyatta-bash,
   vyatta-cfg,
   vyos-http-api-tools,
diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst
index 2604f5ff4..12866cd55 100644
--- a/debian/vyos-1x.preinst
+++ b/debian/vyos-1x.preinst
@@ -7,7 +7,6 @@ dpkg-divert --package vyos-1x --add --no-rename /usr/share/pam-configs/tacplus
 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 08d5ae11a..ee9f1cc3c 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -480,12 +480,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