macsec: T2023: use wpa_supplicant for key management

1 files changed, 4 insertions, 9 deletions

diff --git a/python/vyos/ifconfig/macsec.py b/python/vyos/ifconfig/macsec.py
index 1829df4ab..ea8c9807e 100644
--- a/python/vyos/ifconfig/macsec.py
+++ b/python/vyos/ifconfig/macsec.py
@@ -30,7 +30,7 @@ class MACsecIf(Interface):
 
     default = {
         'type': 'macsec',
-        'cipher': '',
+        'security_cipher': '',
         'source_interface': ''
     }
     definition = {
@@ -41,7 +41,7 @@ class MACsecIf(Interface):
         },
     }
     options = Interface.options + \
-        ['cipher', 'source_interface']
+        ['security_cipher', 'source_interface']
 
     def _create(self):
         """
@@ -50,17 +50,12 @@ class MACsecIf(Interface):
         """
         # create tunnel interface
         cmd  = 'ip link add link {source_interface} {ifname} type {type}'
-        cmd += ' cipher {cipher}'
+        cmd += ' cipher {security_cipher}'
         self._cmd(cmd.format(**self.config))
 
         # interface is always A/D down. It needs to be enabled explicitly
         self.set_admin_state('down')
 
-    def set_encryption(self, on_off):
-        ifname = self.config['ifname']
-        cmd = f'ip link set {ifname} type macsec encrypt {on_off}'
-        return self._cmd(cmd)
-
     @staticmethod
     def get_config():
         """
@@ -72,7 +67,7 @@ class MACsecIf(Interface):
         >> dict = MACsecIf().get_config()
         """
         config = {
-            'cipher': '',
+            'security_cipher': '',
             'source_interface': '',
         }
         return config