← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to smoketests/novatestcase.py

  • Committer: Todd Willey
  • Date: 2010-07-15 04:21:17 UTC
  • mfrom: (131.1.4)
  • Revision ID: git-v1:fb2ea2cafd67fc1ef67edc969a1edf3a1d2fd7f7
fix merge errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
smoketests/novatestcase.py
24
24
import sys
25
25
import unittest
26
26
 
27
 
from nova.adminclient import NovaAdminClient
28
 
from nova.smoketests import flags
29
 
 
30
27
from nova import vendor
31
28
import paramiko
32
29
 
33
 
nova_admin = NovaAdminClient(access_key=flags.admin_access_key, secret_key=flags.admin_secret_key, clc_ip=host)
 
30
from nova import adminclient
 
31
from smoketests import flags
 
32
 
 
33
FLAGS = flags.FLAGS
 
34
 
34
35
 
35
36
class NovaTestCase(unittest.TestCase):
36
37
    def setUp(self):
37
 
        pass
 
38
        self.nova_admin = adminclient.NovaAdminClient(
 
39
            access_key=FLAGS.admin_access_key,
 
40
            secret_key=FLAGS.admin_secret_key,
 
41
            clc_ip=FLAGS.clc_ip)
38
42
 
39
43
    def tearDown(self):
40
44
        pass
55
59
 
56
60
    @property
57
61
    def admin(self):
58
 
        return nova_admin.connection_for('admin')
 
62
        return self.nova_admin.connection_for('admin')
59
63
 
60
64
    def connection_for(self, username):
61
 
        return nova_admin.connection_for(username)
 
65
        return self.nova_admin.connection_for(username)
62
66
 
63
67
    def create_user(self, username):
64
 
        return nova_admin.create_user(username)
 
68
        return self.nova_admin.create_user(username)
65
69
 
66
70
    def get_user(self, username):
67
 
        return nova_admin.get_user(username)
 
71
        return self.nova_admin.get_user(username)
68
72
 
69
73
    def delete_user(self, username):
70
 
        return nova_admin.delete_user(username)
 
74
        return self.nova_admin.delete_user(username)
71
75
 
72
76
    def get_signed_zip(self, username):
73
 
        return nova_admin.get_zip(username)
 
77
        return self.nova_admin.get_zip(username)
74
78
 
75
79
    def create_key_pair(self, conn, key_name):
76
80
        try: