Update all redirected links in Dovetail docs

The pod ld-build2 only has python 3.6 installed, so change the tox env to be 3.6
Other pods has python 3.5 to verify pep8, py35 ...

Change-Id: I0289d7ce96ffa49dd08ce4b855fe071a5e608cbf
Signed-off-by: xudan <xudan16@huawei.com>

24 files changed, 100 insertions, 102 deletions

diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index 1ec19960..8cfbdfe7 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -29,7 +29,7 @@ Dovetail works in conjunction with a web portal interface dubbed the 'OVP web po
 users to upload test results to a centralized community repository. This facilitates user
 collaboration, result sharing, self-testing and community reviews. It also serves as a hub for
 new participants to learn about the program and access key resources. The link for this portal
-is at: `OPNFV Verified Program <https://verified.opnfv.org>`_.
+is at: `OPNFV Verified Program <https://nfvi-verified.lfnetworking.org>`_.
 
 Use of the OVP web portal is open to all and only requires a valid Linux Foundation or OpenStack
 ID to login. Users are welcome to use the portal to upload, inspect and share results in a private
@@ -220,17 +220,17 @@ Docker images:
 Documents
 ---------
 
-- `System Preparation Guide <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/systempreparation/index.html>`_
+- `System Preparation Guide <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/systempreparation/index.html>`_
 
-- `User Guide <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/userguide/testing_guide.html>`_
+- `User Guide <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/userguide/testing_guide.html>`_
 
-- `OPV Test Specifications <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/testspecification/index.html>`_
+- `OPV Test Specifications <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/testspecification/index.html>`_
 
-- `Dovetail CLI Reference <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/userguide/cli_reference.html>`_
+- `Dovetail CLI Reference <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/userguide/cli_reference.html>`_
 
-- `OPV Workflow <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/certificationworkflow/index.html>`_
+- `OPV Workflow <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/certificationworkflow/index.html>`_
 
-- `OPV Reviewer Guide <http://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/reviewerguide/index.html>`_
+- `OPV Reviewer Guide <https://docs.opnfv.org/en/stable-fraser/submodules/dovetail/docs/testing/user/reviewerguide/index.html>`_
 
 
 Testing with OPNFV Fraser Installers
@@ -262,7 +262,7 @@ Fraser release:
 Useful Links
 ============
 
- - `OVP Web Portal <https://verified.opnfv.org>`_
+ - `OVP Web Portal <https://nfvi-verified.lfnetworking.org>`_
 
  - `Wiki Project Page <https://wiki.opnfv.org/display/dovetail>`_
 
diff --git a/docs/testing/user/ovpaddendum/exemption-strict-API-validation.rst b/docs/testing/user/ovpaddendum/exemption-strict-API-validation.rst
index c2546b81..7e9cdaa0 100644
--- a/docs/testing/user/ovpaddendum/exemption-strict-API-validation.rst
+++ b/docs/testing/user/ovpaddendum/exemption-strict-API-validation.rst
@@ -175,11 +175,11 @@ responses is as follows:
    to stop issuing exemptions.
 
 
-.. [1] https://review.openstack.org/#/c/156130/
+.. [1] https://review.opendev.org/gitweb?p=openstack%2Ftempest.git;a=commitdiff;h=f0c30bc241e5160e3fe7402e738ea8f56a8b1315
 .. [2] https://github.com/openstack/tempest/tree/master/tempest/lib/api_schema/response/compute
-.. [3] https://developer.openstack.org/api-ref/compute/#show-server-details
+.. [3] https://docs.openstack.org/api-ref/compute/#show-server-details
 .. [4] https://wiki.openstack.org/wiki/Governance/InteropWG
 .. [5] https://www.openstack.org/brand/interop/
 .. [6] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097349.html
