← Back to branch summary

~cloudbuilders/nova/os-keypair-integration

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/extensions/foxinsocks.py

  • Committer: Jesse Andrews
  • Date: 2011-08-26 21:57:53 UTC
  • mfrom: (1455.1.45 nova)
  • Revision ID: anotherjesse@gmail.com-20110826215753-0sfp6dubujsl23wa
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/extensions/foxinsocks.py
72
72
            res.body = json.dumps(data)
73
73
            return res
74
74
 
75
 
        req_ext1 = extensions.RequestExtension('GET', '/v1.1/flavors/:(id)',
76
 
                                                _goose_handler)
 
75
        req_ext1 = extensions.RequestExtension('GET',
 
76
                                     '/v1.1/:(project_id)/flavors/:(id)',
 
77
                                     _goose_handler)
77
78
        request_exts.append(req_ext1)
78
79
 
79
80
        def _bands_handler(req, res):
84
85
            res.body = json.dumps(data)
85
86
            return res
86
87
 
87
 
        req_ext2 = extensions.RequestExtension('GET', '/v1.1/flavors/:(id)',
88
 
                                                _bands_handler)
 
88
        req_ext2 = extensions.RequestExtension('GET',
 
89
                                     '/v1.1/:(project_id)/flavors/:(id)',
 
90
                                     _bands_handler)
89
91
        request_exts.append(req_ext2)
90
92
        return request_exts
91
93