Revision 2feb9477 kamaki/clients/livetest/astakos.py

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):

Also available in: Unified diff