From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 21 Dec 2017 08:45:29 +0000 (+0000)
Subject: Merge "Get auth token when checking deployment"
X-Git-Tag: 0.2~145
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=582de12734688e080fd421c46780ae9ea380b27b;hp=f09e17ef9b94d3cdb0b28340e08ce7966c500140;p=functest-xtesting.git

Merge "Get auth token when checking deployment"
---

diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index ffea6beb..9453c6d4 100644
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -52,6 +52,16 @@ def verify_connectivity(endpoint):
     return False
 
 
+def get_auth_token(os_creds):
+    """ Get auth token """
+    sess = keystone_utils.keystone_session(os_creds)
+    try:
+        return sess.get_token()
+    except Exception as error:
+        LOGGER.error("Got token ...FAILED")
+        raise error
+
+
 class CheckDeployment(object):
     """ Check deployment class."""
 
@@ -69,12 +79,15 @@ class CheckDeployment(object):
                               format(self.rc_file))
 
     def check_auth_endpoint(self):
-        """ Verifies connectivity to the OS_AUTH_URL given in the RC file """
+        """ Verifies connectivity to the OS_AUTH_URL given in the RC file
+        and get auth token"""
         rc_endpoint = self.os_creds.auth_url
         if not verify_connectivity(rc_endpoint):
             raise Exception("OS_AUTH_URL {} is not reachable.".
                             format(rc_endpoint))
         LOGGER.info("Connectivity to OS_AUTH_URL %s ...OK", rc_endpoint)
+        if get_auth_token(self.os_creds):
+            LOGGER.info("Got token ...OK")
 
     def check_public_endpoint(self):
         """ Gets the public endpoint and verifies connectivity to it """
diff --git a/functest/tests/unit/ci/test_check_deployment.py b/functest/tests/unit/ci/test_check_deployment.py
index fa2f2130..fc6368e5 100644
--- a/functest/tests/unit/ci/test_check_deployment.py
+++ b/functest/tests/unit/ci/test_check_deployment.py
@@ -63,9 +63,12 @@ class CheckDeploymentTesting(unittest.TestCase):
 
     def test_check_auth_endpoint(self):
         with mock.patch('functest.ci.check_deployment.verify_connectivity',
-                        return_value=True) as m:
+                        return_value=True) as m,\
+                mock.patch('functest.ci.check_deployment.get_auth_token',
+                           return_value='gAAAAABaOhXGS') as mock_token:
             self.deployment.check_auth_endpoint()
             self.assertTrue(m.called)
+            self.assertTrue(mock_token.called)
 
     def test_check_auth_endpoint_not_reachable(self):
         with mock.patch('functest.ci.check_deployment.verify_connectivity',