Merge "Fix "id" retrieval from MQ producer in GenericTrafficGen"

diff --git a/yardstick/network_services/vnf_generic/vnf/base.py b/yardstick/network_services/vnf_generic/vnf/base.py
index fb41a4e..45a6160 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/base.py
+++ b/yardstick/network_services/vnf_generic/vnf/base.py
@@ -335,4 +335,4 @@ class GenericTrafficGen(GenericVNF):
     def get_mq_producer_id(self):
         """Return the MQ producer ID if initialized"""
         if self._mq_producer:
-            return self._mq_producer.get_id()
+            return self._mq_producer.id

diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_base.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_base.py
index 43e5ac8..ce8205a 100644 (file)
--- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_base.py
+++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_base.py
@@ -264,7 +264,7 @@ class GenericTrafficGenTestCase(unittest.TestCase):
                 }
         tg = _DummyGenericTrafficGen('name', vnfd)
         tg._mq_producer = mock.Mock()
-        tg._mq_producer.get_id.return_value = 'fake_id'
+        tg._mq_producer.id = 'fake_id'
         self.assertEqual('fake_id', tg.get_mq_producer_id())