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

diff --cc neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
index cee443c9792f1cbc030877f8784ee9c49bfa7b2d,2eed64b44893a46b603fa0d62f884091927e98ff..929c98581f2cd9e6b040dd1499f8ae0f5a656212
--- 1/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
--- 2/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')