From aaef563abd6e50e78056c9548946272d9e94181e Mon Sep 17 00:00:00 2001
From: Joe Savak <joe.savak@rackspace.com>
Date: Thu, 18 Aug 2011 10:40:34 -0500
Subject: Sample changes to support v2.0 api

Change-Id: I98a078e4e917d519b4f72d0f4d3f7a2c981e3f36
---
 keystone/content/common/samples/RAX-GRP-group.json  |  6 ++++++
 keystone/content/common/samples/RAX-GRP-group.xml   |  4 ++++
 keystone/content/common/samples/RAX-GRP-groups.json | 11 +++++++++++
 keystone/content/common/samples/RAX-GRP-groups.xml  |  5 +++++
 keystone/content/common/samples/roleRef.json        |  7 -------
 keystone/content/common/samples/roleRef.xml         |  4 ----
 keystone/content/common/samples/roleRefs.json       | 13 -------------
 keystone/content/common/samples/roleRefs.xml        |  9 ---------
 8 files changed, 26 insertions(+), 33 deletions(-)
 create mode 100644 keystone/content/common/samples/RAX-GRP-group.json
 create mode 100644 keystone/content/common/samples/RAX-GRP-group.xml
 create mode 100644 keystone/content/common/samples/RAX-GRP-groups.json
 create mode 100644 keystone/content/common/samples/RAX-GRP-groups.xml
 delete mode 100644 keystone/content/common/samples/roleRef.json
 delete mode 100644 keystone/content/common/samples/roleRef.xml
 delete mode 100644 keystone/content/common/samples/roleRefs.json
 delete mode 100644 keystone/content/common/samples/roleRefs.xml

diff --git a/keystone/content/common/samples/RAX-GRP-group.json b/keystone/content/common/samples/RAX-GRP-group.json
new file mode 100644
index 00000000..0ec60c60
--- /dev/null
+++ b/keystone/content/common/samples/RAX-GRP-group.json
@@ -0,0 +1,6 @@
+{
+  "group": {
+    "id": "test_global_group",
+    "description": "A description ..."
+  }
+}
diff --git a/keystone/content/common/samples/RAX-GRP-group.xml b/keystone/content/common/samples/RAX-GRP-group.xml
new file mode 100644
index 00000000..0f285307
--- /dev/null
+++ b/keystone/content/common/samples/RAX-GRP-group.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<group xmlns="http://docs.openstack.org/identity/api/v2.0" id="test group">
+    <description>A Description of the group</description>
+</group>
diff --git a/keystone/content/common/samples/RAX-GRP-groups.json b/keystone/content/common/samples/RAX-GRP-groups.json
new file mode 100644
index 00000000..a85ed112
--- /dev/null
+++ b/keystone/content/common/samples/RAX-GRP-groups.json
@@ -0,0 +1,11 @@
+{
+  "groups": {
+    "values": [
+      {
+        "id": "test_global_group_add",
+        "description": "A description ..."
+      }
+    ],
+    "links": []
+  }
+}
diff --git a/keystone/content/common/samples/RAX-GRP-groups.xml b/keystone/content/common/samples/RAX-GRP-groups.xml
new file mode 100644
index 00000000..a429fdb3
--- /dev/null
+++ b/keystone/content/common/samples/RAX-GRP-groups.xml
@@ -0,0 +1,5 @@
+<groups xmlns="http://docs.openstack.org/identity/api/v2.0">
+    <group xmlns="http://docs.openstack.org/identity/api/v2.0" id="test_global_group_add">
+        <description>A Description of the group</description>
+    </group>
+</groups>
diff --git a/keystone/content/common/samples/roleRef.json b/keystone/content/common/samples/roleRef.json
deleted file mode 100644
index 92bd57aa..00000000
--- a/keystone/content/common/samples/roleRef.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "roleRef": {
-    "id": 1,
-    "roleId": "admin",
-    "tenantId": "one"
-  }
-}
diff --git a/keystone/content/common/samples/roleRef.xml b/keystone/content/common/samples/roleRef.xml
deleted file mode 100644
index 29115ee2..00000000
--- a/keystone/content/common/samples/roleRef.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-            id="1" roleId="Admin" tenantId="tenantId"/>
diff --git a/keystone/content/common/samples/roleRefs.json b/keystone/content/common/samples/roleRefs.json
deleted file mode 100644
index 29e7f330..00000000
--- a/keystone/content/common/samples/roleRefs.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "roleRefs": [
-    {
-      "id": 1,
-      "roleId": "admin",
-      "tenantId": "one"
-    }, {
-      "id": 2,
-      "roleId": "test",
-      "tenantId": "two"
-    }
-  ]
-}
diff --git a/keystone/content/common/samples/roleRefs.xml b/keystone/content/common/samples/roleRefs.xml
deleted file mode 100644
index bd7ee983..00000000
--- a/keystone/content/common/samples/roleRefs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<roleRefs
-    xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                roleId="admin" id="3" tenantId="tenantId"/>
-    <roleRef xmlns="http://docs.openstack.org/identity/api/v2.0"
-                roleId="test" id="4" tenantId="tenantId"/>
-</roleRefs>                
-- 
cgit 


From b8386945a5f2018e2ce41f746e7e008f60cdc900 Mon Sep 17 00:00:00 2001
From: Joe Savak <joe.savak@rackspace.com>
Date: Thu, 18 Aug 2011 10:40:56 -0500
Subject: Sample changes to support v2.0 api

Change-Id: I6604ea0ee4b3d22134b7495afe40da65b7b60845
---
 keystone/content/common/samples/group.json  |  6 ------
 keystone/content/common/samples/group.xml   |  4 ----
 keystone/content/common/samples/groups.json | 11 -----------
 keystone/content/common/samples/groups.xml  |  5 -----
 4 files changed, 26 deletions(-)
 delete mode 100644 keystone/content/common/samples/group.json
 delete mode 100644 keystone/content/common/samples/group.xml
 delete mode 100644 keystone/content/common/samples/groups.json
 delete mode 100644 keystone/content/common/samples/groups.xml

diff --git a/keystone/content/common/samples/group.json b/keystone/content/common/samples/group.json
deleted file mode 100644
index 0ec60c60..00000000
--- a/keystone/content/common/samples/group.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "group": {
-    "id": "test_global_group",
-    "description": "A description ..."
-  }
-}
diff --git a/keystone/content/common/samples/group.xml b/keystone/content/common/samples/group.xml
deleted file mode 100644
index 0f285307..00000000
--- a/keystone/content/common/samples/group.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<group xmlns="http://docs.openstack.org/identity/api/v2.0" id="test group">
-    <description>A Description of the group</description>
-</group>
diff --git a/keystone/content/common/samples/groups.json b/keystone/content/common/samples/groups.json
deleted file mode 100644
index a85ed112..00000000
--- a/keystone/content/common/samples/groups.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "groups": {
-    "values": [
-      {
-        "id": "test_global_group_add",
-        "description": "A description ..."
-      }
-    ],
-    "links": []
-  }
-}
diff --git a/keystone/content/common/samples/groups.xml b/keystone/content/common/samples/groups.xml
deleted file mode 100644
index a429fdb3..00000000
--- a/keystone/content/common/samples/groups.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<groups xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <group xmlns="http://docs.openstack.org/identity/api/v2.0" id="test_global_group_add">
-        <description>A Description of the group</description>
-    </group>
-</groups>
-- 
cgit