Merge "Optimize the link address"

setup.py

@@ -18,7 +18,7 @@ import setuptools
 
 # In python < 2.7.4, a lazy loading of package `pbr` will break
 # setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
+# solution from: https://bugs.python.org/issue15881#msg170215
 try:
     import multiprocessing  # noqa
 except ImportError:

specs/container-interactive-mode.rst

@@ -37,7 +37,7 @@ feasible way.
 https://github.com/kubernetes/kubernetes/pull/3763
 
 For Kubectl interactive description, go to:
-http://kubernetes.io/docs/user-guide/kubectl/kubectl_run/
+https://kubernetes.io/docs/user-guide/kubectl/kubectl_run/
 
 Proposed change
 ===============

specs/zun-api-validation.rst

@@ -161,12 +161,12 @@ References
 
 Useful Links:
 
-* [Understanding JSON Schema] (http://spacetelescope.github.io/understanding-json-schema/reference/object.html)
+* [Understanding JSON Schema] (https://spacetelescope.github.io/understanding-json-schema/reference/object.html)
 
 * [Nova Validation Examples] (https://git.openstack.org/cgit/openstack/nova/tree/nova/api/validation)
 
 * [JSON Schema on PyPI] (https://pypi.python.org/pypi/jsonschema)
 
-* [JSON Schema core definitions and terminology] (http://tools.ietf.org/html/draft-zyp-json-schema-04)
+* [JSON Schema core definitions and terminology] (https://tools.ietf.org/html/draft-zyp-json-schema-04)
 
 * [JSON Schema Documentation] (http://json-schema.org/documentation.html)

zun/api/app.wsgi

@@ -11,7 +11,7 @@
 # under the License.
 
 """Use this file for deploying the API under mod_wsgi.
-See http://pecan.readthedocs.org/en/latest/deployment.html for details.
+See https://pecan.readthedocs.org/en/latest/deployment.html for details.
 """
 
 import sys

zun/api/controllers/v1/__init__.py

@@ -73,7 +73,7 @@ class V1(controllers_base.APIBase):
         v1.links = [link.make_link('self', pecan.request.host_url,
                                    'v1', '', bookmark=True),
                     link.make_link('describedby',
-                                   'http://docs.openstack.org',
+                                   'https://docs.openstack.org',
                                    'developer/zun/dev',
                                    'api-spec-v1.html',
                                    bookmark=True, type='text/html')]

zun/api/http_error.py

@@ -54,7 +54,7 @@ class HTTPNotAcceptableAPIVersion(exc.HTTPNotAcceptable):
             except ValueError:
                 pass
 
-            links = {'rel': 'help', 'href': 'http://developer.openstack.org'
+            links = {'rel': 'help', 'href': 'https://developer.openstack.org'
                      '/api-guide/compute/microversions.html'}
 
             err['max_version'] = self.max_version

zun/common/i18n.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 # It's based on oslo.i18n usage in OpenStack Keystone project and
-# recommendations from http://docs.openstack.org/developer/oslo.i18n/usage.html
+# recommendations from
+# https://docs.openstack.org/developer/oslo.i18n/usage.html
 
 import oslo_i18n
 

zun/common/policy.py

@@ -48,7 +48,7 @@ def init(policy_file=None, rules=None,
     """
     global _ENFORCER
     if not _ENFORCER:
-        # http://docs.openstack.org/developer/oslo.policy/usage.html
+        # https://docs.openstack.org/developer/oslo.policy/usage.html
         _ENFORCER = policy.Enforcer(CONF,
                                     policy_file=policy_file,
                                     rules=rules,

zun/common/utils.py

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 # It's based on oslo.i18n usage in OpenStack Keystone project and
-# recommendations from http://docs.openstack.org/developer/oslo.i18n/usage.html
+# recommendations from
+# https://docs.openstack.org/developer/oslo.i18n/usage.html
 
 """Utilities and helper functions."""
 import eventlet

zun/tests/unit/api/controllers/test_root.py

@@ -44,7 +44,7 @@ class TestRootController(api_base.FunctionalTest):
             u'links': [{u'href': u'http://localhost/v1/',
                         u'rel': u'self'},
                        {u'href':
-                        u'http://docs.openstack.org/developer'
+                        u'https://docs.openstack.org/developer'
                         '/zun/dev/api-spec-v1.html',
                         u'type': u'text/html', u'rel': u'describedby'}],
             u'services': [{u'href': u'http://localhost/v1/services/',

zun/tests/unit/objects/test_objects.py

@@ -352,7 +352,7 @@ class TestObject(test_base.TestCase, _TestObject):
 # object (fields and remotable methods). If either the version or hash
 # change, the static tree needs to be updated.
 # For more information on object version testing, read
-# http://docs.openstack.org/developer/zun/objects.html
+# https://docs.openstack.org/developer/zun/objects.html
 object_data = {
     'Container': '1.17-dd8ca54832bf3a0ff78249a5a0ab4143',
     'Image': '1.0-0b976be24f4f6ee0d526e5c981ce0633',
@@ -380,7 +380,7 @@ class TestObjectVersions(test_base.TestCase):
                          "changed. Make sure the versions of the objects has "
                          "been bumped, and update the hashes in the static "
                          "fingerprints tree (object_data). For more "
-                         "information, read http://docs.openstack.org/"
+                         "information, read https://docs.openstack.org/"
                          "developer/zun/objects.html.")
 
 

zun/websocket/websocketproxy.py

@@ -180,7 +180,7 @@ class ZunProxyRequestHandlerBase(object):
         parse = urlparse.urlparse(self.path)
         if parse.scheme not in ('http', 'https'):
             # From a bug in urlparse in Python < 2.7.4 we cannot support
-            # special schemes (cf: http://bugs.python.org/issue9374)
+            # special schemes (cf: https://bugs.python.org/issue9374)
             if sys.version_info < (2, 7, 4):
                 raise exception.ZunException(
                     _("We do not support scheme '%s' under Python < 2.7.4, "