7 files changed, 9 insertions, 10 deletions
diff --git a/vnftest/cmd/commands/__init__.py b/vnftest/cmd/commands/__init__.py
index 8c46b47..f0ecc97 100644
--- a/vnftest/cmd/commands/__init__.py
+++ b/vnftest/cmd/commands/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from vnftest.onap.core import Param
+from vnftest.core import Param
 
 
 def change_osloobj_to_paras(args):
diff --git a/vnftest/cmd/commands/plugin.py b/vnftest/cmd/commands/plugin.py
index e05130a..ff5f45d 100644
--- a/vnftest/cmd/commands/plugin.py
+++ b/vnftest/cmd/commands/plugin.py
@@ -18,7 +18,7 @@
 from __future__ import print_function
 
 from __future__ import absolute_import
-from vnftest.onap.core.plugin import Plugin
+from vnftest.core.plugin import Plugin
 from vnftest.common.utils import cliargs
 from vnftest.cmd.commands import change_osloobj_to_paras
 
diff --git a/vnftest/cmd/commands/report.py b/vnftest/cmd/commands/report.py
index 05b9249..582d76e 100644
--- a/vnftest/cmd/commands/report.py
+++ b/vnftest/cmd/commands/report.py
@@ -15,7 +15,7 @@ from __future__ import print_function
 
 from __future__ import absolute_import
 
-from vnftest.onap.core.report import Report
+from vnftest.core.report import Report
 from vnftest.cmd.commands import change_osloobj_to_paras
 from vnftest.common.utils import cliargs
 
diff --git a/vnftest/cmd/commands/runner.py b/vnftest/cmd/commands/runner.py
index 557f58f..5d130c3 100644
--- a/vnftest/cmd/commands/runner.py
+++ b/vnftest/cmd/commands/runner.py
@@ -18,7 +18,7 @@
 from __future__ import print_function
 
 from __future__ import absolute_import
-from vnftest.onap.core.runner import Runners
+from vnftest.core.runner import Runners
 from vnftest.common.utils import cliargs
 from vnftest.cmd.commands import change_osloobj_to_paras
 
diff --git a/vnftest/cmd/commands/step.py b/vnftest/cmd/commands/step.py
index 10ae913..90b3d68 100644
--- a/vnftest/cmd/commands/step.py
+++ b/vnftest/cmd/commands/step.py
@@ -17,7 +17,7 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
-from vnftest.onap.core.step import Steps
+from vnftest.core.step import Steps
 from vnftest.common.utils import cliargs
 from vnftest.cmd.commands import change_osloobj_to_paras
 
diff --git a/vnftest/cmd/commands/task.py b/vnftest/cmd/commands/task.py
index c0aa63d..3e2a071 100644
--- a/vnftest/cmd/commands/task.py
+++ b/vnftest/cmd/commands/task.py
@@ -14,14 +14,13 @@ from __future__ import absolute_import
 
 import logging
 
-from vnftest.onap.core.task import Task
+from vnftest.core.task import Task
 from vnftest.common.utils import cliargs
 from vnftest.common.utils import write_json_to_file
 from vnftest.cmd.commands import change_osloobj_to_paras
 
 output_file_default = "/tmp/vnftest.out"
 
-
 LOG = logging.getLogger(__name__)
 
 
@@ -30,8 +29,8 @@ class TaskCommands(object):     # pragma: no cover
 
        Set of commands to manage benchmark tasks.
        """
-
-    @cliargs("inputfile", type=str, help="path to task or suite file", nargs=1)
+    @cliargs("vnfdescriptor", type=str, help="path to vnf descriptor file", metavar="vnf-descriptor")
+    @cliargs("inputfile", type=str, help="path to task or suite file", metavar="input-file")
     @cliargs("--task-args", dest="task_args",
              help="Input task args (dict in json). These args are used"
              "to render input task that is jinja2 template.")
diff --git a/vnftest/cmd/commands/testcase.py b/vnftest/cmd/commands/testcase.py
index 518df2d..445a8fe 100644
--- a/vnftest/cmd/commands/testcase.py
+++ b/vnftest/cmd/commands/testcase.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 
 import prettytable
 
-from vnftest.onap.core.testcase import Testcase
+from vnftest.core.testcase import Testcase
 from vnftest.common.utils import cliargs
 from vnftest.cmd.commands import change_osloobj_to_paras
 from vnftest.cmd.commands import Commands