-.. [7] https://review.openstack.org/#/c/333067/
-.. [8] https://review.openstack.org/#/c/512447/
+.. [7] https://review.opendev.org/gitweb?p=openstack%2Finterop.git;a=commitdiff;h=c38e18b343505f16a74a97b748362fa7f1a01e57
+.. [8] https://review.opendev.org/gitweb?p=openstack%2Finterop.git;a=commitdiff;h=5748c296a658cf5efebc16ad9d7644ca1125b073
diff --git a/docs/testing/user/reviewerguide/index.rst b/docs/testing/user/reviewerguide/index.rst
index 391f6e3d..374debfb 100644
--- a/docs/testing/user/reviewerguide/index.rst
+++ b/docs/testing/user/reviewerguide/index.rst
@@ -17,7 +17,7 @@ This document provides detailed guidance for reviewers on how to handle the resu
 process.
 
 The OPNFV Verified program (OVP) provides the ability for users to upload test results in
-`OVP portal <https://verified.opnfv.org>`_ and request from OVP community to review them.
+`OVP portal <https://nfvi-verified.lfnetworking.org>`_ and request from OVP community to review them.
 After the user submit for review the test results **Status** is changed from 'private' to 'review'
 (as shown in figure 2).
 
@@ -26,7 +26,7 @@ The incoming results for review will be identified by the administrator with par
 and **Owner** values.
 
 Volunteers that will accept the review request can access the test results by login to the
-`OVP portal <https://verified.opnfv.org>`_ and the click on the **My Results** tab in top-level
+`OVP portal <https://nfvi-verified.lfnetworking.org>`_ and the click on the **My Results** tab in top-level
 navigation bar.
 
 .. image:: images/ovp_top_nav.png
diff --git a/docs/testing/user/testspecification/highavailability/index.rst b/docs/testing/user/testspecification/highavailability/index.rst
index dd98ba94..e489894f 100644
--- a/docs/testing/user/testspecification/highavailability/index.rst
+++ b/docs/testing/user/testspecification/highavailability/index.rst
@@ -31,7 +31,7 @@ This test area references the following specifications:
 
 - ETSI GS NFV-REL 001
 
-  - http://www.etsi.org/deliver/etsi_gs/NFV-REL/001_099/001/01.01.01_60/gs_nfv-rel001v010101p.pdf
+  - https://www.etsi.org/deliver/etsi_gs/NFV-REL/001_099/001/01.01.01_60/gs_nfv-rel001v010101p.pdf
 
 - OpenStack High Availability Guide
 
diff --git a/docs/testing/user/testspecification/security_patrole/index.rst b/docs/testing/user/testspecification/security_patrole/index.rst
index 610b7f0d..3a80ba86 100644
--- a/docs/testing/user/testspecification/security_patrole/index.rst
+++ b/docs/testing/user/testspecification/security_patrole/index.rst
@@ -17,13 +17,12 @@ The test area specifically validates services image and networking.
 References
 ================
 
-- `OpenStack image service API reference <https://developer.openstack.org/api-ref/image/v2/index.html>`_
-- `OpenStack metadata definitions service API reference <https://developer.openstack.org/api-ref/image/v2/metadefs-index.html>`_
-- `OpenStack layer 2 networking service API reference <https://developer.openstack.org/api-ref/network/v2/index.html#layer-2-networking>`_
-- `OpenStack layer 3 networking service API reference <https://developer.openstack.org/api-ref/network/v2/index.html#layer-3-networking>`_
-- `OpenStack network security API reference <https://developer.openstack.org/api-ref/network/v2/index.html#security>`_
-- `OpenStack resource management API reference <https://developer.openstack.org/api-ref/network/v2/index.html#resource-management>`_
-- `OpenStack networking agents API reference <https://developer.openstack.org/api-ref/network/v2/index.html#networking-agents>`_
+- `OpenStack image service API reference <https://docs.openstack.org/api-ref/image/v2/index.html>`_
+- `OpenStack metadata definitions service API reference <https://docs.openstack.org/api-ref/image/v2/metadefs-index.html>`_
+- `OpenStack layer 2 networking service API reference <https://docs.openstack.org/api-ref/network/v2/index.html#layer-2-networking>`_
+- `OpenStack layer 3 networking service API reference <https://docs.openstack.org/api-ref/network/v2/index.html#layer-3-networking>`_
+- `OpenStack network security API reference <https://docs.openstack.org/api-ref/network/v2/index.html#security>`_
+- `OpenStack resource management API reference <https://docs.openstack.org/api-ref/network/v2/index.html#resource-management>`_
 
 
 System Under Test (SUT)
