summaryrefslogtreecommitdiffstats
path: root/yardstick/network_services/vnf_generic/vnf/acl_vnf.py
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-03-01 15:11:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-01 15:11:03 +0000
commit9a71438273cefd57c652b6049c697bdf137088c8 (patch)
tree7ef9fe6f5e357eee8b77cd5c08df64bea915937c /yardstick/network_services/vnf_generic/vnf/acl_vnf.py
parent14a0f0b13e37cf0a65603915b7c75b86fd4a4383 (diff)
parentd08a8d477fd7b9fb88855b12ee53eafa07e79afa (diff)
Merge "Import "traffic_profile" modules only once"
Diffstat (limited to 'yardstick/network_services/vnf_generic/vnf/acl_vnf.py')
-rw-r--r--yardstick/network_services/vnf_generic/vnf/acl_vnf.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/acl_vnf.py b/yardstick/network_services/vnf_generic/vnf/acl_vnf.py
index 1390dd02e..f3cafef7a 100644
--- a/yardstick/network_services/vnf_generic/vnf/acl_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/acl_vnf.py
@@ -12,11 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-from __future__ import print_function
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
@@ -62,8 +60,9 @@ class AclApproxVnf(SampleVNF):
self.acl_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.acl_rules = yang_model.get_rules()
super(AclApproxVnf, self)._start_vnf()