From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 22 Mar 2014 02:15:52 +0000 (+0000)
Subject: Merge "Add enable_security_group option"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e892f85d0638626466d1f17e24e507f035ae8a8e;p=openstack-build%2Fneutron-build.git

Merge "Add enable_security_group option"
---

e892f85d0638626466d1f17e24e507f035ae8a8e
diff --cc neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
index f5d289c6d,0e21c9561..f4c5d41c7
--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
@@@ -96,10 -96,11 +96,13 @@@ class TestLinuxBridgeAgent(base.BaseTes
  
      def setUp(self):
          super(TestLinuxBridgeAgent, self).setUp()
 +        # disable setting up periodic state reporting
 +        cfg.CONF.set_override('report_interval', 0, 'AGENT')
          cfg.CONF.set_override('rpc_backend',
                                'neutron.openstack.common.rpc.impl_fake')
+         cfg.CONF.set_default('firewall_driver',
+                              'neutron.agent.firewall.NoopFirewallDriver',
+                              group='SECURITYGROUP')
          self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
          self.execute = self.execute_p.start()
          self.addCleanup(self.execute_p.stop)