Revision 2feb9477

b/kamaki/clients/livetest/astakos.py
39 39

  
40 40
class Astakos(livetest.Generic):
41 41
    def setUp(self):
42
        self.remote = 'remote.%s' % self['testremote']
42
        self.cloud = 'cloud.%s' % self['testcloud']
43 43
        self.client = AstakosClient(
44
            self[self.remote, 'url'], self[self.remote, 'token'])
44
            self[self.cloud, 'url'], self[self.cloud, 'token'])
45 45
        with open(self['astakos', 'details']) as f:
46 46
            self._astakos_details = eval(f.read())
47 47

  
......
56 56
        self._test_0020_get_services()
57 57

  
58 58
    def _test_0020_get_services(self):
59
        for args in (tuple(), (self[self.remote, 'token'],)):
59
        for args in (tuple(), (self[self.cloud, 'token'],)):
60 60
            r = self.client.get_services(*args)
61 61
            services = self._astakos_details['access']['serviceCatalog']
62 62
            self.assertEqual(len(services), len(r))
......
71 71
        parsed_services = dict()
72 72
        for args in product(
73 73
                self._astakos_details['access']['serviceCatalog'],
74
                ([tuple(), (self[self.remote, 'token'],)])):
74
                ([tuple(), (self[self.cloud, 'token'],)])):
75 75
            service = args[0]
76 76
            if service['type'] in parsed_services:
77 77
                continue
......
88 88
        parsed_services = dict()
89 89
        for args in product(
90 90
                self._astakos_details['access']['serviceCatalog'],
91
                ([], [self[self.remote, 'token']])):
91
                ([], [self[self.cloud, 'token']])):
92 92
            service = args[0]
93 93
            if service['type'] in parsed_services:
94 94
                continue
......
118 118
    def _test_0020_get(self):
119 119
        for term in ('id', 'name', 'roles'):
120 120
            self.assertEqual(
121
                self.client.term(term, self[self.remote, 'token']),
121
                self.client.term(term, self[self.cloud, 'token']),
122 122
                self['astakos', term] or ([] if term == 'roles' else ''))
123 123

  
124 124
    def test_list_users(self):
b/kamaki/clients/livetest/cyclades.py
54 54
        self.servname1 = 'serv' + unicode(self.now)
55 55
        self.servname2 = self.servname1 + '_v2'
56 56
        self.servname1 += '_v1'
57
        self.flavorid = 1
57
        self.flavorid = self._flavor_details['id']
58 58
        #servers have to be created at the begining...
59 59
        self.networks = {}
60 60
        self.netname1 = 'net' + unicode(self.now)
61 61
        self.netname2 = 'net' + unicode(self.now) + '_v2'
62 62

  
63
        self.remote = 'remote.%s' % self['testremote']
64
        aurl, self.token = self[self.remote, 'url'], self[self.remote, 'token']
63
        self.cloud = 'cloud.%s' % self['testcloud']
64
        aurl, self.token = self[self.cloud, 'url'], self[self.cloud, 'token']
65 65
        self.auth_base = AstakosClient(aurl, self.token)
66 66
        curl = self.auth_base.get_service_endpoints('compute')['publicURL']
67 67
        self.client = CycladesClient(curl, self.token)
b/kamaki/clients/livetest/image.py
49 49
class Image(livetest.Generic):
50 50
    def setUp(self):
51 51
        self.now = time.mktime(time.gmtime())
52
        self.remote = 'remote.%s' % self['testremote']
53
        aurl, self.token = self[self.remote, 'url'], self[self.remote, 'token']
52
        self.cloud = 'cloud.%s' % self['testcloud']
53
        aurl, self.token = self[self.cloud, 'url'], self[self.cloud, 'token']
54 54
        self.auth_base = AstakosCachedClient(aurl, self.token)
55 55
        self.imgname = 'img_%s' % self.now
56 56
        url = self.auth_base.get_service_endpoints('image')['publicURL']
b/kamaki/clients/livetest/pithos.py
69 69
    files = []
70 70

  
71 71
    def setUp(self):
72
        self.remote = 'remote.%s' % self['testremote']
73
        aurl, self.token = self[self.remote, 'url'], self[self.remote, 'token']
72
        self.cloud = 'cloud.%s' % self['testcloud']
73
        aurl, self.token = self[self.cloud, 'url'], self[self.cloud, 'token']
74 74
        self.auth_base = AstakosClient(aurl, self.token)
75 75
        purl = self.auth_base.get_service_endpoints(
76 76
            'object-store')['publicURL']

Also available in: Unified diff