Enable retry for eos command

Author: bingwang-ms

tests/common/devices/eos.py

@@ -83,6 +83,7 @@ def __str__(self):
     def __repr__(self):
         return self.__str__()
 
+    @retry(RunAnsibleModuleFail, tries=3, delay=5)
     def shutdown(self, interface_name):
         out = self.eos_config(
             lines=['shutdown'],
@@ -215,20 +216,13 @@ def set_interface_lacp_rate_mode(self, interface_name, mode):
             logging.info("Set interface [%s] lacp rate to [%s]" % (interface_name, mode))
         return out
 
-    def is_multiagent(self):
-        out = self.eos_command(commands=["show ip route summary | json"])
-        model = out["stdout"][0]["protoModelStatus"]["operatingProtoModel"]
-        return model == "multi-agent"
-
     def kill_bgpd(self):
-        agent = 'Bgp' if self.is_multiagent() else 'Rib'
-        out = self.eos_config(lines=['agent {} shutdown'.format(agent)])
+        out = self.eos_config(lines=['agent Rib shutdown'])
         return out
 
     @retry(RunAnsibleModuleFail, tries=3, delay=5)
     def start_bgpd(self):
-        agent = 'Bgp' if self.is_multiagent() else 'Rib'
-        out = self.eos_config(lines=['no agent {} shutdown'.format(agent)])
+        out = self.eos_config(lines=['no agent Rib shutdown'])
         return out
 
     @retry(RunAnsibleModuleFail, tries=3, delay=5)
@@ -427,8 +421,7 @@ def get_supported_speeds(self, interface_name):
                     'show interface {} hardware'.format(interface_name)]
         for command in commands:
             output = self.eos_command(commands=[command])
-            # Ignore case as EOS 4.23 has format of "Speed/Duplex" whereas 4.25 is "Speed/duplex"
-            found_txt = re.search("Speed/Duplex: (.+)", output['stdout'][0], flags=re.IGNORECASE)
+            found_txt = re.search("Speed/Duplex: (.+)", output['stdout'][0])
             if found_txt is not None:
                 break
 
@@ -437,12 +430,7 @@ def get_supported_speeds(self, interface_name):
 
         speed_list = found_txt.groups()[0]
         speed_list = speed_list.split(',')
-
-        try:
-            speed_list.remove('auto')
-        except ValueError:
-            # auto may not be in speed options for certain versions
-            pass
+        speed_list.remove('auto')
 
         def extract_speed_only(v):
             return re.match(r'\d+', v.strip()).group() + '000'
@@ -594,6 +582,3 @@ def no_lacp_time_multiplier(self, interface_name):
             parents=['interface {}'.format(interface_name)])
         logging.info('Reset lacp timer to default for interface [%s]' % interface_name)
         return out
-
-    def config(self, lines=None, parents=None, module_ignore_errors=False):
-        return self.eos_config(lines=lines, parents=parents)