Grizzly v2 catalog has slight formatting changes compared to Folsom

[Henry Nash]

Although the contents are semantically the same, there are some slight changes between getting a catalog with Folsom and via the v2 api on Grizzly. I know of one deployment that broke becuase of this. Not sure if we need to fix this or not, but thought I should at least log this issue.

Here are two examples of tokens containing cat logs (changes indicated by [>>>>>This is New]):

Grizzly returns:

<token issued_at="2013-03-19T22:27:19.296303" expires="2013-03-20T22:27:19Z" id="92a18c06e0714d42b2d83a3fef919b3e">
    <tenant id="64794b84abf04f668efc603799d25224" enabled="true" name="admin">
      <description>Service Tenant</description>
    </tenant>
  </token>

    <service type="compute" name="nova">
      <endpoints_links/> [>>>>>This is New]
      <endpoints> [>>>>>This is New]
       <endpoint adminURL="http://9.115.77.242:9973/9447b4ab34a94e70b3cf906bc1a65394/public/v2/64794b84abf04f668efc603799d25224" region="RegionOne" publicURL="http://9.115.77.242:9973/9447b4ab34a94e70b3cf906bc1a65394/public/v2/64794b84abf04f668efc603799d25224" internalURL="http://9.115.77.242:9973/9447b4ab34a94e70b3cf906bc1a65394/public/v2/64794b84abf04f668efc603799d25224" id="99ca3561c6c04c24be1687d5d4a5a3d8"/>
      </endpoints> [>>>>>This is New]
    </service>

Folsom returns:

<token expires="2013-03-20T22:34:02Z" id="36dd9573473640b8a611dbe5c75c7020">
    <tenant id="62967bab43804831add7bb10db7eed54" enabled="true" name="admin">
      <description>Servce Tenant</description>
    </tenant>
  </token>

    <service type="compute" name="nova">
     <endpoint adminURL="http://9.115.77.38:9973/7e0b7ca8500f48f1a0c226490844a329/public/v2/62967bab43804831add7bb10db7eed54" region="RegionOne" publicURL="http://9.115.77.38:9973/7e0b7ca8500f48f1a0c226490844a329/public/v2/62967bab43804831add7bb10db7eed54" internalURL="http://9.115.77.38:9973/7e0b7ca8500f48f1a0c226490844a329/public/v2/62967bab43804831add7bb10db7eed54" id="7e0b7ca8500f48f1a0c226490844a329"/>
    </service>

[Dolph Mathews (dolph)]

This was recently fixed to match spec; need to assess impact & either revert or return two formats

[Dolph Mathews (dolph)]

diffing a folsom response ( http://paste.openstack.org/raw/34678/ ) with a grizzly response ( http://paste.openstack.org/raw/34677/ ), I get:

 <?xml version="1.0" encoding="UTF-8"?>
 <access xmlns="http://docs.openstack.org/identity/api/v2.0">
- <token expires="[datetime with seconds]" id="[uuid]">
+ <token issued_at="[datetime with microsecond and no tz]" expires="[datetime with seconds]" id="[uuid]">
     <tenant id="[uuid]" enabled="true" name="admin"/>
   </token>
   <serviceCatalog>
     <service type="identity" name="Keystone">
- <endpoint adminURL="http://localhost:35357/v2.0/" region="regionOne" publicURL="http://localhost:5000/v2.0/" id="[uuid]"/>
+ <endpoints_links/>
+ <endpoints>
+ <endpoint adminURL="http://localhost:35357/v2.0/" region="regionOne" publicURL="http://localhost:5000/v2.0/" id="[uuid]"/>
+ </endpoints>
     </service>
   </serviceCatalog>
   <user username="admin" id="[uuid]" name="admin">
- <role name="admin"/>
+ <roles_links/>
+ <roles>
+ <role name="admin"/>
+ </roles>
   </user>
   <metadata is_admin="0">
- <role/>
+ <roles>
+ <role>[uuid]</role>
+ </roles>
   </metadata>
 </access>

[Dolph Mathews (dolph)]

If the 'endpoints' container is removed and the 'roles' container is removed, this will be backwards compatible (ignoring the "metadata" element... I'm not sure what that is).

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/25477

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/25544

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/25544
Committed: http://github.com/openstack/keystone/commit/af31ecd6b78132918dbcaddf7d4187a40906db04
Submitter: Jenkins
Branch: milestone-proposed

commit af31ecd6b78132918dbcaddf7d4187a40906db04
Author: Dolph Mathews <email address hidden>
Date: Tue Mar 26 20:30:12 2013 -0500

    Fix test coverage for v2 scoped auth xml response (bug 1160504)

    Change-Id: Ida82b8e607ba940efdad9e764d26408d3aaae7a8

[Thierry Carrez (ttx)]

Dolph: do not approve the milestone-proposed backport until the main patch hits master, it introduces a potential failure case.

[Thierry Carrez (ttx)]

 https://review.openstack.org/25477 still needs to hit master

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/25477
Committed: http://github.com/openstack/keystone/commit/bbc0f1453c436d8898eaa0be975b0482e5d7bf84
Submitter: Jenkins
Branch: master

commit bbc0f1453c436d8898eaa0be975b0482e5d7bf84
Author: Dolph Mathews <email address hidden>
Date: Tue Mar 26 20:30:12 2013 -0500

    Fix test coverage for v2 scoped auth xml response (bug 1160504)

    Change-Id: Ida82b8e607ba940efdad9e764d26408d3aaae7a8