Merge "Make SFC test a python call to main()"

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..78668cf
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docs/com/pres/reveal.js"]
+       path = docs/com/pres/reveal.js
+       url = https://github.com/hakimel/reveal.js.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 176c109..af3f8ec 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -122,16 +122,16 @@ RUN cd ${REPOS_DIR}/barometer \
 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
     -not -path "*tests/unit*" \
     -not -path "*functest_venv*" \
-    |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 &&
-    find ${FUNCTEST_REPO_DIR} -name "*.sh" \
+    |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 \
+    && find ${FUNCTEST_REPO_DIR} -name "*.sh" \
     -not -path "*functest_venv*" \
     |xargs grep -L \#\! |cut -d\:  -f 1 |xargs chmod -c 644
 
 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
     -not -path "*tests/unit*" \
     -not -path "*functest_venv*" \
-    |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 &&
-    find ${FUNCTEST_REPO_DIR} -name "*.sh" \
+    |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
+    && find ${FUNCTEST_REPO_DIR} -name "*.sh" \
     -not -path "*functest_venv*" \
     |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755
 

diff --git a/docs/com/README.txt b/docs/com/README.txt
deleted file mode 100644 (file)
index 62d616b..0000000
--- a/docs/com/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-This com folder contains the images, html and css files used to create
-communication based on reveal.js
-All the files are licensed under Creative Commons Attribution 4.0
-International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-You can download reveal.js at:  https://github.com/hakimel/reveal.js/
-Then you must put images and css on existing directory and add the pres
-directory

diff --git a/docs/com/pres/Summit/Berlin-2016/conversation.html b/docs/com/pres/Summit/Berlin-2016/conversation.html
index b56b1e1..356c2ad 100755 (executable)
--- a/docs/com/pres/Summit/Berlin-2016/conversation.html
+++ b/docs/com/pres/Summit/Berlin-2016/conversation.html
@@ -14,18 +14,18 @@
 
                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
-               <link rel="stylesheet" href="../../../css/reveal.css">
+               <link rel="stylesheet" href="../../reveal.js/css/reveal.css">
                <link rel="stylesheet" href="../../../css/theme/OPNFV-Berlin.css" id="theme">
 
                <!-- Code syntax highlighting -->
-               <link rel="stylesheet" href="../../../lib/css/zenburn.css">
+               <link rel="stylesheet" href="../../reveal.js/lib/css/zenburn.css">
 
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );
                        link.rel = 'stylesheet';
                        link.type = 'text/css';
-                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../../css/print/pdf.css' : '../../../css/print/paper.css';
+                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../reveal.js/css/print/pdf.css' : '../../reveal.js/css/print/paper.css';
                        document.getElementsByTagName( 'head' )[0].appendChild( link );
                </script>
 
@@ -219,8 +219,8 @@
                </div>
                </div>
 
-               <script src="../../../lib/js/head.min.js"></script>
-               <script src="../../../js/reveal.js"></script>
+               <script src="../../reveal.js/lib/js/head.min.js"></script>
+               <script src="../../reveal.js/js/reveal.js"></script>
 
                <script>
 
@@ -236,12 +236,12 @@
 
                                // Optional reveal.js plugins
                                dependencies: [
-                                       { src: '../../../lib/js/classList.js', condition: function() { return !document.body.classList; } },
-                                       { src: '../../../plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
-                                       { src: '../../../plugin/zoom-js/zoom.js', async: true },
-                                       { src: '../../../plugin/notes/notes.js', async: true }
+                                       { src: '../../reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+                                       { src: '../../reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+                                       { src: '../../reveal.js/plugin/zoom-js/zoom.js', async: true },
+                                       { src: '../../reveal.js/plugin/notes/notes.js', async: true }
                                ]
                        });
 

diff --git a/docs/com/pres/Summit/Berlin-2016/summit-Berlin.html b/docs/com/pres/Summit/Berlin-2016/summit-Berlin.html
index 8369443..97fa66c 100755 (executable)
--- a/docs/com/pres/Summit/Berlin-2016/summit-Berlin.html
+++ b/docs/com/pres/Summit/Berlin-2016/summit-Berlin.html
@@ -14,23 +14,23 @@
 
                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
