vif: T3349: use fixed ordering when enabling parent and child interface

When a VIF/VLAN interface is placed in admin down state but the lower
interface, serving the vlan, is moved from admin down -> admin up, all its
vlan interfaces will be placed in admin up state, too.

This is bad as a VLAN interface will become admin up even if its specified as
admin down after a reboot.

To reproduce:
  set interfaces ethernet eth1 vif 20 disable
  set interfaces ethernet eth1 disable
  commit

  delete interfaces ethernet eth1 disable
  commit

Now check the interface state and it returns UP,LOWER_UP
7: eth1.20@eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
    link/ether 00:50:56:b3:09:07 brd ff:ff:ff:ff:ff:ff
    inet6 fe80::250:56ff:feb3:907/64 scope link
       valid_lft forever preferred_lft forever

(cherry picked from commit 49bc3f1e3ff8416908fc986bb60b444a75a1722d)

1 files changed, 36 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index f96739183..3e10f220e 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -292,6 +292,42 @@ class BasicInterfaceTest:
                     self.assertEqual(tmp, self._mtu)
                     self.assertEqual(Interface(vif).get_admin_state(), 'up')
 
+        def test_vif_8021q_lower_up_down(self):
+            # Testcase for https://phabricator.vyos.net/T3349
+            if not self._test_vlan:
+                self.skipTest('not supported')
+
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                for option in self._options.get(interface, []):
+                    self.session.set(base + option.split())
+
+                # disable the lower interface
+                self.session.set(base + ['disable'])
+
+                for vlan in self._vlan_range:
+                    vlan_base = self._base_path + [interface, 'vif', vlan]
+                    # disable the vlan interface
+                    self.session.set(vlan_base + ['disable'])
+
+            self.session.commit()
+
+            # re-enable all lower interfaces
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                self.session.delete(base + ['disable'])
+
+            self.session.commit()
+
+            # verify that the lower interfaces are admin up and the vlan
+            # interfaces are all admin down
+            for interface in self._interfaces:
+                self.assertEqual(Interface(interface).get_admin_state(), 'up')
+
+                for vlan in self._vlan_range:
+                    ifname = f'{interface}.{vlan}'
+                    self.assertEqual(Interface(ifname).get_admin_state(), 'down')
+
 
         def test_vif_s_8021ad_vlan_interfaces(self):
             # XXX: This testcase is not allowed to run as first testcase, reason