fix --excluded of meter-label-rule-create is not working

rule['excluded'] is boolean type, should not be compared with 'true'

Closes-Bug: #1248002
Change-Id: Ie78c307ede1f7124c58354825a411474ff6c1234

diff --git a/neutron/services/metering/drivers/iptables/iptables_driver.py b/neutron/services/metering/drivers/iptables/iptables_driver.py
index fd61ace2ac1b703ed7066fd24755ea732bdf3a85..cd5e41c0f784dd80ae5c94b28e370e36a4a58108 100644 (file)
--- a/neutron/services/metering/drivers/iptables/iptables_driver.py
+++ b/neutron/services/metering/drivers/iptables/iptables_driver.py
@@ -154,7 +154,7 @@ class IptablesMeteringDriver(abstract_driver.MeteringAbstractDriver):
             if rule['direction'] == 'egress':
                 dir = '-o ' + ext_dev
 
-            if rule['excluded'] == 'true':
+            if rule['excluded']:
                 ipt_rule = dir + ' -d ' + remote_ip + ' -j RETURN'
                 im.ipv4['filter'].add_rule(rules_chain, ipt_rule, wrap=False,
                                            top=True)

diff --git a/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py b/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py
index 6064407e65574475244c68a84a63d852f0d2f5ce..f78382dd1d5c0417aeb208317db48e94092ba054 100644 (file)
--- a/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py
+++ b/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py
@@ -142,9 +142,8 @@ class IptablesDriverTestCase(base.BaseTestCase):
                                '',
                                wrap=False),
                  call.add_rule('neutron-meter-r-eeef45da-c60',
-                               '-i qg-7d411f48-ec -d 20.0.0.0/24 -j '
-                               'neutron-meter-l-eeef45da-c60',
-                               wrap=False, top=False)]
+                               '-i qg-7d411f48-ec -d 20.0.0.0/24 -j RETURN',
+                               wrap=False, top=True)]
 
         self.v4filter_inst.assert_has_calls(calls)
 
@@ -194,9 +193,8 @@ class IptablesDriverTestCase(base.BaseTestCase):
                                wrap=False, top=False),
                  call.empty_chain('neutron-meter-r-c5df2fe5-c60', wrap=False),
                  call.add_rule('neutron-meter-r-c5df2fe5-c60',
-                               '-o qg-6d411f48-ec -d 10.0.0.0/24 -j '
-                               'neutron-meter-l-c5df2fe5-c60',
-                               wrap=False, top=False),
+                               '-o qg-6d411f48-ec -d 10.0.0.0/24 -j RETURN',
+                               wrap=False, top=True),
                  call.add_rule('neutron-meter-r-c5df2fe5-c60',
                                '-i qg-6d411f48-ec -d 20.0.0.0/24 -j '
                                'neutron-meter-l-c5df2fe5-c60',
@@ -358,9 +356,8 @@ class IptablesDriverTestCase(base.BaseTestCase):
                                '',
                                wrap=False),
                  call.add_rule('neutron-meter-r-eeef45da-c60',
-                               '-i qg-7d411f48-ec -d 20.0.0.0/24 -j '
-                               'neutron-meter-l-eeef45da-c60',
-                               wrap=False, top=False),
+                               '-i qg-7d411f48-ec -d 20.0.0.0/24 -j RETURN',
+                               wrap=False, top=True),
                  call.remove_chain('neutron-meter-l-c5df2fe5-c60', wrap=False),
                  call.remove_chain('neutron-meter-r-c5df2fe5-c60', wrap=False),
                  call.add_chain('neutron-meter-l-c5df2fe5-c60', wrap=False),