-               <link rel="stylesheet" href="../../../css/reveal.css">
+               <link rel="stylesheet" href="../../reveal.js/css/reveal.css">
                <link rel="stylesheet" href="../../../css/theme/OPNFV-Berlin.css" id="theme">
 
                <!-- Code syntax highlighting -->
-               <link rel="stylesheet" href="../../../lib/css/zenburn.css">
+               <link rel="stylesheet" href="../../reveal.js/lib/css/zenburn.css">
 
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );
                        link.rel = 'stylesheet';
                        link.type = 'text/css';
-                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../../css/print/pdf.css' : '../../../css/print/paper.css';
+                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../reveal.js/css/print/pdf.css' : '../../../css/print/paper.css';
                        document.getElementsByTagName( 'head' )[0].appendChild( link );
                </script>
 
                <!--[if lt IE 9]>
-               <script src="lib/js/html5shiv.js"></script>
+               <script src="l../../reveal.jsml5shiv.js"></script>
                <![endif]-->
        </head>
 
@@ -277,12 +277,12 @@
 
                        </div>
             <div class='footer'>
-                                <img src="../../../img/logo-OPNFV-Berlin.png" alt="OPNFV logo"> 
+                                <img src="../../../img/logo-OPNFV-Berlin.png" alt="OPNFV logo">
                </div>
                </div>
 
-               <script src="../../../lib/js/head.min.js"></script>
-               <script src="../../../js/reveal.js"></script>
+               <script src="../../reveal.js/lib/js/head.min.js"></script>
+               <script src="../../reveal.js/js/reveal.js"></script>
 
                <script>
 
@@ -298,12 +298,12 @@
 
                                // Optional reveal.js plugins
                                dependencies: [
-                                       { src: '../../../lib/js/classList.js', condition: function() { return !document.body.classList; } },
-                                       { src: '../../../plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
-                                       { src: '../../../plugin/zoom-js/zoom.js', async: true },
-                                       { src: '../../../plugin/notes/notes.js', async: true }
+                                       { src: '../../reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+                                       { src: '../../reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+                                       { src: '../../reveal.js/plugin/zoom-js/zoom.js', async: true },
+                                       { src: '../../reveal.js/plugin/notes/notes.js', async: true }
                                ]
                        });
 

diff --git a/docs/com/pres/Summit/Berlin-2016/testapi.html b/docs/com/pres/Summit/Berlin-2016/testapi.html
index 16f97c4..c40637c 100755 (executable)
--- a/docs/com/pres/Summit/Berlin-2016/testapi.html
+++ b/docs/com/pres/Summit/Berlin-2016/testapi.html
@@ -14,18 +14,18 @@
 
                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
-               <link rel="stylesheet" href="../../../css/reveal.css">
+               <link rel="stylesheet" href="../../reveal.js/css/reveal.css">
                <link rel="stylesheet" href="../../../css/theme/OPNFV-Berlin.css" id="theme">
 
                <!-- Code syntax highlighting -->
-               <link rel="stylesheet" href="../../../lib/css/zenburn.css">
+               <link rel="stylesheet" href="../../reveal.js/lib/css/zenburn.css">
 
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );
                        link.rel = 'stylesheet';
                        link.type = 'text/css';
-                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../../css/print/pdf.css' : '../../../css/print/paper.css';
+                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../reveal.js/css/print/pdf.css' : '../../reveal.js/css/print/paper.css';
                        document.getElementsByTagName( 'head' )[0].appendChild( link );
                </script>
 
@@ -242,8 +242,8 @@ OK
                        </div>
                </div>
 
-               <script src="../../../lib/js/head.min.js"></script>
-               <script src="../../../js/reveal.js"></script>
+               <script src="../../reveal.js/lib/js/head.min.js"></script>
+               <script src="../../reveal.js/js/reveal.js"></script>
 
                <script>
 
@@ -259,12 +259,12 @@ OK
 
                                // Optional reveal.js plugins
                                dependencies: [
-                                       { src: '../../../lib/js/classList.js', condition: function() { return !document.body.classList; } },
-                                       { src: '../../../plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../../plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
-                                       { src: '../../../plugin/zoom-js/zoom.js', async: true },
-                                       { src: '../../../plugin/notes/notes.js', async: true }
+                                       { src: '../../reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+                                       { src: '../../reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../../reveal.js/plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+                                       { src: '../../reveal.js/plugin/zoom-js/zoom.js', async: true },
+                                       { src: '../../reveal.js/plugin/notes/notes.js', async: true }
                                ]
                        });
 