diff --git a/docs/testing/user/testspecification/security_patrole_vxlan_dependent/index.rst b/docs/testing/user/testspecification/security_patrole_vxlan_dependent/index.rst
index 3ff48aa6..646cb8b6 100644
--- a/docs/testing/user/testspecification/security_patrole_vxlan_dependent/index.rst
+++ b/docs/testing/user/testspecification/security_patrole_vxlan_dependent/index.rst
@@ -16,13 +16,12 @@ which depend on vxlan physical networks.
 References
 ================
 
-- `OpenStack image service API reference <https://developer.openstack.org/api-ref/image/v2/index.html>`_
-- `OpenStack metadata definitions service API reference <https://developer.openstack.org/api-ref/image/v2/metadefs-index.html>`_
-- `OpenStack layer 2 networking service API reference <https://developer.openstack.org/api-ref/network/v2/index.html#layer-2-networking>`_
-- `OpenStack layer 3 networking service API reference <https://developer.openstack.org/api-ref/network/v2/index.html#layer-3-networking>`_
-- `OpenStack network security API reference <https://developer.openstack.org/api-ref/network/v2/index.html#security>`_
-- `OpenStack resource management API reference <https://developer.openstack.org/api-ref/network/v2/index.html#resource-management>`_
-- `OpenStack networking agents API reference <https://developer.openstack.org/api-ref/network/v2/index.html#networking-agents>`_
+- `OpenStack image service API reference <https://docs.openstack.org/api-ref/image/v2/index.html>`_
+- `OpenStack metadata definitions service API reference <https://docs.openstack.org/api-ref/image/v2/metadefs-index.html>`_
+- `OpenStack layer 2 networking service API reference <https://docs.openstack.org/api-ref/network/v2/index.html#layer-2-networking>`_
+- `OpenStack layer 3 networking service API reference <https://docs.openstack.org/api-ref/network/v2/index.html#layer-3-networking>`_
+- `OpenStack network security API reference <https://docs.openstack.org/api-ref/network/v2/index.html#security>`_
+- `OpenStack resource management API reference <https://docs.openstack.org/api-ref/network/v2/index.html#resource-management>`_
 
 
 System Under Test (SUT)
diff --git a/docs/testing/user/testspecification/tempest_compute/index.rst b/docs/testing/user/testspecification/tempest_compute/index.rst
index 18a0019a..bd1cace0 100644
--- a/docs/testing/user/testspecification/tempest_compute/index.rst
+++ b/docs/testing/user/testspecification/tempest_compute/index.rst
@@ -29,30 +29,30 @@ These runtime operations includes:
 References
 ==========
 
-`Security Groups: <https://developer.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups>`_
+`Security Groups: <https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups>`_
 
 - create security group
 - delete security group
 
-`Networks: <https://developer.openstack.org/api-ref/networking/v2/index.html#networks>`_
+`Networks: <https://docs.openstack.org/api-ref/network/v2/index.html#networks>`_
 
 - create network
 - delete network
 
-`Routers and interface: <https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers>`_
+`Routers and interface: <https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers>`_
 
 - create router
 - update router
 - delete router
 - add interface to router
 
-`Subnets: <https://developer.openstack.org/api-ref/networking/v2/index.html#subnets>`_
+`Subnets: <https://docs.openstack.org/api-ref/network/v2/index.html#subnets>`_
 
 - create subnet
 - update subnet
 - delete subnet
 
