Merge "Added NSB descriptors for vCMTS testcase"

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / tg_prox.py

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_prox.py b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
index 854319a..65b7bac 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_prox.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-
 import logging
+import copy
 
 from yardstick.network_services.utils import get_nsb_option
 from yardstick.network_services.vnf_generic.vnf.prox_vnf import ProxApproxVnf
@@ -30,11 +29,13 @@ class ProxTrafficGen(SampleVNFTrafficGen):
     LUA_PARAMETER_NAME = "gen"
     WAIT_TIME = 1
 
-    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+    def __init__(self, name, vnfd, setup_env_helper_type=None,
                  resource_helper_type=None):
-        # don't call superclass, use custom wrapper of ProxApproxVnf
+        vnfd_cpy = copy.deepcopy(vnfd)
+        super(ProxTrafficGen, self).__init__(name, vnfd_cpy)
+
         self._vnf_wrapper = ProxApproxVnf(
-            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
+            name, vnfd, setup_env_helper_type, resource_helper_type)
         self.bin_path = get_nsb_option('bin_path', '')
         self.name = self._vnf_wrapper.name
         self.ssh_helper = self._vnf_wrapper.ssh_helper