diff --git a/docs/com/pres/dashboard/dashboard_status.html b/docs/com/pres/dashboard/dashboard_status.html
index 7d46a74..1321afa 100755 (executable)
--- a/docs/com/pres/dashboard/dashboard_status.html
+++ b/docs/com/pres/dashboard/dashboard_status.html
@@ -14,18 +14,18 @@
 
                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
-               <link rel="stylesheet" href="../../css/reveal.css">
+               <link rel="stylesheet" href="../reveal.js/css/reveal.css">
                <link rel="stylesheet" href="../../css/theme/OPNFV.css" id="theme">
 
                <!-- Code syntax highlighting -->
-               <link rel="stylesheet" href="../../lib/css/zenburn.css">
+               <link rel="stylesheet" href="../reveal.js/lib/css/zenburn.css">
 
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );
                        link.rel = 'stylesheet';
                        link.type = 'text/css';
-                       link.href = window.location.search.match( /print-pdf/gi ) ? '../../css/print/pdf.css' : '../../css/print/paper.css';
+                       link.href = window.location.search.match( /print-pdf/gi ) ? '../reveal.js/css/print/pdf.css' : '../reveal.js/css/print/paper.css';
                        document.getElementsByTagName( 'head' )[0].appendChild( link );
                </script>
 
@@ -114,8 +114,8 @@
                </div>
                </div>
 
-               <script src="../../lib/js/head.min.js"></script>
-               <script src="../../js/reveal.js"></script>
+               <script src="../reveal.js/lib/js/head.min.js"></script>
+               <script src="../reveal.js/js/reveal.js"></script>
 
                <script>
 
