Merge "fix the configparser for Python 2 and 3 Compatibility"

diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644 (file)
index 0000000..4dedb98
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,17 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. SPDX-License-Identifier: CC-BY-4.0
+.. (c) Open Platform for NFV Project, Inc. and its contributors
+
+.. _doctor:
+
+=========================================
+Fault Management and Maintenance (Doctor)
+=========================================
+
+.. toctree::
+   :numbered:
+   :maxdepth: 2
+
+   release/index
+   development/index
+

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index ad690bb..142bfac 100644 (file)
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -4,20 +4,6 @@
 
 This document provides the release notes for Gambia of Doctor.
 
-.. contents::
-   :depth: 3
-   :local:
-
-
-Version history
----------------
-
-+--------------------+--------------------+--------------------+-------------+
-| **Date**           | **Ver.**           | **Author**         | **Comment** |
-+--------------------+--------------------+--------------------+-------------+
-| 2018-09-20         | 7.0.0              | Tomi Juvonen       |             |
-+--------------------+--------------------+--------------------+-------------+
-
 Important notes
 ===============
 
@@ -27,7 +13,11 @@ maintenance workflow code implemented in Doctor. Work has also started to have
 the real implementation done in the OpenStack Fenix project
 https://wiki.openstack.org/wiki/Fenix.
 
-Doctor CI testing has now moved to use tox instead of Functest.
+Doctor CI testing has now moved to use tox on jumphots instead of running test
+through features container. Also in Apex we use OpenStack services running in
+containers. Functest daily testing supports Doctor fault management test case
+for Apex, Daisy and Fuel installers. This testing is done through features
+container.
 
 In this release, Doctor has not been working with the fault management use case as
 the basic framework has been already done. However, we might need to get back to
@@ -50,6 +40,22 @@ Doctor changes
 +------------------------------------------+----------------------------------------------------------+
 | **commit-ID**                            | **Subject**                                              |
 +------------------------------------------+----------------------------------------------------------+
+| 5b3f5937e7b861fca46b2a6b2d6708866b800f95 | fix building docs                                        |
++------------------------------------------+----------------------------------------------------------+
+| 2ca5924081ce4784f599437707bd32807aa155ce | Fix SSH client connection reset                          |
++------------------------------------------+----------------------------------------------------------+
+| baac6579556f8216b36db0d0f87f9c2d4f8b4ef5 | Support Apex with services in containers                 |
++------------------------------------------+----------------------------------------------------------+
+| 23bf63c4616040cb0d69cd26238af2a4a7c00a90 | fix the username to login undercloud in Apex             |
++------------------------------------------+----------------------------------------------------------+
+| 61eb3927ada784cc3dffb5ddd17f66e47871f708 | Local Documentation Builds                               |
++------------------------------------------+----------------------------------------------------------+
+| 0f1dd4314b9e0247d9af7af6df2410462423aeca | Updated from global requirements                         |
++------------------------------------------+----------------------------------------------------------+
+| 2d4a9f0c0a93797da6534583f6e74553a4b634be | Fix links to remove references to submodules             |
++------------------------------------------+----------------------------------------------------------+
+| 3ddc2392b0ed364eede49ff006d64df3ea456350 | Gambia release notes                                     |
++------------------------------------------+----------------------------------------------------------+
 | 825a0a0dd5e8028129b782ed21c549586257b1c5 | delete doctor datasource in congress when cleanup        |
 +------------------------------------------+----------------------------------------------------------+
 | fcf53129ab2b18b84571faff13d7cb118b3a41b3 | run profile even the notification time is larger than 1S |
@@ -171,6 +177,9 @@ Feature additions
 +--------------------+--------------------------------------------------------+
 | DOCTOR-127         | Maintenance test POD                                   |
 +--------------------+--------------------------------------------------------+
+| DOCTOR-130         | Apex with containers                                   |
++--------------------+--------------------------------------------------------+
+
 
 
 Deliverables

diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index 9b0010e..2aa81ff 100644 (file)
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -192,20 +192,39 @@ class ApexInstaller(BaseInstaller):
                 restart_cmd += ' openstack-congress-server.service'
             restore_scripts.append(self.cg_restore_script)
 
-        for client in self.controller_clients:
-            self._run_apply_patches(client,
-                                    restart_cmd,
-                                    restore_scripts,
-                                    python=self.python)
-
+        for client, node_ip in zip(self.controller_clients, self.controllers):
+            retry = 0
+            while retry < 2:
+                try:
+                    self._run_apply_patches(client,
+                                            restart_cmd,
+                                            restore_scripts,
+                                            python=self.python)
+                except Exception:
+                    if retry > 0:
+                        raise Exception("SSHClient to %s feiled" % node_ip)
+                    client = SSHClient(node_ip, self.node_user_name,
+                                       key_filename=self.key_file)
+                    retry += 1
+                break
         if self.conf.test_case != 'fault_management':
             if self.use_containers:
                 restart_cmd = self._set_docker_restart_cmd("nova-compute")
             else:
                 restart_cmd = 'sudo systemctl restart' \
                               ' openstack-nova-compute.service'
-            for client in self.compute_clients:
-                self._run_apply_patches(client,
-                                        restart_cmd,
-                                        [self.nc_restore_compute_script],
-                                        python=self.python)
+            for client, node_ip in zip(self.compute_clients, self.computes):
+                retry = 0
+                while retry < 2:
+                    try:
+                        self._run_apply_patches(
+                            client, restart_cmd,
+                            [self.nc_restore_compute_script],
+                            python=self.python)
+                    except Exception:
+                        if retry > 0:
+                            raise Exception("SSHClient to %s feiled" % node_ip)
+                        client = SSHClient(node_ip, self.node_user_name,
+                                           key_filename=self.key_file)
+                        retry += 1
+                    break

diff --git a/tox.ini b/tox.ini
index 8a5df05..6e0d8b4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -51,6 +51,7 @@ filename = *.py,app.wsgi
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tests
 
 [testenv:docs]
+changedir = {toxinidir}
 deps = -rdocs/requirements.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -58,5 +59,6 @@ commands =
 whitelist_externals = echo
 
 [testenv:docs-linkcheck]
+changedir = {toxinidir}
 deps = -rdocs/requirements.txt
 commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck