Merge "Remove get_repo_tag"

diff --combined functest/opnfv_tests/openstack/tempest/conf_utils.py
index 72ea5ce,2cdc2cf..4202df6
--- 1/functest/opnfv_tests/openstack/tempest/conf_utils.py
--- 2/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@@ -115,36 -115,22 +115,25 @@@ def get_verifier_deployment_dir(verifie
                          'for-deployment-{}'.format(deployment_id))
  
  
- def get_repo_tag(repo):
-     """
-     Returns last tag of current branch
-     """
-     cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo))
-     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
-     tag = p.stdout.readline().rstrip()
- 
-     return str(tag)
- 
- 
  def backup_tempest_config(conf_file):
      """
      Copy config file to tempest results directory
      """
 +    if not os.path.exists(TEMPEST_RESULTS_DIR):
 +        os.makedirs(TEMPEST_RESULTS_DIR)
      shutil.copyfile(conf_file,
                      os.path.join(TEMPEST_RESULTS_DIR, 'tempest.conf'))
  
  
  def configure_tempest(deployment_dir, image_id=None, flavor_id=None,
 -                      mode=None):
 +                      compute_cnt=None):
      """
      Calls rally verify and updates the generated tempest.conf with
      given parameters
      """
      conf_file = configure_verifier(deployment_dir)
 -    configure_tempest_update_params(conf_file, image_id, flavor_id)
 +    configure_tempest_update_params(conf_file, image_id, flavor_id,
 +                                    compute_cnt)
  
  
  def configure_tempest_defcore(deployment_dir, image_id, flavor_id,
@@@ -200,8 -186,8 +189,8 @@@ def generate_test_accounts_file(tenant_
          yaml.dump(accounts_list, f, default_flow_style=False)
  
  
 -def configure_tempest_update_params(tempest_conf_file,
 -                                    image_id=None, flavor_id=None):
 +def configure_tempest_update_params(tempest_conf_file, image_id=None,
 +                                    flavor_id=None, compute_cnt=1):
      """
      Add/update needed parameters into tempest.conf file
      """
@@@ -224,10 -210,6 +213,10 @@@
              config.set('compute', 'flavor_ref', flavor_id)
          if FLAVOR_ID_ALT is not None:
              config.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT)
 +    if compute_cnt > 1:
 +        # enable multinode tests
 +        config.set('compute', 'min_compute_nodes', compute_cnt)
 +
      config.set('identity', 'region', 'RegionOne')
      if os_utils.is_keystone_v3():
          auth_version = 'v3'

diff --combined functest/tests/unit/openstack/tempest/test_conf_utils.py
index 22017a7,9df97b4..50b0edc
--- 1/functest/tests/unit/openstack/tempest/test_conf_utils.py
--- 2/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@@ -157,36 -157,11 +157,25 @@@ class OSTempestConfUtilsTesting(unittes
              self.assertTrue(m1.called)
              self.assertTrue(m2.called)
  
-     def test_get_repo_tag_default(self):
-         mock_popen = mock.Mock()
-         attrs = {'stdout.readline.return_value': 'test_tag'}
-         mock_popen.configure_mock(**attrs)
- 
-         with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                         'conf_utils.subprocess.Popen',
-                         return_value=mock_popen):
-             self.assertEqual(conf_utils.get_repo_tag('test_repo'),
-                              'test_tag')
- 
      def test_backup_tempest_config_default(self):
          with mock.patch('functest.opnfv_tests.openstack.tempest.'
 -                        'conf_utils.shutil.copyfile') as m1:
 +                        'conf_utils.os.path.exists',
 +                        return_value=False), \
 +            mock.patch('functest.opnfv_tests.openstack.tempest.'
 +                       'conf_utils.os.makedirs') as m1, \
 +            mock.patch('functest.opnfv_tests.openstack.tempest.'
 +                       'conf_utils.shutil.copyfile') as m2:
              conf_utils.backup_tempest_config('test_conf_file')
              self.assertTrue(m1.called)
 +            self.assertTrue(m2.called)
 +
 +        with mock.patch('functest.opnfv_tests.openstack.tempest.'
 +                        'conf_utils.os.path.exists',
 +                        return_value=True), \
 +            mock.patch('functest.opnfv_tests.openstack.tempest.'
 +                       'conf_utils.shutil.copyfile') as m2:
 +            conf_utils.backup_tempest_config('test_conf_file')
 +            self.assertTrue(m2.called)
  
      def test_configure_tempest_default(self):
          with mock.patch('functest.opnfv_tests.openstack.tempest.'