@@ -131,12 +131,12 @@
 
                                // Optional reveal.js plugins
                                dependencies: [
-                                       { src: '../../lib/js/classList.js', condition: function() { return !document.body.classList; } },
-                                       { src: '../../plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-                                       { src: '../../plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
-                                       { src: '../../plugin/zoom-js/zoom.js', async: true },
-                                       { src: '../../plugin/notes/notes.js', async: true }
+                                       { src: '../reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+                                       { src: '../reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+                                       { src: '../reveal.js/plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+                                       { src: '../reveal.js/plugin/zoom-js/zoom.js', async: true },
+                                       { src: '../reveal.js/plugin/notes/notes.js', async: true }
                                ]
                        });
 

diff --git a/docs/com/pres/reveal.js b/docs/com/pres/reveal.js
new file mode 160000 (submodule)
index 0000000..a349ff4
--- /dev/null
+++ b/docs/com/pres/reveal.js
@@ -0,0 +1 @@
+Subproject commit a349ff43c58c23f9c837b8ea9b5fc7d4761b8de3

diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh
index 2c5c021..3920b7a 100755 (executable)
--- a/functest/ci/check_os.sh
+++ b/functest/ci/check_os.sh
@@ -26,6 +26,11 @@ verify_connectivity() {
     return 1
 }
 
+verify_SSL_connectivity() {
+    openssl s_client -connect $1:$2 &>/dev/null
+    return $?
+}
+
 check_service() {
     local service cmd
     service=$1
@@ -63,10 +68,16 @@ fi
 
 echo "Checking OpenStack endpoints:"
 publicURL=$(openstack catalog show  identity |awk '/public/ {print $4}')
-publicIP=$(echo $publicURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
+publicIP=$(echo $publicURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//')
 publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/\/.*$//')
-echo ">>Verifying connectivity to the public endpoint $publicIP:$publicPort..."
-verify_connectivity $publicIP $publicPort
+https_enabled=$(echo $publicURL | grep 'https')
+if [[ -n $https_enabled ]]; then
+    echo ">>Verifying SSL connectivity to the public endpoint $publicIP:$publicPort..."
+    verify_SSL_connectivity $publicIP $publicPort
+else
+    echo ">>Verifying connectivity to the public endpoint $publicIP:$publicPort..."
+    verify_connectivity $publicIP $publicPort
+fi
 RETVAL=$?
 if [ $RETVAL -ne 0 ]; then
     echo "ERROR: Cannot talk to the public endpoint $publicIP:$publicPort ."
@@ -81,10 +92,16 @@ if [ -z ${adminURL} ]; then
     openstack catalog show identity
     exit 1
 fi
-adminIP=$(echo $adminURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
+adminIP=$(echo $adminURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//')
 adminPort=$(echo $adminURL|sed 's/^.*://'|sed 's/.[^\/]*$//')
-echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..."
-verify_connectivity $adminIP $adminPort
+https_enabled=$(echo $adminURL | grep 'https')
+if [[ -n $https_enabled ]]; then
+    echo ">>Verifying SSL connectivity to the admin endpoint $adminIP:$adminPort..."
+    verify_SSL_connectivity $adminIP $adminPort
+else
+    echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..."
+    verify_connectivity $adminIP $adminPort
+fi
 RETVAL=$?
 if [ $RETVAL -ne 0 ]; then
     echo "ERROR: Cannot talk to the admin endpoint $adminIP:$adminPort ."

diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py
index ef3764c..f51a499 100644 (file)
--- a/functest/tests/unit/utils/test_openstack_utils.py
+++ b/functest/tests/unit/utils/test_openstack_utils.py
@@ -28,7 +28,8 @@ class OSUtilsTesting(unittest.TestCase):
                 'OS_PROJECT_DOMAIN_NAME': os_prefix + 'project_domain_name',
                 'OS_PROJECT_NAME': os_prefix + 'project_name',
                 'OS_ENDPOINT_TYPE': os_prefix + 'endpoint_type',
-                'OS_REGION_NAME': os_prefix + 'region_name'}
+                'OS_REGION_NAME': os_prefix + 'region_name',
+                'OS_CACERT': os_prefix + 'https_cacert'}
 
     def _get_os_env_vars(self):
         return {'username': 'test_username', 'password': 'test_password',
@@ -37,7 +38,8 @@ class OSUtilsTesting(unittest.TestCase):
                 'project_domain_name': 'test_project_domain_name',
                 'project_name': 'test_project_name',
                 'endpoint_type': 'test_endpoint_type',
-                'region_name': 'test_region_name'}
+                'region_name': 'test_region_name',
+                'https_cacert': 'test_https_cacert'}
 
     def setUp(self):
         self.env_vars = ['OS_AUTH_URL', 'OS_USERNAME', 'OS_PASSWORD']
@@ -299,7 +301,7 @@ class OSUtilsTesting(unittest.TestCase):
                          'OS_PROJECT_DOMAIN_NAME'])
         self.assertEqual(openstack_utils.get_rc_env_vars(), exp_resp)
 
-    @mock.patch('functest.utils.openstack_utils.get_rc_env_vars')
+    @mock.patch('functest.utils.openstack_utils')
     def test_check_credentials_missing_env(self, mock_get_rc_env):
         exp_resp = self.env_vars
         exp_resp.extend(['OS_TENANT_NAME'])

diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index e33af63..ffc870f 100644 (file)
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -82,7 +82,8 @@ def get_env_cred_dict():
         'OS_PROJECT_DOMAIN_NAME': 'project_domain_name',
         'OS_PROJECT_NAME': 'project_name',
         'OS_ENDPOINT_TYPE': 'endpoint_type',
-        'OS_REGION_NAME': 'region_name'
+        'OS_REGION_NAME': 'region_name',
+        'OS_CACERT': 'https_cacert'
     }
     return env_cred_dict
 
@@ -149,6 +150,11 @@ def get_credentials_for_rally():
     if region_name is not None:
         cred_key = env_cred_dict.get('OS_REGION_NAME')
         rally_conf[cred_key] = region_name
+
+    cacert = os.getenv('OS_CACERT')
+    if cacert is not None:
+        cred_key = env_cred_dict.get('OS_CACERT')
+        rally_conf[cred_key] = cacert
     return rally_conf
 
 
@@ -168,7 +174,14 @@ def get_endpoint(service_type, endpoint_type='publicURL'):
 
 def get_session(other_creds={}):
     auth = get_session_auth(other_creds)
-    return session.Session(auth=auth)
+    cacert = os.getenv('OS_CACERT')
+    if cacert is not None:
+        if not os.path.isfile(cacert):
+            raise Exception("The 'OS_CACERT' environment"
+                            "variable is set to %s but the file"
+                            "does not exist.", cacert)
+
+    return session.Session(auth=auth, verify=cacert)
 
 
 # *********************************************