← Back to branch summary

~zulcss/ubuntu/precise/glance/trunk

« back to all changes in this revision

Viewing changes to glance/tests/functional/__init__.py

  • Committer: Chuck Short
  • Date: 2012-11-26 19:39:15 UTC
  • mfrom: (61.1.3 raring-proposed)
  • Revision ID: zulcss@ubuntu.com-20121126193915-jplc8l13tpkcqj87
* New upstream release for the Ubuntu Cloud Archive.
* debian/patches/*: Refreshed for opening of Grizzly.
* debian/glance-client.install: Dropped
* New upstream version
* debian/rules: FTBFS if there are missing binaries
* debian/glance-registry.install: Add glance-replicator
* debian/patches/disable-swift-tests.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/tests/functional/__init__.py
24
24
"""
25
25
 
26
26
import datetime
27
 
import functools
28
27
import json
29
28
import os
30
29
import re
193
192
    """
194
193
 
195
194
    def __init__(self, test_dir, port, policy_file, delayed_delete=False,
196
 
                 pid_file=None):
 
195
                 pid_file=None, **kwargs):
197
196
        super(ApiServer, self).__init__(test_dir, port)
198
197
        self.server_name = 'api'
199
 
        self.default_store = 'file'
 
198
        self.default_store = kwargs.get("default_store", "file")
200
199
        self.key_file = ""
201
200
        self.cert_file = ""
202
201
        self.metadata_encryption_key = "012345678901234567890123456789ab"
203
 
        self.image_dir = os.path.join(self.test_dir,
204
 
                                         "images")
205
 
        self.pid_file = pid_file or os.path.join(self.test_dir,
206
 
                                                 "api.pid")
207
 
        self.scrubber_datadir = os.path.join(self.test_dir,
208
 
                                             "scrubber")
 
202
        self.image_dir = os.path.join(self.test_dir, "images")
 
203
        self.pid_file = pid_file or os.path.join(self.test_dir, "api.pid")
 
204
        self.scrubber_datadir = os.path.join(self.test_dir, "scrubber")
209
205
        self.log_file = os.path.join(self.test_dir, "api.log")
210
206
        self.s3_store_host = "s3.amazonaws.com"
211
207
        self.s3_store_access_key = ""
212
208
        self.s3_store_secret_key = ""
213
209
        self.s3_store_bucket = ""
214
210
        self.s3_store_bucket_url_format = ""
215
 
        self.swift_store_auth_address = ""
216
 
        self.swift_store_user = ""
217
 
        self.swift_store_key = ""
218
 
        self.swift_store_container = ""
 
211
        self.swift_store_auth_version = kwargs.get("swift_store_auth_version",
 
212
                                                   "2")
 
213
        self.swift_store_auth_address = kwargs.get("swift_store_auth_address",
 
214
                                                   "")
 
215
        self.swift_store_user = kwargs.get("swift_store_user", "")
 
216
        self.swift_store_key = kwargs.get("swift_store_key", "")
 
217
        self.swift_store_container = kwargs.get("swift_store_container", "")
 
218
        self.swift_store_create_container_on_put = kwargs.get(
 
219
            "swift_store_create_container_on_put", "True")
219
220
        self.swift_store_large_object_size = 5 * 1024
220
221
        self.swift_store_large_object_chunk_size = 200
221
222
        self.swift_store_multi_tenant = False
258
259
s3_store_secret_key = %(s3_store_secret_key)s
259
260
s3_store_bucket = %(s3_store_bucket)s
260
261
s3_store_bucket_url_format = %(s3_store_bucket_url_format)s
 
262
swift_store_auth_version = %(swift_store_auth_version)s
261
263
swift_store_auth_address = %(swift_store_auth_address)s
262
264
swift_store_user = %(swift_store_user)s
263
265
swift_store_key = %(swift_store_key)s
264
266
swift_store_container = %(swift_store_container)s
 
267
swift_store_create_container_on_put = %(swift_store_create_container_on_put)s
265
268
swift_store_large_object_size = %(swift_store_large_object_size)s
266
269
swift_store_large_object_chunk_size = %(swift_store_large_object_chunk_size)s
267
270
swift_store_multi_tenant = %(swift_store_multi_tenant)s
360
363
        self.sql_connection = os.environ.get('GLANCE_TEST_SQL_CONNECTION',
361
364
                                             default_sql_connection)
362
365
 
363
 
        self.pid_file = os.path.join(self.test_dir,
364
 
                                         "registry.pid")
 
366
        self.pid_file = os.path.join(self.test_dir, "registry.pid")
365
367
        self.log_file = os.path.join(self.test_dir, "registry.log")
366
368
        self.owner_is_tenant = True
367
369
        self.server_control_options = '--capture-output'
408
410
    Server object that starts/stops/manages the Scrubber server
409
411
    """
410
412
 
411
 
    def __init__(self, test_dir, daemon=False):
 
413
    def __init__(self, test_dir, daemon=False, **kwargs):
412
414
        # NOTE(jkoelker): Set the port to 0 since we actually don't listen
413
415
        super(ScrubberDaemon, self).__init__(test_dir, 0)
414
416
        self.server_name = 'scrubber'
418
420
                                             "scrubber")
419
421
        self.pid_file = os.path.join(self.test_dir, "scrubber.pid")
420
422
        self.log_file = os.path.join(self.test_dir, "scrubber.log")
 
423
        self.swift_store_auth_address = kwargs.get("swift_store_auth_address",
 
424
                                                   "")
 
425
        self.swift_store_user = kwargs.get("swift_store_user", "")
 
426
        self.swift_store_key = kwargs.get("swift_store_key", "")
 
427
        self.swift_store_container = kwargs.get("swift_store_container", "")
 
428
        self.swift_store_auth_version = kwargs.get("swift_store_auth_version",
 
429
                                                   "2")
421
430
        self.conf_base = """[DEFAULT]
422
431
verbose = %(verbose)s
423
432
debug = %(debug)s
427
436
scrubber_datadir = %(scrubber_datadir)s
428
437
registry_host = 127.0.0.1
429
438
registry_port = %(registry_port)s
 
439
swift_store_auth_address = %(swift_store_auth_address)s
 
440
swift_store_user = %(swift_store_user)s
 
441
swift_store_key = %(swift_store_key)s
 
442
swift_store_container = %(swift_store_container)s
 
443
swift_store_auth_version = %(swift_store_auth_version)s
430
444
"""
431
445
 
432
446