-`Servers: <https://developer.openstack.org/api-ref/compute/>`_
+`Servers: <https://docs.openstack.org/api-ref/compute/>`_
 
 - create keypair
 - create server
@@ -60,13 +60,13 @@ References
 - add/assign floating IP
 - disassociate floating IP
 
-`Ports: <https://developer.openstack.org/api-ref/networking/v2/index.html#ports>`_
+`Ports: <https://docs.openstack.org/api-ref/network/v2/index.html#ports>`_
 
 - create port
 - update port
 - delete port
 
-`Floating IPs: <https://developer.openstack.org/api-ref/networking/v2/index.html#floating-ips-floatingips>`_
+`Floating IPs: <https://docs.openstack.org/api-ref/network/v2/index.html#floating-ips-floatingips>`_
 
 - create floating IP
 - delete floating IP
diff --git a/docs/testing/user/testspecification/tempest_identity_v3/index.rst b/docs/testing/user/testspecification/tempest_identity_v3/index.rst
index df5bdbb6..12e8f308 100644
--- a/docs/testing/user/testspecification/tempest_identity_v3/index.rst
+++ b/docs/testing/user/testspecification/tempest_identity_v3/index.rst
@@ -31,7 +31,7 @@ These runtime operations may include that create, list, verify and delete:
 References
 ==========
 
-`Identity API v3.0 <https://developer.openstack.org/api-ref/identity/v3/index.html>`_
+`Identity API v3.0 <https://docs.openstack.org/api-ref/identity/v3/index.html>`_
 
 System Under Test (SUT)
 =======================
diff --git a/docs/testing/user/testspecification/tempest_image/index.rst b/docs/testing/user/testspecification/tempest_image/index.rst
index da438e52..2b768692 100644
--- a/docs/testing/user/testspecification/tempest_image/index.rst
+++ b/docs/testing/user/testspecification/tempest_image/index.rst
@@ -17,7 +17,7 @@ network runtime operations functionality.
 References
 ==========
 
-`Image Service API v2 <https://developer.openstack.org/api-ref/image/v2/index.html#images>`_
+`Image Service API v2 <https://docs.openstack.org/api-ref/image/v2/index.html>`_
 
 System Under Test (SUT)
 =======================
@@ -39,4 +39,4 @@ OVP test suite.
     - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_register_upload_get_image_file
 
 - `List Versions <https://github.com/openstack/tempest/blob/18.0.0/tempest/api/image/v2/test_versions.py>`_
-    - tempest.api.image.v2.test_versions.VersionsTest.test_list_versions
\ No newline at end of file
+    - tempest.api.image.v2.test_versions.VersionsTest.test_list_versions
diff --git a/docs/testing/user/testspecification/tempest_ipv6/index.rst b/docs/testing/user/testspecification/tempest_ipv6/index.rst
index d78370c8..3da23c99 100644
--- a/docs/testing/user/testspecification/tempest_ipv6/index.rst
+++ b/docs/testing/user/testspecification/tempest_ipv6/index.rst
@@ -23,7 +23,7 @@ References
 
 - upstream openstack API reference
 
-  - http://developer.openstack.org/api-ref
+  - https://docs.openstack.org/api-ref/
 
 - upstream openstack IPv6 reference
 
@@ -68,7 +68,7 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#networks
+Networks: https://docs.openstack.org/api-ref/network/v2/index.html#networks
 
 - show network details
 - update network
@@ -77,7 +77,7 @@ Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#netwo
 - create netowrk
 - bulk create networks
 
-Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnets
+Subnets: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
 
 - list subnets
 - create subnet
@@ -86,7 +86,7 @@ Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnet
 - update subnet
 - delete subnet
 
-Routers and interface: https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers
+Routers and interface: https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers
 
 - list routers
 - create router
@@ -96,7 +96,7 @@ Routers and interface: https://developer.openstack.org/api-ref/networking/v2/ind
 - add interface to router
 - remove interface from router
 
-Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
+Ports: https://docs.openstack.org/api-ref/network/v2/index.html#ports
 
 - show port details
 - update port
@@ -105,7 +105,7 @@ Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
 - create port
 - bulk create ports
 
-Security groups: https://developer.openstack.org/api-ref/networking/v2/index.html#security-groups-security-groups
+Security groups: https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
 
 - list security groups
 - create security groups
@@ -113,14 +113,14 @@ Security groups: https://developer.openstack.org/api-ref/networking/v2/index.htm
 - update security group
 - delete security group
 
-Security groups rules: https://developer.openstack.org/api-ref/networking/v2/index.html#security-group-rules-security-group-rules
+Security groups rules: https://docs.openstack.org/api-ref/network/v2/index.html#security-group-rules-security-group-rules
 
 - list security group rules
 - create security group rule
 - show security group rule
 - delete security group rule
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - list servers
 - create server
diff --git a/docs/testing/user/testspecification/tempest_multi_node_scheduling/index.rst b/docs/testing/user/testspecification/tempest_multi_node_scheduling/index.rst
index 92c7e856..abe4e88e 100644
--- a/docs/testing/user/testspecification/tempest_multi_node_scheduling/index.rst
+++ b/docs/testing/user/testspecification/tempest_multi_node_scheduling/index.rst
@@ -63,28 +63,28 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Security Groups: https://developer.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
+Security Groups: https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
 
 - create security group
 - delete security group
 
-Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#networks
+Networks: https://docs.openstack.org/api-ref/network/v2/index.html#networks
 
 - create network
 - delete network
 
-Routers and interface: https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers
+Routers and interface: https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers
 
 - create router
 - delete router
 - add interface to router
 
-Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnets
+Subnets: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
 
 - create subnet
 - delete subnet
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - create keypair
 - create server
@@ -96,17 +96,17 @@ Servers: https://developer.openstack.org/api-ref/compute/
 - list server groups
 - show server group details
 
-Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
+Ports: https://docs.openstack.org/api-ref/network/v2/index.html#ports
 
 - create port
 - delete port
 
-Floating IPs: https://developer.openstack.org/api-ref/networking/v2/index.html#floating-ips-floatingips
+Floating IPs: https://docs.openstack.org/api-ref/network/v2/index.html#floating-ips-floatingips
 
 - create floating IP
 - delete floating IP
 
-Availability zone: https://developer.openstack.org/api-ref/compute/
+Availability zone: https://docs.openstack.org/api-ref/compute/
 
 - get availability zone
 
diff --git a/docs/testing/user/testspecification/tempest_network_api/index.rst b/docs/testing/user/testspecification/tempest_network_api/index.rst
index ccbe8e0a..31ec6763 100644
--- a/docs/testing/user/testspecification/tempest_network_api/index.rst
+++ b/docs/testing/user/testspecification/tempest_network_api/index.rst
@@ -29,42 +29,42 @@ These runtime operations may include that create, list, verify or delete:
 References
 ==========
 
-`Networks: <https://developer.openstack.org/api-ref/network/v2/#networks>`_
+`Networks: <https://docs.openstack.org/api-ref/network/v2/#networks>`_
 
 - create network
 - delete network
 
-`Routers and interface: <https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers>`_
+`Routers and interface: <https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers>`_
 
 - create router
 - update router
 - delete router
 - add interface to router
 
-`Subnets: <https://developer.openstack.org/api-ref/networking/v2/index.html#subnets>`_
+`Subnets: <https://docs.openstack.org/api-ref/network/v2/index.html#subnets>`_
 
 - create subnet
 - update subnet
 - delete subnet
 
-`Subnetpools: <https://developer.openstack.org/api-ref/network/v2/#subnet-pools-extension-subnetpools>`_
+`Subnetpools: <https://docs.openstack.org/api-ref/network/v2/#subnet-pools-extension-subnetpools>`_
 
 - create subnetpool
 - update subnetpool
 - delete subnetpool
 
