fix test fail in new image

ansible/library/bgp_facts.py

@@ -73,7 +73,7 @@ def collect_data(self, command_str):
             Collect bgp information by reading output of 'vtysh' command line tool
         """
         try:
-            rc, self.out, err = self.module.run_command('vtysh -c "show ip bgp ' + command_str + '"',
+            rc, self.out, err = self.module.run_command('docker exec -i bgp vtysh -c "show ip bgp ' + command_str + '"',
                                                         executable='/bin/bash', use_unsafe_shell=True)
         except Exception as e:
             self.module.fail_json(msg=str(e))

ansible/library/bgp_route.py

@@ -322,9 +322,9 @@ def main():
 
         if prefix:
             if regex_ipv4.match(prefix):
-                command = "vtysh -c 'show ip bgp " + str(prefix) + "'"
+                command = "docker exec -i bgp vtysh -c 'show ip bgp " + str(prefix) + "'"
             else:
-                command = "vtysh -c 'show ipv6 bgp " + str(prefix) +  "'"
+                command = "docker exec -i bgp vtysh -c 'show ipv6 bgp " + str(prefix) +  "'"
             rc, out, err = module.run_command(command)
             if rc != 0:
                 err_message = "command %s failed rc=%d, out=%s, err=%s" %(command, rt, out, err)
@@ -334,9 +334,9 @@ def main():
 
         elif neighbor:
             if netaddr.valid_ipv4(neighbor):
-                command = "vtysh -c 'show ip bgp neighbor " + str(neighbor) + " " + str(direction) + "'"
+                command = "docker exec -i bgp vtysh -c 'show ip bgp neighbor " + str(neighbor) + " " + str(direction) + "'"
             else:
-                command = "vtysh -c 'show ipv6 bgp neighbor " + str(neighbor) + " " + str(direction) + "'"
+                command = "docker exec -i bgp vtysh -c 'show ipv6 bgp neighbor " + str(neighbor) + " " + str(direction) + "'"
             rc, out, err = module.run_command(command)
             if rc !=  0:
                 err_message = "command %s failed rc=%d, out=%s, err=%s" %(command, rt, out, err)

ansible/library/interface_facts.py

@@ -296,8 +296,12 @@ def parse_ip_output(module, output, secondary=False):
 
     down_ports = []
     for name in up_ports:
-        if not interfaces[name]['link']:
+        try:
+            if not interfaces[name]['link']:
+                down_ports += [name]
+        except:
             down_ports += [name]
+            pass 
 
     results['ansible_interface_facts'] = interfaces
     results['ansible_interface_ips'] = ips

ansible/roles/test/tasks/interface.yml

@@ -5,7 +5,7 @@
   when: ansible_interface_link_down_ports | length > 0
 
 - name: Verify interfaces are up correctly
-  assert: { that: "{{ ansible_interface_link_down_ports }}|length == 0" }
+  assert: { that: "{{ ansible_interface_link_down_ports | length }} == 0" }
 
 - name: Verify port channel interfaces are up correctly
   assert: { that: "'{{ ansible_interface_facts[item]['active'] }}' == 'True'" }

ansible/roles/test/tasks/link_flap/link_flap_helper.yml

@@ -38,7 +38,7 @@
       when: ansible_interface_link_down_ports | length > 0
 
     - name: Verify interfaces are up correctly
-      assert: { that: "{{ ansible_interface_link_down_ports }}|length == 0" }
+      assert: { that: "{{ ansible_interface_link_down_ports | length }} == 0" }
 
     - name: Verify {{intfs_to_exclude}} is down correctly
       assert: { that: "'{{ ansible_interface_facts[intfs_to_exclude]['active'] }}' == 'False'" }