From 960e1f6d190210fbf67c83fd9f4f55bc31fbaf6d Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Mon, 27 Apr 2020 20:00:38 +0100
Subject: vlan: T2372: de-indent add_vlan

---
 python/vyos/ifconfig/vlan.py | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'python/vyos/ifconfig')

diff --git a/python/vyos/ifconfig/vlan.py b/python/vyos/ifconfig/vlan.py
index 7b1e00d87..d68e8f6cd 100644
--- a/python/vyos/ifconfig/vlan.py
+++ b/python/vyos/ifconfig/vlan.py
@@ -101,26 +101,26 @@ class VLAN:
         >>> i.add_vlan(10)
         """
         vlan_ifname = self.config['ifname'] + '.' + str(vlan_id)
-        if not os.path.exists(f'/sys/class/net/{vlan_ifname}'):
-            self._vlan_id = int(vlan_id)
-
-            if ethertype:
-                self._ethertype = ethertype
-                ethertype = 'proto {}'.format(ethertype)
-
-            # Optional ingress QOS mapping
-            opt_i = ''
-            if ingress_qos:
-                opt_i = 'ingress-qos-map ' + ingress_qos
-            # Optional egress QOS mapping
-            opt_e = ''
-            if egress_qos:
-                opt_e = 'egress-qos-map ' + egress_qos
-
-            # create interface in the system
-            cmd = 'ip link add link {ifname} name {ifname}.{vlan} type vlan {proto} id {vlan} {opt_e} {opt_i}' \
-                .format(ifname=self.config['ifname'], vlan=self._vlan_id, proto=ethertype, opt_e=opt_e, opt_i=opt_i)
-            self._cmd(cmd)
+        if os.path.exists(f'/sys/class/net/{vlan_ifname}'):
+            return self.__class__(vlan_ifname)
+
+        if ethertype:
+            self._ethertype = ethertype
+            ethertype = 'proto {}'.format(ethertype)
+
+        # Optional ingress QOS mapping
+        opt_i = ''
+        if ingress_qos:
+            opt_i = 'ingress-qos-map ' + ingress_qos
+        # Optional egress QOS mapping
+        opt_e = ''
+        if egress_qos:
+            opt_e = 'egress-qos-map ' + egress_qos
+
+        # create interface in the system
+        cmd = 'ip link add link {ifname} name {ifname}.{vlan} type vlan {proto} id {vlan} {opt_e} {opt_i}' \
+            .format(ifname=self.ifname, vlan=vlan_id, proto=ethertype, opt_e=opt_e, opt_i=opt_i)
+        self._cmd(cmd)
 
         # return new object mapping to the newly created interface
         # we can now work on this object for e.g. IP address setting
-- 
cgit v1.2.3