-`Ports: <https://developer.openstack.org/api-ref/networking/v2/index.html#ports>`_
+`Ports: <https://docs.openstack.org/api-ref/network/v2/index.html#ports>`_
 
 - create port
 - update port
 - delete port
 
-`Floating IPs: <https://developer.openstack.org/api-ref/networking/v2/index.html#floating-ips-floatingips>`_
+`Floating IPs: <https://docs.openstack.org/api-ref/network/v2/index.html#floating-ips-floatingips>`_
 
 - create floating IP
 - delete floating IP
 
-`Api Versions <https://developer.openstack.org/api-ref/network/v2/#api-versions>`_
+`Api Versions <https://docs.openstack.org/api-ref/network/v2/#api-versions>`_
 
 - list version
 - show version
@@ -127,4 +127,4 @@ OVP test suite.
     - tempest.api.network.test_subnetpools_extensions.SubnetPoolsTestJSON.test_create_list_show_update_delete_subnetpools
 
 `API Version Resources test <https://github.com/openstack/tempest/blob/master/tempest/api/network/test_versions.py>`_
-    - tempest.api.network.test_versions.NetworksApiDiscovery.test_api_version_resources
\ No newline at end of file
+    - tempest.api.network.test_versions.NetworksApiDiscovery.test_api_version_resources
diff --git a/docs/testing/user/testspecification/tempest_network_scenario/index.rst b/docs/testing/user/testspecification/tempest_network_scenario/index.rst
index 6c172474..afefe8c7 100644
--- a/docs/testing/user/testspecification/tempest_network_scenario/index.rst
+++ b/docs/testing/user/testspecification/tempest_network_scenario/index.rst
@@ -68,30 +68,30 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Security Groups: https://developer.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
+Security Groups: https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
 
 - create security group
 - delete security group
 
-Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#networks
+Networks: https://docs.openstack.org/api-ref/network/v2/index.html#networks
 
 - create network
 - delete network
 
-Routers and interface: https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers
+Routers and interface: https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers
 
 - create router
 - update router
 - delete router
 - add interface to router
 
-Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnets
+Subnets: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
 
 - create subnet
 - update subnet
 - delete subnet
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - create keypair
 - create server
@@ -99,13 +99,13 @@ Servers: https://developer.openstack.org/api-ref/compute/
 - add/assign floating IP
 - disassociate floating IP
 
-Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
+Ports: https://docs.openstack.org/api-ref/network/v2/index.html#ports
 
 - create port
 - update port
 - delete port
 
-Floating IPs: https://developer.openstack.org/api-ref/networking/v2/index.html#floating-ips-floatingips
+Floating IPs: https://docs.openstack.org/api-ref/network/v2/index.html#floating-ips-floatingips
 
 - create floating IP
 - delete floating IP
diff --git a/docs/testing/user/testspecification/tempest_network_security/index.rst b/docs/testing/user/testspecification/tempest_network_security/index.rst
index 2a785289..3a28801d 100644
--- a/docs/testing/user/testspecification/tempest_network_security/index.rst
+++ b/docs/testing/user/testspecification/tempest_network_security/index.rst
@@ -63,12 +63,12 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Security Groups: https://developer.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
+Security Groups: https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
 
 - create security group
 - delete security group
 
-Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#networks
+Networks: https://docs.openstack.org/api-ref/network/v2/index.html#networks
 
 - create network
 - delete network
@@ -76,27 +76,27 @@ Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#netwo
 - create floating ip
 - delete floating ip
 
-Routers and interface: https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers
+Routers and interface: https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers
 
 - create router
 - delete router
 - list routers
 - add interface to router
 
-Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnets
+Subnets: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
 
 - create subnet
 - list subnets
 - delete subnet
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - create keypair
 - create server
 - delete server
 - add/assign floating ip
 
-Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
+Ports: https://docs.openstack.org/api-ref/network/v2/index.html#ports
 
 - update port
 - list ports
