Merge "Enable heat context to support existing network"

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

diff --git a/yardstick/network_services/vnf_generic/vnf/vfw_vnf.py b/yardstick/network_services/vnf_generic/vnf/vfw_vnf.py
index 6c95648..61e9985 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/vfw_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/vfw_vnf.py
@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
 import logging
 
-from yardstick.benchmark.scenarios.networking.vnf_generic import find_relative_file
+from yardstick.common import utils
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNF, DpdkVnfSetupEnvHelper
 from yardstick.network_services.yang_model import YangModel
 
@@ -60,8 +59,9 @@ class FWApproxVnf(SampleVNF):
         self.vfw_rules = None
 
     def _start_vnf(self):
-        yang_model_path = find_relative_file(self.scenario_helper.options['rules'],
-                                             self.scenario_helper.task_path)
+        yang_model_path = utils.find_relative_file(
+            self.scenario_helper.options['rules'],
+            self.scenario_helper.task_path)
         yang_model = YangModel(yang_model_path)
         self.vfw_rules = yang_model.get_rules()
         super(FWApproxVnf, self)._start_vnf()