OpenStack Compute (nova)

Merge lp:~anotherjesse/nova/remove-vendor into lp:~soren/nova/trunk

  1. remove-vendor
  2. Merge into trunk
Proposed by Jesse Andrews
Status: Merged
Merged at revision: 142
Proposed branch: lp:~anotherjesse/nova/remove-vendor
Merge into: lp:~soren/nova/trunk
Diff against target: 1150 lines (+91/-177)
59 files modified
HACKING (+0/-4)
bin/dhcpleasor.py (+2/-3)
bin/nova-api (+0/-2)
bin/nova-compute (+1/-1)
bin/nova-import-canonical-imagestore (+1/-1)
bin/nova-instancemonitor (+0/-2)
bin/nova-manage (+2/-1)
bin/nova-objectstore (+0/-2)
bin/nova-rsapi (+1/-3)
bin/nova-volume (+0/-2)
docs/conf.py (+1/-1)
nova/adminclient.py (+0/-2)
nova/auth/signer.py (+3/-2)
nova/auth/users.py (+0/-3)
nova/cloudpipe/api.py (+2/-3)
nova/cloudpipe/pipelib.py (+5/-4)
nova/compute/disk.py (+1/-2)
nova/compute/exception.py (+1/-0)
nova/compute/linux_net.py (+2/-1)
nova/compute/model.py (+0/-2)
nova/compute/monitor.py (+8/-8)
nova/compute/network.py (+4/-7)
nova/compute/node.py (+3/-3)
nova/crypto.py (+1/-3)
nova/datastore.py (+0/-2)
nova/endpoint/api.py (+4/-5)
nova/endpoint/cloud.py (+2/-3)
nova/endpoint/images.py (+3/-4)
nova/endpoint/rackspace.py (+2/-4)
nova/exception.py (+1/-1)
nova/fakerabbit.py (+1/-2)
nova/flags.py (+1/-1)
nova/objectstore/bucket.py (+2/-1)
nova/objectstore/handler.py (+1/-4)
nova/objectstore/stored.py (+3/-2)
nova/process.py (+0/-2)
nova/rpc.py (+2/-4)
nova/server.py (+2/-4)
nova/test.py (+2/-4)
nova/tests/access_unittest.py (+3/-2)
nova/tests/api_integration.py (+2/-1)
nova/tests/api_unittest.py (+2/-4)
nova/tests/cloud_unittest.py (+2/-4)
nova/tests/future_unittest.py (+3/-5)
nova/tests/model_unittest.py (+0/-2)
nova/tests/network_unittest.py (+1/-3)
nova/tests/node_unittest.py (+2/-4)
nova/tests/objectstore_unittest.py (+1/-3)
nova/tests/process_unittest.py (+1/-3)
nova/tests/users_unittest.py (+1/-3)
nova/tests/validator_unittest.py (+0/-2)
nova/twistd.py (+3/-4)
nova/utils.py (+1/-1)
nova/vendor.py (+0/-24)
nova/volume/storage.py (+1/-3)
run_tests.py (+1/-1)
smoketests/flags.py (+1/-1)
smoketests/novatestcase.py (+1/-1)
smoketests/smoketest.py (+1/-1)
To merge this branch: bzr merge lp:~anotherjesse/nova/remove-vendor
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Eric Day (community) Approve
Joshua McKenty (community) Needs Fixing
Review via email: mp+30045@code.launchpad.net

Description of the change

This removes the vendor imports

To post a comment you must log in.
Revision history for this message
Joshua McKenty (joshua-mckenty) wrote :

Don't replace with empty strings.

review: Needs Fixing
Revision history for this message
Eric Day (eday) wrote :

