← Back to branch summary

~citrix-openstack/nova/xenapi

« back to all changes in this revision

Viewing changes to nova/api/__init__.py

  • Committer: Armando Migliaccio
  • Date: 2010-12-23 13:16:47 UTC
  • mfrom: (436.1.13 xenapi-unittests)
  • Revision ID: armando.migliaccio@citrix.com-20101223131647-c619u23unmifd2zj
merge lp:nova

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/__init__.py
29
29
import webob.dec
30
30
 
31
31
from nova import flags
32
 
from nova import utils
33
32
from nova import wsgi
34
 
from nova.api import cloudpipe
35
33
from nova.api import ec2
36
34
from nova.api import openstack
37
35
from nova.api.ec2 import metadatarequesthandler
41
39
                    'subdomain running the OpenStack API')
42
40
flags.DEFINE_string('ec2api_subdomain', 'ec2',
43
41
                    'subdomain running the EC2 API')
 
42
 
44
43
FLAGS = flags.FLAGS
45
44
 
46
45
 
80
79
            mapper.connect('%s/{path_info:.*}' % s, controller=mrh,
81
80
                           conditions=ec2api_subdomain)
82
81
 
83
 
        mapper.connect("/cloudpipe/{path_info:.*}", controller=cloudpipe.API())
84
82
        super(API, self).__init__(mapper)
85
83
 
86
84
    @webob.dec.wsgify