From 646100b2cbef641ce04627ef397bbce3ad63a128 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 7 May 2014 20:30:19 +0200
Subject: [PATCH] Fix version links to docs.openstack.org

Remove PDF link.
Replace deep html links with links to the docs.openstack.org site.

Change-Id: Ic7c2218bf43a221e8d753a910fdfb2243851214d
Closes-Bug: #1313127
---
 doc/source/api_curl_examples.rst | 12 +-----------
 keystone/controllers.py          |  9 +--------
 keystone/tests/test_versions.py  | 26 ++++++--------------------
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/doc/source/api_curl_examples.rst b/doc/source/api_curl_examples.rst
index e2b2d8ca54..ee3a9452fc 100644
--- a/doc/source/api_curl_examples.rst
+++ b/doc/source/api_curl_examples.rst
@@ -101,18 +101,8 @@ Returns::
                 {
                     "rel":"describedby",
                     "type":"text/html",
-                    "href":"http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
+                    "href":"http://docs.openstack.org/"
                 },
-                {
-                    "rel":"describedby",
-                    "type":"application/pdf",
-                    "href":"http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf"
-                },
-                {
-                    "rel":"describedby",
-                    "type":"application/vnd.sun.wadl+xml",
-                    "href":"http://127.0.0.1:35357/v2.0/identity-admin.wadl"
-                }
             ],
             "media-types":[
                 {
diff --git a/keystone/controllers.py b/keystone/controllers.py
index 42ba7493f5..6f9f631e08 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.py
@@ -89,14 +89,7 @@ class Version(wsgi.Application):
                     }, {
                         'rel': 'describedby',
                         'type': 'text/html',
-                        'href': 'http://docs.openstack.org/api/openstack-'
-                                'identity-service/2.0/content/'
-                    }, {
-                        'rel': 'describedby',
-                        'type': 'application/pdf',
-                        'href': 'http://docs.openstack.org/api/openstack-'
-                                'identity-service/2.0/identity-dev-guide-'
-                                '2.0.pdf'
+                        'href': 'http://docs.openstack.org/'
                     }
                 ],
                 'media-types': [
diff --git a/keystone/tests/test_versions.py b/keystone/tests/test_versions.py
index b73bfceafb..76d9832c4d 100644
--- a/keystone/tests/test_versions.py
+++ b/keystone/tests/test_versions.py
@@ -41,18 +41,9 @@ v2_MEDIA_TYPES = [
 v2_HTML_DESCRIPTION = {
     "rel": "describedby",
     "type": "text/html",
-    "href": "http://docs.openstack.org/api/"
-            "openstack-identity-service/2.0/"
-            "content/"
+    "href": "http://docs.openstack.org/"
 }
 
-v2_PDF_DESCRIPTION = {
-    "rel": "describedby",
-    "type": "application/pdf",
-    "href": "http://docs.openstack.org/api/"
-            "openstack-identity-service/2.0/"
-            "identity-dev-guide-2.0.pdf"
-}
 
 v2_EXPECTED_RESPONSE = {
     "id": "v2.0",
@@ -63,8 +54,7 @@ v2_EXPECTED_RESPONSE = {
             "rel": "self",
             "href": "",     # Will get filled in after initialization
         },
-        v2_HTML_DESCRIPTION,
-        v2_PDF_DESCRIPTION
+        v2_HTML_DESCRIPTION
     ],
     "media-types": v2_MEDIA_TYPES
 }
@@ -326,16 +316,12 @@ vnd.openstack.identity-v2.0+xml"/>
   </media-types>
   <links>
     <link href="http://localhost:%%(port)s/v2.0/" rel="self"/>
-    <link href="http://docs.openstack.org/api/openstack-identity-service/\
-2.0/content/" type="text/html" rel="describedby"/>
-    <link href="http://docs.openstack.org/api/openstack-identity-service/\
-2.0/identity-dev-guide-2.0.pdf" type="application/pdf" rel="describedby"/>
+    <link href="http://docs.openstack.org/" type="text/html" \
+rel="describedby"/>
   </links>
   <link href="http://localhost:%%(port)s/v2.0/" rel="self"/>
-  <link href="http://docs.openstack.org/api/openstack-identity-service/\
-2.0/content/" type="text/html" rel="describedby"/>
-  <link href="http://docs.openstack.org/api/openstack-identity-service/\
-2.0/identity-dev-guide-2.0.pdf" type="application/pdf" rel="describedby"/>
+  <link href="http://docs.openstack.org/" type="text/html" \
+rel="describedby"/>
 </version>
 """