Merge branch 'backport-5565' into 'release-20.4'

release-20.4:Backport!5565 Arista.EOS. Support 40G breakout (4x10 DAC and AOC)

See merge request !5761

sa/profiles/Arista/EOS/get_interface_status.py

@@ -18,14 +18,14 @@ class Script(BaseScript):
     interface = IGetInterfaceStatus
 
     rx_interface_status = re.compile(
-        r"^(?P<interface>\S\S\d+).+?" r"(?P<status>connected|notconnect)"
+        r"^(?P<interface>\S\S[\/\d]+).+?" r"(?P<status>connected|notconnect)"
     )
 
     def execute(self, interface=None):
         r = []
         v = self.cli("show interfaces status")
-        for l in v.splitlines():
-            match = self.rx_interface_status.match(l)
+        for line in v.splitlines():
+            match = self.rx_interface_status.match(line)
             if match:
                 r += [
                     {

sa/profiles/Arista/EOS/profile.py

@@ -25,7 +25,7 @@ class Profile(BaseProfile):
     command_disable_pager = "terminal length 0"
     convert_mac = BaseProfile.convert_mac_to_cisco
 
-    rx_interface_name = re.compile(r"^(?P<type>\S+?)(?P<number>\d+)$")
+    rx_interface_name = re.compile(r"^(?P<type>\S+?)(?P<number>[\/\d]+)$")
 
     def convert_interface_name(self, s):
         match = self.rx_interface_name.match(s)