ifconfig: T2057: explicity name state functions

The Interface get_state/set_state were not clear about
if they edited the admin or operational state.
functions are now using admin_state and oper_state
for clarity.

12 files changed, 18 insertions, 18 deletions

diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 03df6e16a..9b6401ab6 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -431,7 +431,7 @@ def apply(bond):
         # Some parameters can not be changed when the bond is up.
         if bond['shutdown_required']:
             # Disable bond prior changing of certain properties
-            b.set_state('down')
+            b.set_admin_state('down')
 
             # The bonding mode can not be changed when there are interfaces enslaved
             # to this bond, thus we will free all interfaces from the bond first!
@@ -449,9 +449,9 @@ def apply(bond):
         # parameters we will only re-enable the interface if it is not
         # administratively disabled
         if not bond['disable']:
-            b.set_state('up')
+            b.set_admin_state('up')
         else:
-            b.set_state('down')
+            b.set_admin_state('down')
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index c45ab13a8..f53175452 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -243,7 +243,7 @@ def apply(bridge):
         br.remove()
     else:
         # enable interface
-        br.set_state('up')
+        br.set_admin_state('up')
         # set ageing time
         br.set_ageing_time(bridge['aging'])
         # set bridge forward delay
@@ -313,7 +313,7 @@ def apply(bridge):
 
         # up/down interface
         if bridge['disable']:
-            br.set_state('down')
+            br.set_admin_state('down')
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
diff --git a/src/conf_mode/interfaces-dummy.py b/src/conf_mode/interfaces-dummy.py
index bf55b13ec..b7b75517d 100755
--- a/src/conf_mode/interfaces-dummy.py
+++ b/src/conf_mode/interfaces-dummy.py
@@ -110,9 +110,9 @@ def apply(dummy):
 
         # disable interface on demand
         if dummy['disable']:
-            d.set_state('down')
+            d.set_admin_state('down')
         else:
-            d.set_state('up')
+            d.set_admin_state('up')
 
     return None
 
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 2f5d796b4..f7d1093e2 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -357,9 +357,9 @@ def apply(eth):
 
         # Enable/Disable interface
         if eth['disable']:
-            e.set_state('down')
+            e.set_admin_state('down')
         else:
-            e.set_state('up')
+            e.set_admin_state('up')
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py
index 8278b54b0..eaa678d3e 100755
--- a/src/conf_mode/interfaces-geneve.py
+++ b/src/conf_mode/interfaces-geneve.py
@@ -148,7 +148,7 @@ def apply(geneve):
         # parameters we will only re-enable the interface if it is not
         # administratively disabled
         if not geneve['disable']:
-            g.set_state('up')
+            g.set_admin_state('up')
 
     return None
 
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
index 3bc3faca8..468a893c5 100755
--- a/src/conf_mode/interfaces-l2tpv3.py
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -204,7 +204,7 @@ def apply(l2tpv3):
         # we will only re-enable the interface if it is not  administratively
         # disabled
         if not l2tpv3['disable']:
-            l.set_state('up')
+            l.set_admin_state('up')
 
     return None
 
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 155101f1d..d5121ab75 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -1043,7 +1043,7 @@ def apply(openvpn):
     # TAP interface needs to be brought up explicitly
     if openvpn['type'] == 'tap':
         if not openvpn['disable']:
-            VTunIf(openvpn['intf']).set_state('up')
+            VTunIf(openvpn['intf']).set_admin_state('up')
 
     return None
 
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 0afae8388..55b80b959 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -309,9 +309,9 @@ def apply(peth):
 
     # Enable/Disable interface
     if peth['disable']:
-        p.set_state('down')
+        p.set_admin_state('down')
     else:
-        p.set_state('up')
+        p.set_admin_state('up')
 
     # Configure interface address(es)
     # - not longer required addresses get removed first
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py
index 90c1f8f71..4cbb51f4a 100755
--- a/src/conf_mode/interfaces-tunnel.py
+++ b/src/conf_mode/interfaces-tunnel.py
@@ -478,7 +478,7 @@ def apply(conf):
         tunnel.add_addr(addr)
 
     # now bring it up (or not)
-    tunnel.set_state(options['state'])
+    tunnel.set_admin_state(options['state'])
 
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index c9ef0fe9c..f45493587 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -212,7 +212,7 @@ def apply(vxlan):
         # parameters we will only re-enable the interface if it is not
         # administratively disabled
         if not vxlan['disable']:
-            v.set_state('up')
+            v.set_admin_state('up')
 
     return None
 
diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index 0d6373d89..d8c327e19 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -269,7 +269,7 @@ def apply(c):
         intfc.update()
 
     # interface state
-    intfc.set_state(c['state'])
+    intfc.set_admin_state(c['state'])
 
     return None
 
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 43455196c..3afd65a76 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -1518,7 +1518,7 @@ def apply(wifi):
         # Enable/Disable interface - interface is always placed in
         # administrative down state in WiFiIf class
         if not wifi['disable']:
-            w.set_state('up')
+            w.set_admin_state('up')
 
 
     # Physical interface is now configured. Proceed by starting hostapd or