remove models.py

9 files changed, 28 insertions, 59 deletions

diff --git a/keystone/backends/sql/core.py b/keystone/backends/sql/core.py
index c17f9912..b7502531 100644
--- a/keystone/backends/sql/core.py
+++ b/keystone/backends/sql/core.py
@@ -11,7 +11,6 @@ import sqlalchemy.pool
 import sqlalchemy.engine.url
 
 from keystone import config
-from keystone import models
 from keystone.backends.sql import migration
 
 
diff --git a/keystone/logging.py b/keystone/logging.py
index 84e3e66d..7ef07376 100644
--- a/keystone/logging.py
+++ b/keystone/logging.py
@@ -1,3 +1,7 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+"""Wrapper for built-in logging module."""
+
 from __future__ import absolute_import
 
 import functools
diff --git a/keystone/models.py b/keystone/models.py
deleted file mode 100644
index 18402bbd..00000000
--- a/keystone/models.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-class Token(dict):
-  def __init__(self, id=None, user=None, tenant=None, *args, **kw):
-    super(Token, self).__init__(id=id, user=user, tenant=tenant, *args, **kw)
-
-
-class User(dict):
-  def __init__(self, id=None, *args, **kw):
-    super(User, self).__init__(id=id, *args, **kw)
-
-
-class Tenant(dict):
-  def __init__(self, id=None, *args, **kw):
-    super(Tenant, self).__init__(id=id, *args, **kw)
-
-
-class Role(dict):
-  def __init__(self, id=None, *args, **kw):
-    super(Role, self).__init__(id=id, *args, **kw)
-
-
-class Metadata(dict):
-  def __init__(self, user_id=None, tenant_id=None, *args, **kw):
-    super(Metadata, self).__init__(user_id=user_id,
-                                   tenant_id=tenant_id,
-                                   *args,
-                                   **kw)
diff --git a/keystone/service.py b/keystone/service.py
index dc666dc6..b66fafb9 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -1,6 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# this is the web public frontend that emulates keystone
 import json
 import urllib
 import urlparse
diff --git a/keystone/test.py b/keystone/test.py
index 6b100d77..2288e5fa 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -10,7 +10,6 @@ from keystone import catalog
 from keystone import config
 from keystone import identity
 from keystone import logging
-from keystone import models
 from keystone import token
 from keystone import utils
 from keystone import wsgi
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index a5a67ff2..85b9fef6 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -1,6 +1,5 @@
 import uuid
 
-from keystone import models
 from keystone import test
 from keystone.backends import kvs
 
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index 24cb4a81..faaa3b21 100644
--- a/tests/test_backend_sql.py
+++ b/tests/test_backend_sql.py
@@ -2,7 +2,6 @@ import os
 import uuid
 
 from keystone import config
-from keystone import models
 from keystone import test
 from keystone.backends import sql
 from keystone.backends.sql import util as sql_util
diff --git a/tests/test_legacy_compat.py b/tests/test_legacy_compat.py
index fef2b8a4..fca00b68 100644
--- a/tests/test_legacy_compat.py
+++ b/tests/test_legacy_compat.py
@@ -7,7 +7,6 @@ from nose import exc
 
 from keystone import config
 from keystone import logging
-from keystone import models
 from keystone import test
 from keystone import utils
 
@@ -52,13 +51,13 @@ class CompatTestCase(test.TestCase):
     # validate_token call
     self.tenant_345 = self.identity_api.create_tenant(
         '345',
-        models.Tenant(id='345', name='My Project'))
+        dict(id='345', name='My Project'))
     self.user_123 = self.identity_api.create_user(
         '123',
-        models.User(id='123',
-                    name='jqsmith',
-                    tenants=[self.tenant_345['id']],
-                    password='password'))
+        dict(id='123',
+             name='jqsmith',
+             tenants=[self.tenant_345['id']],
+             password='password'))
     self.metadata_123 = self.identity_api.create_metadata(
         self.user_123['id'], self.tenant_345['id'],
         dict(roles=[{'id': '234',
@@ -69,11 +68,11 @@ class CompatTestCase(test.TestCase):
              roles_links=[]))
     self.token_123 = self.token_api.create_token(
         'ab48a9efdfedb23ty3494',
-        models.Token(id='ab48a9efdfedb23ty3494',
-                     expires='2010-11-01T03:32:15-05:00',
-                     user=self.user_123,
-                     tenant=self.tenant_345,
-                     metadata=self.metadata_123))
+        dict(id='ab48a9efdfedb23ty3494',
+             expires='2010-11-01T03:32:15-05:00',
+             user=self.user_123,
+             tenant=self.tenant_345,
+             metadata=self.metadata_123))
 
     # auth call
     # NOTE(termie): the service catalog in the sample doesn't really have
@@ -90,29 +89,29 @@ class CompatTestCase(test.TestCase):
     # tenants_for_token call
     self.user_foo = self.identity_api.create_user(
         'foo',
-        models.User(id='foo', name='FOO', tenants=['1234', '3456']))
+        dict(id='foo', name='FOO', tenants=['1234', '3456']))
     self.tenant_1234 = self.identity_api.create_tenant(
         '1234',
-        models.Tenant(id='1234',
-                      name='ACME Corp',
-                      description='A description ...',
-                      enabled=True))
+        dict(id='1234',
+             name='ACME Corp',
+             description='A description ...',
+             enabled=True))
     self.tenant_3456 = self.identity_api.create_tenant(
         '3456',
-        models.Tenant(id='3456',
-                      name='Iron Works',
-                      description='A description ...',
-                      enabled=True))
+        dict(id='3456',
+             name='Iron Works',
+             description='A description ...',
+             enabled=True))
 
     self.token_foo_unscoped = self.token_api.create_token(
         'foo_unscoped',
-        models.Token(id='foo_unscoped',
-                     user=self.user_foo))
+        dict(id='foo_unscoped',
+             user=self.user_foo))
     self.token_foo_scoped = self.token_api.create_token(
         'foo_scoped',
-        models.Token(id='foo_scoped',
-                     user=self.user_foo,
-                     tenant=self.tenant_1234))
+        dict(id='foo_scoped',
+             user=self.user_foo,
+             tenant=self.tenant_1234))
 
 
 class DiabloCompatTestCase(CompatTestCase):
diff --git a/tests/test_novaclient_compat.py b/tests/test_novaclient_compat.py
index 8aa6e344..203fa939 100644
--- a/tests/test_novaclient_compat.py
+++ b/tests/test_novaclient_compat.py
@@ -5,7 +5,6 @@ import sys
 
 from keystone import config
 from keystone import logging
-from keystone import models
 from keystone import test
 from keystone import utils