Merge "Send only one rule in queue on rule create/delete"

diff --cc neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py
Simple merge

diff --cc neutron/db/metering/metering_db.py
Simple merge

diff --cc neutron/services/metering/agents/metering_agent.py
Simple merge

diff --cc neutron/services/metering/drivers/iptables/iptables_driver.py
Simple merge

diff --cc neutron/tests/unit/services/metering/drivers/test_iptables_driver.py
Simple merge

diff --cc neutron/tests/unit/services/metering/test_metering_agent.py
index 07e23239b435fa6300708b889d3568477962198f,f41f5c81e22ab720c543883e397725a2516be19f..a1c3a2d3a279af43b8aa1602ec1720695aa485c1
--- 1/neutron/tests/unit/services/metering/test_metering_agent.py
--- 2/neutron/tests/unit/services/metering/test_metering_agent.py
+++ b/neutron/tests/unit/services/metering/test_metering_agent.py
@@@ -34,8 -35,18 +34,17 @@@ ROUTERS = [{'status': 'ACTIVE'
                                    'id': LABEL_ID}],
              'id': _uuid()}]
  
+ ROUTERS_WITH_RULE = [{'status': 'ACTIVE',
+                       'name': 'router1',
+                       'gw_port_id': None,
+                       'admin_state_up': True,
+                       'tenant_id': TENANT_ID,
+                       '_metering_labels': [{'rule': {},
+                                             'id': LABEL_ID}],
+                       'id': _uuid()}]
+ 
  
 -class TestMeteringOperations(base.BaseTestCase,
 -                             testlib_plugin.NotificationSetupHelper):
 +class TestMeteringOperations(base.BaseTestCase):
  
      def setUp(self):
          super(TestMeteringOperations, self).setUp()