← Back to branch summary

~justin-fathomdb/nova/raw-disk-images

« back to all changes in this revision

Viewing changes to nova/endpoint/api.py

  • Committer: Soren Hansen
  • Date: 2010-07-16 16:09:15 UTC
  • mfrom: (139.2.2 remove-vendor)
  • Revision ID: soren.hansen@rackspace.com-20100716160915-pduf64nx3vjj1uxw
Merge lp:~anotherjesse/nova/remove-vendor

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/endpoint/api.py
25
25
import multiprocessing
26
26
import random
27
27
import re
 
28
import tornado.web
 
29
from twisted.internet import defer
28
30
import urllib
29
31
# TODO(termie): replace minidom with etree
30
32
from xml.dom import minidom
31
33
 
32
 
from nova import vendor
33
 
import tornado.web
34
 
from twisted.internet import defer
35
 
 
36
34
from nova import crypto
37
35
from nova import exception
38
36
from nova import flags
39
37
from nova import utils
40
 
from nova.endpoint import cloud
41
38
from nova.auth import users
42
39
import nova.cloudpipe.api
 
40
from nova.endpoint import cloud
 
41
 
43
42
 
44
43
FLAGS = flags.FLAGS
45
44
flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')