summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-07-13 09:32:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-13 09:32:46 +0000
commit898ecf01748fb4d3f733e3e7a4cfec38fe995f10 (patch)
tree274671e2fa7ed398a447b646bc659dec55430583
parentebe31fb15ed923401a7a97b25ca68d3e05e83d86 (diff)
parent639287faab56f702806d5bff09e38788d165ac9b (diff)
Merge "Fix "id" retrieval from MQ producer in GenericTrafficGen"
-rw-r--r--yardstick/network_services/vnf_generic/vnf/base.py2
-rw-r--r--yardstick/tests/unit/network_services/vnf_generic/vnf/test_base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/base.py b/yardstick/network_services/vnf_generic/vnf/base.py
index fb41a4e4a..45a6160c2 100644
--- 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 43e5ac839..ce8205a47 100644
--- 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())