From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 27 Mar 2015 19:17:37 +0000 (+0000)
Subject: Merge "Send only one rule in queue on rule create/delete"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aa2d7a2a232143f4664626ffe5f81af581a65933;p=openstack-build%2Fneutron-build.git

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

aa2d7a2a232143f4664626ffe5f81af581a65933
diff --cc neutron/tests/unit/services/metering/test_metering_agent.py
index 07e23239b,f41f5c81e..a1c3a2d3a
--- a/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()