Fix badcodefix of default value for simple_action

http://github.com/Juniper/contrail-test-ci/commit/c9efbc2f72b28ff840a51586e5b50d1749719599 Change-Id: I05f74f04c5b5f71ac9046bc605762ef82f68a70f Closes-Bug: 1717580
Juniper · Sep 20, 2017 · 4b081eb · 4b081eb
1 parent 11d7cb1
commit 4b081eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/common/servicechain/mirror/verify.py b/common/servicechain/mirror/verify.py
@@ -308,11 +308,11 @@ def verify_port_mirroring(self, src_vm, dst_vm, mirr_vm, vlan=None):
             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='1400')
+        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))
         exp_count = 10
-        filters = '| grep \"length [1-9][4-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)

diff --git a/fixtures/policy_test.py b/fixtures/policy_test.py
@@ -161,7 +161,7 @@ def serialize(obj):
             # end for
             action_list_dict = rule_dict.get('action_list', {})
             new_rule['action_list'][
-                'simple_action'] = action_list_dict.get('simple_action', 'pass')
+                'simple_action'] = action_list_dict.get('simple_action', new_rule['simple_action'])
             if 'qos_action' in rule_dict:
                 new_rule['action_list'][
                     'qos_action'] = rule_dict['qos_action']
@@ -369,7 +369,7 @@ def _set_policy_api(self, policy_name, rules_list, policy_obj=None):
             # end for
             action_list_dict = rule_dict.get('action_list', {})
             new_rule['action_list'][
-                'simple_action'] = action_list_dict.get('simple_action', 'pass')
+                'simple_action'] = action_list_dict.get('simple_action', new_rule['simple_action'])
             if 'qos_action' in rule_dict:
                 new_rule['action_list'][
                     'qos_action'] = rule_dict['qos_action']