Merge "Cleanup CGNAPT unit tests"

diff --cc yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py
index d2dc699,02e411e..6b6f3ef
--- 1/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py
--- 2/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py
+++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py
@@@ -87,12 -83,10 +83,11 @@@ link 1 u
          ssh_helper = mock.Mock()
          scenario_helper = mock.Mock()
          scenario_helper.vnf_cfg = {'lb_config': 'HW'}
 +        scenario_helper.options = {}
          scenario_helper.all_options = {}
  
-         cgnat_approx_setup_helper = CgnaptApproxSetupEnvHelper(vnfd_helper,
-                                                                ssh_helper,
-                                                                scenario_helper)
+         cgnat_approx_setup_helper = cgnapt_vnf.CgnaptApproxSetupEnvHelper(
+             vnfd_helper, ssh_helper, scenario_helper)
  
          cgnat_approx_setup_helper.ssh_helper.provision_tool = mock.Mock(return_value='tool_path')
          cgnat_approx_setup_helper.ssh_helper.all_ports = mock.Mock()