diff --git a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_compute.rst b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_compute.rst
index 601d1054..63175306 100644
--- a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_compute.rst
+++ b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_compute.rst
@@ -60,7 +60,7 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - create server
 - delete server
@@ -79,7 +79,7 @@ Servers: https://developer.openstack.org/api-ref/compute/
 - create keypair
 - delete keypair
 
-Block storage: https://developer.openstack.org/api-ref/block-storage
+Block storage: https://docs.openstack.org/api-ref/block-storage/
 
 - create volume
 - delete volume
diff --git a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_image.rst b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_image.rst
index 96a98631..c5926b02 100644
--- a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_image.rst
+++ b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_image.rst
@@ -50,7 +50,7 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Images: https://developer.openstack.org/api-ref/image/v2/
+Images: https://docs.openstack.org/api-ref/image/v2/
 
 - create image
 - delete image
diff --git a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_network.rst b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_network.rst
index a21b303c..4e3e5a95 100644
--- a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_network.rst
+++ b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_network.rst
@@ -52,7 +52,7 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Network: http://developer.openstack.org/api-ref/networking/v2/index.html
+Network: https://docs.openstack.org/api-ref/network/v2/index.html
 
 - create network
 - update network
diff --git a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_volume.rst b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_volume.rst
index 097123aa..191427de 100644
--- a/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_volume.rst
+++ b/docs/testing/user/testspecification/tempest_osinterop/tempest_osinterop_volume.rst
@@ -61,7 +61,7 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Block storage: https://developer.openstack.org/api-ref/block-storage
+Block storage: https://docs.openstack.org/api-ref/block-storage/
 
 - create volume
 - delete volume
diff --git a/docs/testing/user/testspecification/tempest_trunk_ports/index.rst b/docs/testing/user/testspecification/tempest_trunk_ports/index.rst
index fd60a32e..76ba9a79 100644
--- a/docs/testing/user/testspecification/tempest_trunk_ports/index.rst
+++ b/docs/testing/user/testspecification/tempest_trunk_ports/index.rst
@@ -17,7 +17,7 @@ operations, by means of both positive and negative tests.
 References
 ================
 
-- `OpenStack API reference <https://developer.openstack.org/api-ref/network/v2/#trunk-networking>`_
+- `OpenStack API reference <https://docs.openstack.org/api-ref/network/v2/#trunk-networking>`_
 
 
 System Under Test (SUT)
diff --git a/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst b/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
index bbfd2884..5618ebf8 100644
--- a/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
+++ b/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
@@ -69,35 +69,35 @@ Test Descriptions
 API Used and Reference
 ----------------------
 
-Block storage: https://developer.openstack.org/api-ref/block-storage
+Block storage: https://docs.openstack.org/api-ref/block-storage/
 
 - create volume
 - delete volume
 - attach volume to server
 - detach volume from server
 
-Security Groups: https://developer.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
+Security Groups: https://docs.openstack.org/api-ref/network/v2/index.html#security-groups-security-groups
 
 - create security group
 - delete security group
 
-Networks: https://developer.openstack.org/api-ref/networking/v2/index.html#networks
+Networks: https://docs.openstack.org/api-ref/network/v2/index.html#networks
 
 - create network
 - delete network
 
-Routers and interface: https://developer.openstack.org/api-ref/networking/v2/index.html#routers-routers
+Routers and interface: https://docs.openstack.org/api-ref/network/v2/index.html#routers-routers
 
 - create router
 - delete router
 - add interface to router
 
-Subnets: https://developer.openstack.org/api-ref/networking/v2/index.html#subnets
+Subnets: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
 
 - create subnet
 - delete subnet
 
-Servers: https://developer.openstack.org/api-ref/compute/
+Servers: https://docs.openstack.org/api-ref/compute/
 
 - create keypair
 - create server
@@ -120,17 +120,17 @@ Servers: https://developer.openstack.org/api-ref/compute/
 - migrate server
 - live-migrate server
 