Looks good minus a couple extra newlines still added in there.

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2010-05-28 06:05:26 +0000
3+++ HACKING 2010-07-15 23:15:54 +0000
4@@ -10,16 +10,12 @@
5 - thou shalt not import objects, only modules
6 - thou shalt not import more than one module per line
7 - thou shalt not make relative imports
8-- thou shalt "from nova import vendor" before importing third party code
9 - thou shalt organize your imports according to the following template
10
11 ::
12 # vim: tabstop=4 shiftwidth=4 softtabstop=4
13 {{stdlib imports in human alphabetical order}}
14 \n
15- from nova import vendor
16- {{vendor imports in human alphabetical order}}
17- \n
18 {{nova imports in human alphabetical order}}
19 \n
20 \n
21
22=== modified file 'bin/dhcpleasor.py'
23--- bin/dhcpleasor.py 2010-07-15 05:28:51 +0000
24+++ bin/dhcpleasor.py 2010-07-15 23:15:54 +0000
25@@ -31,11 +31,10 @@
26 logging.debug(sys.path)
27 import getopt
28 from os import environ
29+from nova import rpc
30+from nova import flags
31 from nova.compute import linux_net
32 from nova.compute import network
33-from nova import rpc
34-
35-from nova import flags
36 FLAGS = flags.FLAGS
37
38
39
40=== modified file 'bin/nova-api'
41--- bin/nova-api 2010-07-15 15:52:11 +0000
42+++ bin/nova-api 2010-07-15 23:15:54 +0000
43@@ -22,8 +22,6 @@
44 """
45
46 import logging
47-
48-from nova import vendor
49 from tornado import httpserver
50 from tornado import ioloop
51
52
53=== modified file 'bin/nova-compute'
54--- bin/nova-compute 2010-07-15 15:52:11 +0000
55+++ bin/nova-compute 2010-07-15 23:15:54 +0000
56@@ -33,7 +33,7 @@
57 if os.path.exists(NOVA_PATH):
58 sys.path.insert(0, os.path.dirname(NOVA_PATH))
59
60-from nova import vendor
61+
62 from carrot import connection
63 from carrot import messaging
64 from twisted.internet import task
65
66=== modified file 'bin/nova-import-canonical-imagestore'
67--- bin/nova-import-canonical-imagestore 2010-07-15 05:28:51 +0000
68+++ bin/nova-import-canonical-imagestore 2010-07-15 23:15:54 +0000
69@@ -29,9 +29,9 @@
70 import sys
71 import urllib2
72
73-from nova.objectstore import image
74 from nova import flags
75 from nova import utils
76+from nova.objectstore import image
77
78 FLAGS = flags.FLAGS
79
80
81=== modified file 'bin/nova-instancemonitor'
82--- bin/nova-instancemonitor 2010-07-15 15:52:11 +0000
83+++ bin/nova-instancemonitor 2010-07-15 23:15:54 +0000
84@@ -22,8 +22,6 @@
85 """
86
87 import logging
88-
89-from nova import vendor
90 from twisted.internet import task
91 from twisted.application import service
92
93
94=== modified file 'bin/nova-manage'
95--- bin/nova-manage 2010-07-15 05:28:51 +0000
96+++ bin/nova-manage 2010-07-15 23:15:54 +0000
97@@ -23,6 +23,7 @@
98 """
99
100 import sys
101+import time
102
103 from nova import flags
104 from nova import utils
105@@ -31,7 +32,7 @@
106 from nova.compute import network
107 from nova.cloudpipe import pipelib
108 from nova.endpoint import cloud
109-import time
110+
111
112 FLAGS = flags.FLAGS
113
114
115=== modified file 'bin/nova-objectstore'
116--- bin/nova-objectstore 2010-07-15 15:52:11 +0000
117+++ bin/nova-objectstore 2010-07-15 23:15:54 +0000
118@@ -22,8 +22,6 @@
119 """
120
121 import logging
122-
123-from nova import vendor
124 from tornado import httpserver
125 from tornado import ioloop
126
127
128=== modified file 'bin/nova-rsapi'
129--- bin/nova-rsapi 2010-07-15 05:28:51 +0000
130+++ bin/nova-rsapi 2010-07-15 23:15:54 +0000
131@@ -21,11 +21,9 @@
132 """
133
134 import logging
135+from tornado import ioloop
136 from wsgiref import simple_server
137
138-from nova import vendor
139-from tornado import ioloop
140-
141 from nova import flags
142 from nova import rpc
143 from nova import server
144
145=== modified file 'bin/nova-volume'
146--- bin/nova-volume 2010-07-15 15:52:11 +0000
147+++ bin/nova-volume 2010-07-15 23:15:54 +0000
148@@ -22,8 +22,6 @@
149 """
150
151 import logging
152-
153-from nova import vendor
154 from tornado import ioloop
155
156 from nova import flags
157
158=== modified file 'docs/conf.py'
159--- docs/conf.py 2010-07-15 05:28:51 +0000
160+++ docs/conf.py 2010-07-15 23:15:54 +0000
161@@ -18,7 +18,7 @@
162 # documentation root, use os.path.abspath to make it absolute, like shown here.
163 sys.path.append(os.path.abspath('/Users/jmckenty/Projects/cc'))
164 sys.path.append([os.path.abspath('../nova'),os.path.abspath('../'),os.path.abspath('../vendor')])
165-from nova import vendor
166+
167
168 # -- General configuration -----------------------------------------------------
169
170
171=== modified file 'nova/adminclient.py'
172--- nova/adminclient.py 2010-07-15 15:52:11 +0000
173+++ nova/adminclient.py 2010-07-15 23:15:54 +0000
174@@ -20,8 +20,6 @@
175 """
176
177 import base64
178-
179-from nova import vendor
180 import boto
181 from boto.ec2.regioninfo import RegionInfo
182
183
184=== modified file 'nova/auth/signer.py'
185--- nova/auth/signer.py 2010-07-15 15:52:11 +0000
186+++ nova/auth/signer.py 2010-07-15 23:15:54 +0000
187@@ -43,11 +43,12 @@
188 Utility class for parsing signed AMI manifests.
189 """
190
191-import logging
192+import base64
193 import hashlib
194 import hmac
195+import logging
196 import urllib
197-import base64
198+
199 from nova.exception import Error
200
201 class Signer(object):
202
203=== modified file 'nova/auth/users.py'
204--- nova/auth/users.py 2010-07-15 15:52:11 +0000
205+++ nova/auth/users.py 2010-07-15 23:15:54 +0000
206@@ -26,7 +26,6 @@
207 import shutil
208 import signer
209 import string
210-from string import Template
211 import tempfile
212 import uuid
213 import zipfile
214@@ -44,8 +43,6 @@
215 from nova import flags
216 from nova import crypto
217 from nova import utils
218-
219-
220 from nova import objectstore # for flags
221
222 FLAGS = flags.FLAGS
223
224=== modified file 'nova/cloudpipe/api.py'
225--- nova/cloudpipe/api.py 2010-07-15 15:52:11 +0000
226+++ nova/cloudpipe/api.py 2010-07-15 23:15:54 +0000
227@@ -21,14 +21,13 @@
228 """
229
230 import logging
231+import tornado.web
232 import urllib
233
234-from nova import vendor
235-import tornado.web
236-
237 from nova import crypto
238 from nova.auth import users
239
240+
241 _log = logging.getLogger("api")
242 _log.setLevel(logging.DEBUG)
243
244
245=== modified file 'nova/cloudpipe/pipelib.py'
246--- nova/cloudpipe/pipelib.py 2010-07-15 15:52:11 +0000
247+++ nova/cloudpipe/pipelib.py 2010-07-15 23:15:54 +0000
248@@ -22,18 +22,19 @@
249
250 """
251
252+import base64
253 import logging
254 import os
255 import tempfile
256-import base64
257-from zipfile import ZipFile, ZIP_DEFLATED
258+import zipfile
259
260 from nova import exception
261 from nova import flags
262+from nova import utils
263 from nova.auth import users
264-from nova import utils
265 from nova.endpoint import api
266
267+
268 FLAGS = flags.FLAGS
269
270 flags.DEFINE_string('boot_script_template',
271@@ -52,7 +53,7 @@
272 tmpfolder = tempfile.mkdtemp()
273 filename = "payload.zip"
274 zippath = os.path.join(tmpfolder, filename)
275- z = ZipFile(zippath, "w", ZIP_DEFLATED)
276+ z = zipfile.ZipFile(zippath, "w", zipfile.ZIP_DEFLATED)
277
278 z.write(FLAGS.boot_script_template,'autorun.sh')
279 z.close()
280
281=== modified file 'nova/compute/disk.py'
282--- nova/compute/disk.py 2010-07-15 05:28:51 +0000
283+++ nova/compute/disk.py 2010-07-15 23:15:54 +0000
284@@ -24,12 +24,11 @@
285 import logging
286 import os
287 import tempfile
288-
289-from nova import vendor
290 from twisted.internet import defer
291
292 from nova import exception
293
294+
295 @defer.inlineCallbacks
296 def partition(infile, outfile, local_bytes=0, local_type='ext2', execute=None):
297 """Takes a single partition represented by infile and writes a bootable
298
299=== modified file 'nova/compute/exception.py'
300--- nova/compute/exception.py 2010-07-15 15:52:11 +0000
301+++ nova/compute/exception.py 2010-07-15 23:15:54 +0000
302@@ -22,6 +22,7 @@
303
304 from nova.exception import Error
305
306+
307 class NoMoreAddresses(Error):
308 pass
309
310
311=== modified file 'nova/compute/linux_net.py'
312--- nova/compute/linux_net.py 2010-07-15 15:52:11 +0000
313+++ nova/compute/linux_net.py 2010-07-15 23:15:54 +0000
314@@ -19,11 +19,12 @@
315 import logging
316 import signal
317 import os
318-import nova.utils
319 import subprocess
320
321 # todo(ja): does the definition of network_path belong here?
322
323+from nova import utils
324+
325 from nova import flags
326 FLAGS=flags.FLAGS
327
328
329=== modified file 'nova/compute/model.py'
330--- nova/compute/model.py 2010-07-15 15:52:11 +0000
331+++ nova/compute/model.py 2010-07-15 23:15:54 +0000
332@@ -42,8 +42,6 @@
333
334 import logging
335 import time
336-
337-from nova import vendor
338 import redis
339
340 from nova import datastore
341
342=== modified file 'nova/compute/monitor.py'
343--- nova/compute/monitor.py 2010-07-15 15:52:11 +0000
344+++ nova/compute/monitor.py 2010-07-15 23:15:54 +0000
345@@ -24,11 +24,18 @@
346 in the object store.
347 """
348
349+import boto
350+import boto.s3
351 import datetime
352+import libxml2
353 import logging
354 import os
355+import rrdtool
356 import sys
357 import time
358+from twisted.internet import defer
359+from twisted.internet import task
360+from twisted.application import service
361
362 try:
363 import libvirt
364@@ -36,14 +43,7 @@
365 logging.warning('no libvirt found')
366
367 from nova import flags
368-from nova import vendor
369-import boto
370-import boto.s3
371-import libxml2
372-import rrdtool
373-from twisted.internet import defer
374-from twisted.internet import task
375-from twisted.application import service
376+
377
378 FLAGS = flags.FLAGS
379 flags.DEFINE_integer(
380
381=== modified file 'nova/compute/network.py'
382--- nova/compute/network.py 2010-07-15 05:28:51 +0000
383+++ nova/compute/network.py 2010-07-15 23:15:54 +0000
384@@ -20,22 +20,19 @@
385 Classes for network control, including VLANs, DHCP, and IP allocation.
386 """
387
388+import IPy
389 import logging
390 import os
391 import time
392
393-# TODO(termie): clean up these imports
394-from nova import vendor
395-import IPy
396-
397 from nova import datastore
398+from nova import exception
399 from nova import flags
400 from nova import utils
401-from nova import exception
402+from nova.auth import users
403 from nova.compute import exception as compute_exception
404-from nova.auth import users
405+from nova.compute import linux_net
406
407-import linux_net
408
409 FLAGS = flags.FLAGS
410 flags.DEFINE_string('networks_path', utils.abspath('../networks'),
411
412=== modified file 'nova/compute/node.py'
413--- nova/compute/node.py 2010-07-15 05:28:51 +0000
414+++ nova/compute/node.py 2010-07-15 23:15:54 +0000
415@@ -30,12 +30,11 @@
416 import os
417 import shutil
418 import sys
419-
420-from nova import vendor
421 from twisted.internet import defer
422 from twisted.internet import task
423 from twisted.application import service
424
425+
426 try:
427 import libvirt
428 except Exception, err:
429@@ -49,8 +48,9 @@
430 from nova.compute import disk
431 from nova.compute import model
432 from nova.compute import network
433+from nova.objectstore import image # for image_path flag
434 from nova.volume import storage
435-from nova.objectstore import image # for image_path flag
436+
437
438 FLAGS = flags.FLAGS
439 flags.DEFINE_string('libvirt_xml_template',
440
441=== modified file 'nova/crypto.py'
442--- nova/crypto.py 2010-07-15 15:52:11 +0000
443+++ nova/crypto.py 2010-07-15 23:15:54 +0000
444@@ -24,6 +24,7 @@
445 import base64
446 import hashlib
447 import logging
448+import M2Crypto
449 import os
450 import shutil
451 import struct
452@@ -31,9 +32,6 @@
453 import time
454 import utils
455
456-from nova import vendor
457-import M2Crypto
458-
459 from nova import exception
460 from nova import flags
461
462
463=== modified file 'nova/datastore.py'
464--- nova/datastore.py 2010-07-15 15:52:11 +0000
465+++ nova/datastore.py 2010-07-15 23:15:54 +0000
466@@ -24,8 +24,6 @@
467 """
468
469 import logging
470-
471-from nova import vendor
472 import redis
473
474 from nova import exception
475
476=== modified file 'nova/endpoint/api.py'
477--- nova/endpoint/api.py 2010-07-15 15:52:11 +0000
478+++ nova/endpoint/api.py 2010-07-15 23:15:54 +0000
479@@ -25,21 +25,20 @@
480 import multiprocessing
481 import random
482 import re
483+import tornado.web
484+from twisted.internet import defer
485 import urllib
486 # TODO(termie): replace minidom with etree
487 from xml.dom import minidom
488
489-from nova import vendor
490-import tornado.web
491-from twisted.internet import defer
492-
493 from nova import crypto
494 from nova import exception
495 from nova import flags
496 from nova import utils
497-from nova.endpoint import cloud
498 from nova.auth import users
499 import nova.cloudpipe.api
500+from nova.endpoint import cloud
501+
502
503 FLAGS = flags.FLAGS
504 flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
505
506=== modified file 'nova/endpoint/cloud.py'
507--- nova/endpoint/cloud.py 2010-07-15 05:28:51 +0000
508+++ nova/endpoint/cloud.py 2010-07-15 23:15:54 +0000
509@@ -27,15 +27,13 @@
510 import logging
511 import os
512 import time
513-
514-from nova import vendor
515 from twisted.internet import defer
516
517 from nova import datastore
518+from nova import exception
519 from nova import flags
520 from nova import rpc
521 from nova import utils
522-from nova import exception
523 from nova.auth import rbac
524 from nova.auth import users
525 from nova.compute import model
526@@ -44,6 +42,7 @@
527 from nova.endpoint import images
528 from nova.volume import storage
529
530+
531 FLAGS = flags.FLAGS
532
533 flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
534
535=== modified file 'nova/endpoint/images.py'
536--- nova/endpoint/images.py 2010-07-15 17:04:57 +0000
537+++ nova/endpoint/images.py 2010-07-15 23:15:54 +0000
538@@ -21,17 +21,16 @@
539 objectstore daemon.
540 """
541
542+import boto
543+import boto.s3
544 import json
545 import random
546 import urllib
547
548-from nova import vendor
549-import boto
550-import boto.s3
551-
552 from nova import flags
553 from nova import utils
554
555+
556 FLAGS = flags.FLAGS
557
558 def modify(context, image_id, operation):
559
560=== modified file 'nova/endpoint/rackspace.py'
561--- nova/endpoint/rackspace.py 2010-07-15 05:28:51 +0000
562+++ nova/endpoint/rackspace.py 2010-07-15 23:15:54 +0000
563@@ -26,21 +26,19 @@
564 import multiprocessing
565 import os
566 import time
567-
568-from nova import vendor
569 import tornado.web
570 from twisted.internet import defer
571
572 from nova import datastore
573+from nova import exception
574 from nova import flags
575 from nova import rpc
576 from nova import utils
577-from nova import exception
578 from nova.auth import users
579 from nova.compute import model
580 from nova.compute import network
581+from nova.endpoint import images
582 from nova.endpoint import wsgi
583-from nova.endpoint import images
584 from nova.volume import storage
585
586
587
588=== modified file 'nova/exception.py'
589--- nova/exception.py 2010-07-15 15:52:11 +0000
590+++ nova/exception.py 2010-07-15 23:15:54 +0000
591@@ -22,8 +22,8 @@
592 """
593
594 import logging
595+import sys
596 import traceback
597-import sys
598
599 class Error(Exception):
600 def __init__(self, message=None):
601
602=== modified file 'nova/fakerabbit.py'
603--- nova/fakerabbit.py 2010-07-15 15:52:11 +0000
604+++ nova/fakerabbit.py 2010-07-15 23:15:54 +0000
605@@ -18,11 +18,10 @@
606
607 """ Based a bit on the carrot.backeds.queue backend... but a lot better """
608
609+from carrot.backends import base
610 import logging
611 import Queue as queue
612
613-from carrot.backends import base
614-
615
616 class Message(base.BaseMessage):
617 pass
618
619=== modified file 'nova/flags.py'
620--- nova/flags.py 2010-07-15 15:52:11 +0000
621+++ nova/flags.py 2010-07-15 23:15:54 +0000
622@@ -23,7 +23,7 @@
623
624 import socket
625
626-from nova import vendor
627+
628 from gflags import *
629
630 # This keeps pylint from barfing on the imports
631
632=== modified file 'nova/objectstore/bucket.py'
633--- nova/objectstore/bucket.py 2010-07-15 15:52:11 +0000
634+++ nova/objectstore/bucket.py 2010-07-15 23:15:54 +0000
635@@ -20,17 +20,18 @@
636 Simple object store using Blobs and JSON files on disk.
637 """
638
639+import bisect
640 import datetime
641 import glob
642 import json
643 import os
644-import bisect
645
646 from nova import exception
647 from nova import flags
648 from nova import utils
649 from nova.objectstore import stored
650
651+
652 FLAGS = flags.FLAGS
653 flags.DEFINE_string('buckets_path', utils.abspath('../buckets'),
654 'path to s3 buckets')
655
656=== modified file 'nova/objectstore/handler.py'
657--- nova/objectstore/handler.py 2010-07-15 15:52:11 +0000
658+++ nova/objectstore/handler.py 2010-07-15 23:15:54 +0000
659@@ -38,14 +38,11 @@
660
661 import datetime
662 import os
663-import urllib
664 import json
665 import logging
666 import multiprocessing
667-
668-
669-from nova import vendor
670 from tornado import escape, web
671+import urllib
672
673 from nova import exception
674 from nova import flags
675
676=== modified file 'nova/objectstore/stored.py'
677--- nova/objectstore/stored.py 2010-07-15 15:52:11 +0000
678+++ nova/objectstore/stored.py 2010-07-15 23:15:54 +0000
679@@ -20,10 +20,11 @@
680 Properties of an object stored within a bucket.
681 """
682
683-from nova.exception import NotFound, NotAuthorized
684-
685 import os
686+
687 import nova.crypto
688+from nova.exception import NotFound, NotAuthorized
689+
690
691 class Object(object):
692 def __init__(self, bucket, key):
693
694=== modified file 'nova/process.py'
695--- nova/process.py 2010-07-15 15:52:11 +0000
696+++ nova/process.py 2010-07-15 23:15:54 +0000
697@@ -23,8 +23,6 @@
698 import logging
699 import multiprocessing
700 import StringIO
701-
702-from nova import vendor
703 from twisted.internet import defer
704 from twisted.internet import error
705 from twisted.internet import process
706
707=== modified file 'nova/rpc.py'
708--- nova/rpc.py 2010-07-15 15:52:11 +0000
709+++ nova/rpc.py 2010-07-15 23:15:54 +0000
710@@ -21,14 +21,12 @@
711 No fan-out support yet.
712 """
713
714+from carrot import connection
715+from carrot import messaging
716 import json
717 import logging
718 import sys
719 import uuid
720-
721-from nova import vendor
722-from carrot import connection
723-from carrot import messaging
724 from twisted.internet import defer
725 from twisted.internet import reactor
726 from twisted.internet import task
727
728=== modified file 'nova/server.py'
729--- nova/server.py 2010-07-15 15:52:11 +0000
730+++ nova/server.py 2010-07-15 23:15:54 +0000
731@@ -20,6 +20,8 @@
732 Base functionality for nova daemons - gradually being replaced with twistd.py.
733 """
734
735+import daemon
736+from daemon import pidlockfile
737 import logging
738 import logging.handlers
739 import os
740@@ -27,10 +29,6 @@
741 import sys
742 import time
743
744-from nova import vendor
745-import daemon
746-from daemon import pidlockfile
747-
748 from nova import flags
749
750
751
752=== modified file 'nova/test.py'
753--- nova/test.py 2010-07-15 15:52:11 +0000
754+++ nova/test.py 2010-07-15 23:15:54 +0000
755@@ -23,16 +23,14 @@
756 """
757
758 import logging
759+import mox
760+import stubout
761 import time
762 import unittest
763-
764-from nova import vendor
765-import mox
766 from tornado import ioloop
767 from twisted.internet import defer
768 from twisted.python import failure
769 from twisted.trial import unittest as trial_unittest
770-import stubout
771
772 from nova import fakerabbit
773 from nova import flags
774
775=== modified file 'nova/tests/access_unittest.py'
776--- nova/tests/access_unittest.py 2010-07-15 15:52:11 +0000
777+++ nova/tests/access_unittest.py 2010-07-15 23:15:54 +0000
778@@ -19,11 +19,12 @@
779 import unittest
780 import logging
781
782-from nova.auth.users import UserManager
783-from nova.auth import rbac
784 from nova import exception
785 from nova import flags
786 from nova import test
787+from nova.auth.users import UserManager
788+from nova.auth import rbac
789+
790
791 FLAGS = flags.FLAGS
792 class Context(object):
793
794=== modified file 'nova/tests/api_integration.py'
795--- nova/tests/api_integration.py 2010-07-15 15:52:11 +0000
796+++ nova/tests/api_integration.py 2010-07-15 23:15:54 +0000
797@@ -16,10 +16,11 @@
798 # License for the specific language governing permissions and limitations
799 # under the License.
800
801-import unittest
802
803 import boto
804 from boto.ec2.regioninfo import RegionInfo
805+import unittest
806+
807
808 ACCESS_KEY = 'fake'
809 SECRET_KEY = 'fake'
810
811=== modified file 'nova/tests/api_unittest.py'
812--- nova/tests/api_unittest.py 2010-07-15 15:52:11 +0000
813+++ nova/tests/api_unittest.py 2010-07-15 23:15:54 +0000
814@@ -16,13 +16,11 @@
815 # License for the specific language governing permissions and limitations
816 # under the License.
817
818+import boto
819+from boto.ec2 import regioninfo
820 import httplib
821 import random
822 import StringIO
823-
824-from nova import vendor
825-import boto
826-from boto.ec2 import regioninfo
827 from tornado import httpserver
828 from twisted.internet import defer
829
830
831=== modified file 'nova/tests/cloud_unittest.py'
832--- nova/tests/cloud_unittest.py 2010-07-15 15:52:11 +0000
833+++ nova/tests/cloud_unittest.py 2010-07-15 23:15:54 +0000
834@@ -19,13 +19,11 @@
835 import logging
836 import StringIO
837 import time
838+from tornado import ioloop
839+from twisted.internet import defer
840 import unittest
841 from xml.etree import ElementTree
842
843-from nova import vendor
844-from tornado import ioloop
845-from twisted.internet import defer
846-
847 from nova import flags
848 from nova import rpc
849 from nova import test
850
851=== modified file 'nova/tests/future_unittest.py'
852--- nova/tests/future_unittest.py 2010-07-15 15:52:11 +0000
853+++ nova/tests/future_unittest.py 2010-07-15 23:15:54 +0000
854@@ -17,16 +17,14 @@
855 # under the License.
856
857 import logging
858+import mox
859 import StringIO
860 import time
861+from tornado import ioloop
862+from twisted.internet import defer
863 import unittest
864 from xml.etree import ElementTree
865
866-from nova import vendor
867-import mox
868-from tornado import ioloop
869-from twisted.internet import defer
870-
871 from nova import cloud
872 from nova import exception
873 from nova import flags
874
875=== modified file 'nova/tests/model_unittest.py'
876--- nova/tests/model_unittest.py 2010-07-15 05:28:51 +0000
877+++ nova/tests/model_unittest.py 2010-07-15 23:15:54 +0000
878@@ -18,8 +18,6 @@
879
880 import logging
881 import time
882-
883-from nova import vendor
884 from twisted.internet import defer
885
886 from nova import exception
887
888=== modified file 'nova/tests/network_unittest.py'
889--- nova/tests/network_unittest.py 2010-07-15 15:52:11 +0000
890+++ nova/tests/network_unittest.py 2010-07-15 23:15:54 +0000
891@@ -16,13 +16,11 @@
892 # License for the specific language governing permissions and limitations
893 # under the License.
894
895+import IPy
896 import os
897 import logging
898 import unittest
899
900-from nova import vendor
901-import IPy
902-
903 from nova import flags
904 from nova import test
905 from nova import exception
906
907=== modified file 'nova/tests/node_unittest.py'
908--- nova/tests/node_unittest.py 2010-07-15 15:52:11 +0000
909+++ nova/tests/node_unittest.py 2010-07-15 23:15:54 +0000
910@@ -18,12 +18,9 @@
911
912 import logging
913 import time
914-
915+from twisted.internet import defer
916 from xml.etree import ElementTree
917
918-from nova import vendor
919-from twisted.internet import defer
920-
921 from nova import exception
922 from nova import flags
923 from nova import test
924@@ -31,6 +28,7 @@
925 from nova.compute import model
926 from nova.compute import node
927
928+
929 FLAGS = flags.FLAGS
930
931
932
933=== modified file 'nova/tests/objectstore_unittest.py'
934--- nova/tests/objectstore_unittest.py 2010-07-15 15:52:11 +0000
935+++ nova/tests/objectstore_unittest.py 2010-07-15 23:15:54 +0000
936@@ -23,16 +23,14 @@
937 import shutil
938 import tempfile
939
940-from nova import vendor
941-
942 from nova import flags
943 from nova import objectstore
944 from nova import test
945 from nova.auth import users
946
947+
948 FLAGS = flags.FLAGS
949
950-
951 oss_tempdir = tempfile.mkdtemp(prefix='test_oss-')
952
953
954
955=== modified file 'nova/tests/process_unittest.py'
956--- nova/tests/process_unittest.py 2010-07-15 15:52:11 +0000
957+++ nova/tests/process_unittest.py 2010-07-15 23:15:54 +0000
958@@ -17,11 +17,9 @@
959 # under the License.
960
961 import logging
962-from xml.etree import ElementTree
963-
964-from nova import vendor
965 from twisted.internet import defer
966 from twisted.internet import reactor
967+from xml.etree import ElementTree
968
969 from nova import exception
970 from nova import flags
971
972=== modified file 'nova/tests/users_unittest.py'
973--- nova/tests/users_unittest.py 2010-07-15 15:52:11 +0000
974+++ nova/tests/users_unittest.py 2010-07-15 23:15:54 +0000
975@@ -17,12 +17,10 @@
976 # under the License.
977
978 import logging
979-import unittest
980-
981-from nova import vendor
982 from M2Crypto import BIO
983 from M2Crypto import RSA
984 from M2Crypto import X509
985+import unittest
986
987 from nova import crypto
988 from nova import flags
989
990=== modified file 'nova/tests/validator_unittest.py'
991--- nova/tests/validator_unittest.py 2010-07-15 15:52:11 +0000
992+++ nova/tests/validator_unittest.py 2010-07-15 23:15:54 +0000
993@@ -19,8 +19,6 @@
994 import logging
995 import unittest
996
997-from nova import vendor
998-
999 from nova import flags
1000 from nova import test
1001 from nova import validate
1002
1003=== modified file 'nova/twistd.py'
1004--- nova/twistd.py 2010-07-15 15:52:11 +0000
1005+++ nova/twistd.py 2010-07-15 23:15:54 +0000
1006@@ -22,22 +22,21 @@
1007 """
1008
1009 import logging
1010+import logging.handlers
1011 import os
1012 import signal
1013 import sys
1014 import time
1015-import UserDict
1016-import logging.handlers
1017-
1018-from nova import vendor
1019 from twisted.scripts import twistd
1020 from twisted.python import log
1021 from twisted.python import reflect
1022 from twisted.python import runtime
1023 from twisted.python import usage
1024+import UserDict
1025
1026 from nova import flags
1027
1028+
1029 if runtime.platformType == "win32":
1030 from twisted.scripts._twistw import ServerOptions
1031 else:
1032
1033=== modified file 'nova/utils.py'
1034--- nova/utils.py 2010-07-15 15:52:11 +0000
1035+++ nova/utils.py 2010-07-15 23:15:54 +0000
1036@@ -20,6 +20,7 @@
1037 System-level utilities and helper functions.
1038 """
1039
1040+from datetime import datetime
1041 import inspect
1042 import logging
1043 import os
1044@@ -27,7 +28,6 @@
1045 import subprocess
1046 import socket
1047 import sys
1048-from datetime import datetime
1049
1050 from nova import flags
1051
1052
1053=== removed file 'nova/vendor.py'
1054--- nova/vendor.py 2010-07-15 15:52:11 +0000
1055+++ nova/vendor.py 1970-01-01 00:00:00 +0000
1056@@ -1,24 +0,0 @@
1057-# vim: tabstop=4 shiftwidth=4 softtabstop=4
1058-
1059-# Copyright 2010 United States Government as represented by the
1060-# Administrator of the National Aeronautics and Space Administration.
1061-# All Rights Reserved.
1062-#
1063-# Licensed under the Apache License, Version 2.0 (the "License"); you may
1064-# not use this file except in compliance with the License. You may obtain
1065-# a copy of the License at
1066-#
1067-# http://www.apache.org/licenses/LICENSE-2.0
1068-#
1069-# Unless required by applicable law or agreed to in writing, software
1070-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
1071-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1072-# License for the specific language governing permissions and limitations
1073-# under the License.
1074-
1075-"""
1076-Get our vendor folders into the system path.
1077-"""
1078-
1079-print 'sorry, we cannot include vendor open source libraries... :('
1080-
1081
1082=== modified file 'nova/volume/storage.py'
1083--- nova/volume/storage.py 2010-07-15 15:52:11 +0000
1084+++ nova/volume/storage.py 2010-07-15 23:15:54 +0000
1085@@ -25,12 +25,10 @@
1086 import glob
1087 import logging
1088 import os
1089+import shutil
1090 import socket
1091-import shutil
1092 import tempfile
1093 import time
1094-
1095-from nova import vendor
1096 from tornado import ioloop
1097 from twisted.internet import defer
1098
1099
1100=== modified file 'run_tests.py'
1101--- run_tests.py 2010-07-15 15:52:11 +0000
1102+++ run_tests.py 2010-07-15 23:15:54 +0000
1103@@ -41,7 +41,7 @@
1104 import __main__
1105 import sys
1106
1107-from nova import vendor
1108+
1109 from twisted.scripts import trial as trial_script
1110
1111 from nova import datastore
1112
1113=== modified file 'smoketests/flags.py'
1114--- smoketests/flags.py 2010-07-15 15:52:11 +0000
1115+++ smoketests/flags.py 2010-07-15 23:15:54 +0000
1116@@ -21,7 +21,7 @@
1117 where they're used.
1118 """
1119
1120-from nova import vendor
1121+
1122 from gflags import *
1123
1124 # This keeps pylint from barfing on the imports
1125
1126=== modified file 'smoketests/novatestcase.py'
1127--- smoketests/novatestcase.py 2010-07-15 15:52:11 +0000
1128+++ smoketests/novatestcase.py 2010-07-15 23:15:54 +0000
1129@@ -22,7 +22,7 @@
1130 import sys
1131 import unittest
1132
1133-from nova import vendor
1134+
1135 import paramiko
1136
1137 from nova import adminclient
1138
1139=== modified file 'smoketests/smoketest.py'
1140--- smoketests/smoketest.py 2010-07-15 15:52:11 +0000
1141+++ smoketests/smoketest.py 2010-07-15 23:15:54 +0000
1142@@ -25,7 +25,7 @@
1143 import unittest
1144 import zipfile
1145
1146-from nova import vendor
1147+
1148 import paramiko
1149
1150 from smoketests import flags

Subscribers

People subscribed via source and target branches