Merge "Reverted the file permission"

diff --combined functest/opnfv_tests/openstack/vping/vping_base.py
index 8285d93,e467dd9..8285d93
mode 100755,100644..100644
--- 1/functest/opnfv_tests/openstack/vping/vping_base.py
--- 2/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@@ -12,38 -12,43 +12,38 @@@ import pprin
  import time
  from datetime import datetime
  
 -import functest.utils.functest_utils as ft_utils
 -import functest.utils.functest_constants as ft_constants
 -import functest.utils.openstack_utils as os_utils
  import functest.core.testcase_base as testcase_base
 +import functest.utils.openstack_utils as os_utils
 +from functest.utils.constants import CONST
  
  
  class VPingBase(testcase_base.TestcaseBase):
      def __init__(self):
 -        def get_conf(parameter):
 -            return ft_utils.get_functest_config(parameter)
 -
          super(VPingBase, self).__init__()
          self.logger = None
 -        self.functest_repo = ft_constants.FUNCTEST_REPO_DIR
 -        self.repo = get_conf('general.directories.dir_vping')
 -        self.vm1_name = get_conf('vping.vm_name_1')
 -        self.vm2_name = get_conf('vping.vm_name_2')
 +        self.functest_repo = CONST.dir_repo_functest
 +        self.repo = CONST.dir_vping
 +        self.vm1_name = CONST.vping_vm_name_1
 +        self.vm2_name = CONST.vping_vm_name_2
          self.vm_boot_timeout = 180
          self.vm_delete_timeout = 100
 -        self.ping_timeout = get_conf('vping.ping_timeout')
 +        self.ping_timeout = CONST.vping_ping_timeout
  
 -        self.image_name = get_conf('vping.image_name')
 -        self.image_filename = get_conf('general.openstack.image_file_name')
 -        self.image_format = get_conf('general.openstack.image_disk_format')
 -        self.image_path = ("%s/%s" %
 -                           (get_conf('general.directories.dir_functest_data'),
 -                            self.image_filename))
 +        self.image_name = CONST.vping_image_name
 +        self.image_filename = CONST.openstack_image_file_name
 +        self.image_format = CONST.openstack_image_disk_format
 +        self.image_path = os.path.join(CONST.dir_functest_data,
 +                                       self.image_filename)
  
 -        self.flavor_name = get_conf('vping.vm_flavor')
 +        self.flavor_name = CONST.vping_vm_flavor
  
          # NEUTRON Private Network parameters
 -        self.private_net_name = get_conf('vping.vping_private_net_name')
 -        self.private_subnet_name = get_conf('vping.vping_private_subnet_name')
 -        self.private_subnet_cidr = get_conf('vping.vping_private_subnet_cidr')
 -        self.router_name = get_conf('vping.vping_router_name')
 -        self.sg_name = get_conf('vping.vping_sg_name')
 -        self.sg_desc = get_conf('vping.vping_sg_descr')
 +        self.private_net_name = CONST.vping_private_net_name
 +        self.private_subnet_name = CONST.vping_private_subnet_name
 +        self.private_subnet_cidr = CONST.vping_private_subnet_cidr
 +        self.router_name = CONST.vping_router_name
 +        self.sg_name = CONST.vping_sg_name
 +        self.sg_desc = CONST.vping_sg_desc
          self.neutron_client = os_utils.get_neutron_client()
          self.glance_client = os_utils.get_glance_client()
          self.nova_client = os_utils.get_nova_client()
@@@ -289,6 -294,6 +289,6 @@@ class VPingMain(object)
              if result != VPingBase.EX_OK:
                  return result
              if kwargs['report']:
 -                return self.vping.push_to_db()
 +                return self.vping.publish_report()
          except Exception:
              return VPingBase.EX_RUN_ERROR

diff --combined test-requirements.txt
index 2bf297b,8be8e20..2bf297b
mode 100755,100644..100644
--- 1/test-requirements.txt
--- 2/test-requirements.txt
+++ b/test-requirements.txt
@@@ -5,7 -5,6 +5,7 @@@
  # which accompanies this distribution, and is available at
  # http://www.apache.org/licenses/LICENSE-2.0
  #
 +click==6.6
  coverage==4.1
  dnspython==1.15.0
  gitpython==1.0.1
@@@ -16,10 -15,9 +16,10 @@@ python-congressclient==1.5.
  python-keystoneclient==3.5.0
  python-neutronclient==6.0.0
  python-openstackclient==2.3.0
 +python-tackerclient==0.7.0
  pyyaml==3.10
  requests==2.8.0
  robotframework==2.9.1
  robotframework-requests==0.3.8
  robotframework-sshlibrary==2.1.1
 -virtualenv==15.1.0
 +virtualenv==15.1.0