rename extras to metadata

5 files changed, 26 insertions, 26 deletions

diff --git a/tests/default_fixtures.py b/tests/default_fixtures.py
index 0e24d750..786becd1 100644
--- a/tests/default_fixtures.py
+++ b/tests/default_fixtures.py
@@ -7,7 +7,7 @@ USERS = [
     {'id': 'foo', 'name': 'FOO', 'password': 'foo2', 'tenants': ['bar',]},
     ]
 
-EXTRAS = [
+METADATA = [
     {'user_id': 'foo', 'tenant_id': 'bar', 'extra': 'extra'},
     ]
 
diff --git a/tests/test_backend.py b/tests/test_backend.py
index 31c37a2f..1d4edd5b 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -21,21 +21,21 @@ class IdentityTests(object):
         password=self.user_foo['password'])
 
   def test_authenticate_no_tenant(self):
-    user_ref, tenant_ref, extras_ref = self.identity_api.authenticate(
+    user_ref, tenant_ref, metadata_ref = self.identity_api.authenticate(
         user_id=self.user_foo['id'],
         password=self.user_foo['password'])
     self.assertDictEquals(user_ref, self.user_foo)
     self.assert_(tenant_ref is None)
-    self.assert_(not extras_ref)
+    self.assert_(not metadata_ref)
 
   def test_authenticate(self):
-    user_ref, tenant_ref, extras_ref = self.identity_api.authenticate(
+    user_ref, tenant_ref, metadata_ref = self.identity_api.authenticate(
         user_id=self.user_foo['id'],
         tenant_id=self.tenant_bar['id'],
         password=self.user_foo['password'])
     self.assertDictEquals(user_ref, self.user_foo)
     self.assertDictEquals(tenant_ref, self.tenant_bar)
-    self.assertDictEquals(extras_ref, self.extras_foobar)
+    self.assertDictEquals(metadata_ref, self.metadata_foobar)
 
   def test_get_tenant_bad_tenant(self):
     tenant_ref = self.identity_api.get_tenant(
@@ -65,23 +65,23 @@ class IdentityTests(object):
     user_ref = self.identity_api.get_user(user_id=self.user_foo['id'])
     self.assertDictEquals(user_ref, self.user_foo)
 
-  def test_get_extras_bad_user(self):
-    extras_ref = self.identity_api.get_extras(
+  def test_get_metadata_bad_user(self):
+    metadata_ref = self.identity_api.get_metadata(
         user_id=self.user_foo['id'] + 'WRONG',
         tenant_id=self.tenant_bar['id'])
-    self.assert_(extras_ref is None)
+    self.assert_(metadata_ref is None)
 
-  def test_get_extras_bad_tenant(self):
-    extras_ref = self.identity_api.get_extras(
+  def test_get_metadata_bad_tenant(self):
+    metadata_ref = self.identity_api.get_metadata(
         user_id=self.user_foo['id'],
         tenant_id=self.tenant_bar['id'] + 'WRONG')
-    self.assert_(extras_ref is None)
+    self.assert_(metadata_ref is None)
 
-  def test_get_extras(self):
-    extras_ref = self.identity_api.get_extras(
+  def test_get_metadata(self):
+    metadata_ref = self.identity_api.get_metadata(
         user_id=self.user_foo['id'],
         tenant_id=self.tenant_bar['id'])
-    self.assertDictEquals(extras_ref, self.extras_foobar)
+    self.assertDictEquals(metadata_ref, self.metadata_foobar)
 
   def test_get_role(self):
     role_ref = self.identity_api.get_role(
diff --git a/tests/test_identity_api.py b/tests/test_identity_api.py
index ef13ab14..50d813cf 100644
--- a/tests/test_identity_api.py
+++ b/tests/test_identity_api.py
@@ -38,7 +38,7 @@ class IdentityApi(test.TestCase):
     data = json.loads(resp.body)
     self.assertEquals(self.user_foo['id'], data['user']['id'])
     self.assertEquals(self.tenant_bar['id'], data['tenant']['id'])
-    self.assertDictEquals(self.extras_foobar, data['extras'])
+    self.assertDictEquals(self.metadata_foobar, data['metadata'])
 
   def test_authenticate_no_tenant(self):
     c = client.TestClient(self.app)
@@ -48,7 +48,7 @@ class IdentityApi(test.TestCase):
     data = json.loads(resp.body)
     self.assertEquals(self.user_foo['id'], data['user']['id'])
     self.assertEquals(None, data['tenant'])
-    self.assertEquals({}, data['extras'])
+    self.assertEquals({}, data['metadata'])
 
   def test_get_tenants(self):
     token = self._login()
@@ -131,32 +131,32 @@ class IdentityApi(test.TestCase):
     # TODO(termie): we should probably return not founds instead of None
     #self.assertEquals(delget_resp.status, '404 Not Found')
 
-  def test_crud_extras(self):
+  def test_crud_metadata(self):
     token_id = CONF.admin_token
     user_id = 'foo'
     tenant_id = 'bar'
     c = client.TestClient(self.app, token=token_id)
-    extras_ref = dict(baz='qaz')
-    resp = c.create_extras(user_id=user_id, tenant_id=tenant_id, **extras_ref)
+    metadata_ref = dict(baz='qaz')
+    resp = c.create_metadata(user_id=user_id, tenant_id=tenant_id, **metadata_ref)
     data = json.loads(resp.body)
     self.assertEquals(data['baz'], 'qaz')
 
-    get_resp = c.get_extras(user_id=user_id, tenant_id=tenant_id)
+    get_resp = c.get_metadata(user_id=user_id, tenant_id=tenant_id)
     get_data = json.loads(get_resp.body)
 
     self.assertDictEquals(data, get_data)
 
-    update_resp = c.update_extras(user_id=user_id,
+    update_resp = c.update_metadata(user_id=user_id,
                                   tenant_id=tenant_id,
                                   baz='WAZ')
     update_data = json.loads(update_resp.body)
 
     self.assertEquals('WAZ', update_data['baz'])
 
-    del_resp = c.delete_extras(user_id=user_id, tenant_id=tenant_id)
+    del_resp = c.delete_metadata(user_id=user_id, tenant_id=tenant_id)
     self.assertEquals(del_resp.body, '')
 
-    delget_resp = c.get_extras(user_id=user_id, tenant_id=tenant_id)
+    delget_resp = c.get_metadata(user_id=user_id, tenant_id=tenant_id)
     self.assertEquals(delget_resp.body, '')
     # TODO(termie): we should probably return not founds instead of None
     #self.assertEquals(delget_resp.status, '404 Not Found')
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 3da7a77f..fb464153 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -57,7 +57,7 @@ class KcMasterTestCase(CompatTestCase):
         #               is all working
         # TODO(termie): add an admin user to the fixtures and use that user
         # override the fixtures, for now
-        self.extras_foobar = self.identity_api.update_extras(
+        self.metadata_foobar = self.identity_api.update_metadata(
             self.user_foo['id'], self.tenant_bar['id'],
             dict(roles=['keystone_admin'], is_admin='1'))
 
diff --git a/tests/test_legacy_compat.py b/tests/test_legacy_compat.py
index 1525acaa..ae79a918 100644
--- a/tests/test_legacy_compat.py
+++ b/tests/test_legacy_compat.py
@@ -59,7 +59,7 @@ class CompatTestCase(test.TestCase):
                     name='jqsmith',
                     tenants=[self.tenant_345['id']],
                     password='password'))
-    self.extras_123 = self.identity_api.create_extras(
+    self.metadata_123 = self.identity_api.create_metadata(
         self.user_123['id'], self.tenant_345['id'],
         dict(roles=[{'id': '234',
                      'name': 'compute:admin'},
@@ -73,7 +73,7 @@ class CompatTestCase(test.TestCase):
                      expires='2010-11-01T03:32:15-05:00',
                      user=self.user_123,
                      tenant=self.tenant_345,
-                     extras=self.extras_123))
+                     metadata=self.metadata_123))
 
     # auth call
     # NOTE(termie): the service catalog in the sample doesn't really have