From 24547869c9736603cffd22e04cb5893ab8115794 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 27 Mar 2022 21:26:25 +0000 Subject: [PATCH] Avoid issuing 'pop 0' for untagged l2xc changes; just emit the exact CLI statement --- vpp/reconciler.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vpp/reconciler.py b/vpp/reconciler.py index eeb3233..4380bbf 100644 --- a/vpp/reconciler.py +++ b/vpp/reconciler.py @@ -784,12 +784,12 @@ class Reconciler(): self.logger.info("3> set interface l2 xconnect %s %s" % (config_rx_ifname, config_tx_ifname)) l2xc_changed = True if l2xc_changed: - tags = 0 if interface.is_qinx(self.cfg, config_rx_ifname): - tags = 2 + self.logger.info("4> set interface l2 tag-rewrite %s pop 2" % (config_rx_ifname)) elif interface.is_sub(self.cfg, config_rx_ifname): - tags = 1 - self.logger.info("4> set interface l2 tag-rewrite %s pop %d" % (config_rx_ifname, tags)) + self.logger.info("5> set interface l2 tag-rewrite %s pop 1" % (config_rx_ifname)) + else: + self.logger.info("6> set interface l2 tag-rewrite %s disable" % (config_rx_ifname)) return True def sync_mtu_direction(self, shrink=True):