From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Mar 2014 07:03:31 +0000 (+0000)
Subject: Merge "Fixes the Hyper-V agent individual ports metrics"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=386aa20710cb7bb9fd2195f695c09b1ac1c04786;p=openstack-build%2Fneutron-build.git

Merge "Fixes the Hyper-V agent individual ports metrics"
---

386aa20710cb7bb9fd2195f695c09b1ac1c04786
diff --cc neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
index cee443c97,2eed64b44..929c98581
--- a/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
+++ b/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
@@@ -34,8 -34,11 +34,10 @@@ cfg.CONF.import_opt('enable_metrics_col
  
  class TestHyperVNeutronAgent(base.BaseTestCase):
  
+     _FAKE_PORT_ID = 'fake_port_id'
+ 
      def setUp(self):
          super(TestHyperVNeutronAgent, self).setUp()
 -        self.addCleanup(cfg.CONF.reset)
          # Avoid rpc initialization for unit tests
          cfg.CONF.set_override('rpc_backend',
                                'neutron.openstack.common.rpc.impl_fake')