Changing image name to ubuntu

Making the image name and ping size consistent across all the branches

Change-Id: Ie9a011dbdb72489edc02a4f71a424dc8657bc9f6
Closes-Bug: #1731078

common/intf_mirroring/verify.py

@@ -307,7 +307,7 @@ def verify_intf_mirroring(self, compute_nodes, vn_index_list, sub_intf=False, pa
         analyzer_compute = compute_nodes[2]
 
         analyzer_port = 8099
-        image_name = 'cirros' if not sub_intf else 'ubuntu-traffic'
+        image_name = 'ubuntu' if not sub_intf else 'ubuntu-traffic'
         if self.inputs.pcap_on_vm:
             image_name='ubuntu-traffic'
 

common/servicechain/mirror/verify.py

@@ -661,10 +661,10 @@ def verify_port_mirroring(self, src_vm, dst_vm, mirr_vm, vlan=None, parent=False
             cmds = "/sbin/ifconfig " + sub_intf + " | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'"
             src_ip = src_vm.run_cmd_on_vm(cmds=[cmds]).values()[0]
             dst_ip = dst_vm.run_cmd_on_vm(cmds=[cmds]).values()[0]
-        assert src_vm.ping_with_certainty(dst_ip, count=5, size='1350')
+        assert src_vm.ping_with_certainty(dst_ip, count=5, size='1200')
         self.logger.info('Ping from %s to %s executed with c=5, expected mirrored packets 5 Ingress,5 Egress count = 10'
             % (src_ip, dst_ip))
-        filters = '| grep \"length [1-9][3-9][0-9][0-9][0-9]*\"'
+        filters = '| grep \"length [1-9][2-9][0-9][0-9][0-9]*\"'
         if self.inputs.pcap_on_vm:
             output, mirror_pkt_count = stop_tcpdump_for_vm_intf(
                 None, None, None, vm_fix_pcap_pid_files=vm_fix_pcap_pid_files, filters=filters)