Revision 90d90bd2 api/tests_redux.py

b/api/tests_redux.py
26 26 
        {
27 27 
            "server" : {
28 28 
                "name" : "%(name)s",
29 
                "flavorId" : "%(flavorId)s",
30 
                "imageId" : "%(imageId)s"
29 
                "flavorRef" : "%(flavorRef)s",
30 
                "imageRef" : "%(imageRef)s"
31 31 
            }
32 32 
        }
33 33 
        '''
34 34
35 
        def new_server(imageId=1, flavorId=1):
35 
        def new_server(imageRef=1, flavorRef=1):
36 36 
            name = self.create_server_name()
37 
            return name, TEMPLATE % dict(name=name, imageId=imageId, flavorId=flavorId)
37 
            return name, TEMPLATE % dict(name=name, imageRef=imageRef, flavorRef=flavorRef)
38 38
39 39 
        def verify_response(response, name):
40 40 
            assert response.status_code == 202
41 41 
            reply =  json.loads(response.content)
42 42 
            server = reply['server']
43 43 
            assert server['name'] == name
44 
            assert server['imageId'] == 1
45 
            assert server['flavorId'] == 1
44 
            assert server['imageRef'] == 1
45 
            assert server['flavorRef'] == 1
46 46 
            assert server['status'] == 'BUILD'
47 47 
            assert server['adminPass']
48 48 
            assert server['addresses']
......
69 69 
                                    HTTP_ACCEPT='application/xml')
70 70 
        verify_response(response, name)
71 71
72 
        name, data = new_server(imageId=0)
72 
        name, data = new_server(imageRef=0)
73 73 
        url = '/api/%s/servers' % API
74 74 
        response = self.client.post(url, content_type='application/json', data=data)
75 75 
        verify_error(response, 404, 'itemNotFound')
76 76
77 
        name, data = new_server(flavorId=0)
77 
        name, data = new_server(flavorRef=0)
78 78 
        url = '/api/%s/servers' % API
79 79 
        response = self.client.post(url, content_type='application/json', data=data)
80 80 
        verify_error(response, 404, 'itemNotFound')

Also available in: Unified diff