add novaclient, intermediate

run_tests.py

@@ -340,7 +340,9 @@ if __name__ == '__main__':
     argv = []
     for x in sys.argv:
         if x.startswith('test_'):
-            argv.append('tests.%s' % x)
+            pass
+            #argv.append('tests.%s' % x)
+            argv.append(x)
         elif x.startswith('--hide-elapsed'):
             show_elapsed = False
         else:

tests/test_keystoneclient_compat.py

@@ -70,6 +70,7 @@ class MasterCompatTestCase(CompatTestCase):
 
     port = self.server.socket_info['socket'][1]
     self.options['public_port'] = port
+    # NOTE(termie): novaclient wants a "/" at the end, keystoneclient does not
     client = ks_client.Client(auth_url="http://localhost:%s/v2.0" % port,
                               username='foo',
                               password='foo',

tests/test_novaclient_compat.py

@@ -0,0 +1,75 @@
+import copy
+import json
+import os
+import sys
+
+from keystonelight import logging
+from keystonelight import models
+from keystonelight import test
+from keystonelight import utils
+
+
+KEYSTONECLIENT_REPO = 'git://github.com/rackspace/python-novaclient.git'
+
+
+class CompatTestCase(test.TestCase):
+  def setUp(self):
+    super(CompatTestCase, self).setUp()
+
+
+class MasterCompatTestCase(CompatTestCase):
+  def setUp(self):
+    super(MasterCompatTestCase, self).setUp()
+
+    revdir = test.checkout_vendor(KEYSTONECLIENT_REPO, 'master')
+    self.add_path(revdir)
+    from novaclient.keystone import client as ks_client
+    from novaclient import client as base_client
+    reload(ks_client)
+    reload(base_client)
+
+    self.app = self.loadapp('keystoneclient_compat_master')
+    self.options = self.appconfig('keystoneclient_compat_master')
+
+    self.identity_backend = utils.import_object(
+        self.options['identity_driver'], options=self.options)
+    self.token_backend = utils.import_object(
+        self.options['token_driver'], options=self.options)
+    self.catalog_backend = utils.import_object(
+        self.options['catalog_driver'], options=self.options)
+
+    self.server = self.serveapp('keystoneclient_compat_master')
+
+    self.tenant_bar = self.identity_backend._create_tenant(
+        'bar',
+        models.Tenant(id='bar', name='BAR'))
+
+    self.user_foo = self.identity_backend._create_user(
+        'foo',
+        models.User(id='foo',
+                    name='FOO',
+                    tenants=[self.tenant_bar['id']],
+                    password='foo'))
+
+    self.extras_bar_foo = self.identity_backend._create_extras(
+        self.user_foo['id'], self.tenant_bar['id'],
+        dict(roles=[],
+             roles_links=[]))
+
+
+  def test_authenticate_and_tenants(self):
+    from novaclient.keystone import client as ks_client
+    from novaclient import client as base_client
+
+    port = self.server.socket_info['socket'][1]
+    self.options['public_port'] = port
+
+    # NOTE(termie): novaclient wants a "/" at the end, keystoneclient does not
+    conn = base_client.HTTPClient(auth_url="http://localhost:%s/v2.0/" % port,
+                                  user='foo',
+                                  apikey='foo',
+                                  projectid='bar')
+    client = ks_client.Client(conn)
+    client.authenticate()
+    #tenants = client.tenants.list()
+    #self.assertEquals(tenants[0].id, self.tenant_bar['id'])