Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Create Dockerfile to create a yardstick-image of docker"
[yardstick.git]
/
yardstick
/
network_services
/
vnf_generic
/
vnf
/
tg_rfc2544_ixia.py
diff --git
a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index
a1f9fbe
..
4d3bc2c
100644
(file)
--- a/
yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/
yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@
-102,7
+102,7
@@
class IxiaResourceHelper(ClientResourceHelper):
self.client.assign_ports()
self.client.create_traffic_model()
self.client.assign_ports()
self.client.create_traffic_model()
- def run_traffic(self, traffic_profile):
+ def run_traffic(self, traffic_profile
, *args
):
if self._terminated.value:
return
if self._terminated.value:
return
@@
-157,12
+157,12
@@
class IxiaTrafficGen(SampleVNFTrafficGen):
APP_NAME = 'Ixia'
APP_NAME = 'Ixia'
- def __init__(self, name, vnfd, setup_env_helper_type=None, resource_helper_type=None):
+ def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+ resource_helper_type=None):
if resource_helper_type is None:
resource_helper_type = IxiaResourceHelper
if resource_helper_type is None:
resource_helper_type = IxiaResourceHelper
-
- super(IxiaTrafficGen, self).__init__(name, vnfd, setup_env_helper_type,
- resource_helper_type)
+ super(IxiaTrafficGen, self).__init__(
+ name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
self._ixia_traffic_gen = None
self.ixia_file_name = ''
self.vnf_port_pairs = []
self._ixia_traffic_gen = None
self.ixia_file_name = ''
self.vnf_port_pairs = []