-Ports: https://developer.openstack.org/api-ref/networking/v2/index.html#ports
+Ports: https://docs.openstack.org/api-ref/network/v2/index.html#ports
 
 - create port
 - delete port
 
-Floating IPs: https://developer.openstack.org/api-ref/networking/v2/index.html#floating-ips-floatingips
+Floating IPs: https://docs.openstack.org/api-ref/network/v2/index.html#floating-ips-floatingips
 
 - create floating IP
 - delete floating IP
 
-Availability zone: https://developer.openstack.org/api-ref/compute/
+Availability zone: https://docs.openstack.org/api-ref/compute/
 
 - get availability zone
 
diff --git a/docs/testing/user/testspecification/vnf/index.rst b/docs/testing/user/testspecification/vnf/index.rst
index a9219982..e53596e9 100644
--- a/docs/testing/user/testspecification/vnf/index.rst
+++ b/docs/testing/user/testspecification/vnf/index.rst
@@ -33,7 +33,7 @@ This test area references the following specifications and guides:
 
 - 3GPP LTE
 
-  - http://www.3gpp.org/technologies/keywords-acronyms/98-lte
+  - https://www.3gpp.org/technologies/keywords-acronyms/98-lte
 
 - ETSI -  TS 24.301
 
diff --git a/docs/testing/user/testspecification/vping/index.rst b/docs/testing/user/testspecification/vping/index.rst
index 666b732f..6ba29a1d 100644
--- a/docs/testing/user/testspecification/vping/index.rst
+++ b/docs/testing/user/testspecification/vping/index.rst
@@ -31,7 +31,7 @@ References
 
 - SCPClient
 
-  - https://pypi.python.org/pypi/scp
+  - https://pypi.org/project/scp/
 
 
 Definitions and abbreviations
diff --git a/dovetail/tests/unit/utils/test_dovetail_utils.py b/dovetail/tests/unit/utils/test_dovetail_utils.py
index d912aa84..2d2cdb0d 100644
--- a/dovetail/tests/unit/utils/test_dovetail_utils.py
+++ b/dovetail/tests/unit/utils/test_dovetail_utils.py
@@ -510,15 +510,12 @@ class DovetailUtilsTesting(unittest.TestCase):
         hosts_obj.add.assert_called_once_with([entry_obj])
         hosts_obj.write.assert_called_once()
 
-    @patch('dovetail.utils.dovetail_utils.objwalk')
-    def test_get_obj_by_path(self, mock_walk):
-        path = dist_path = 'path'
-        obj = 'obj'
-        mock_walk.return_value = [(path, obj)]
-
-        expected = obj
-        result = dovetail_utils.get_obj_by_path(obj, dist_path)
+    def test_get_obj_by_path(self):
+        obj = {'name': 'name', 'validate': {'testcase': 'testcase'}}
+        dst_path = ('name',)
 
+        expected = 'name'
+        result = dovetail_utils.get_obj_by_path(obj, dst_path)
         self.assertEqual(expected, result)
 
     @patch('dovetail.utils.dovetail_utils.objwalk')
diff --git a/tox.ini b/tox.ini
index b8efce64..5c3e7db8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,6 @@ skipsdist = True
 envlist =
     pep8,
     py35,
-    docs,
     docs-linkcheck
 
 [testenv]
@@ -40,14 +39,17 @@ whitelist_externals = wget
                       echo
 
 [testenv:pep8]
+basepython = python3.5
 commands = flake8 {toxinidir}
 
 [flake8]
+basepython = python3.5
 show-source = True
 ignore = E123,E125,H803,E722,W503
 exclude = .tox,dist,docs,*egg,build,.venv,.git
 
 [testenv:docs]
+basepython = python3.6
 deps = -rdocs/requirements.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -55,6 +57,7 @@ commands =
 whitelist_externals = echo
 
 [testenv:docs-linkcheck]
+basepython = python3.5
 deps = -rdocs/requirements.txt
 commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck