From 303858b473fc62c7c47e5d4b022c970fbccd5640 Mon Sep 17 00:00:00 2001 From: Zhiteng Huang Date: Thu, 2 Jan 2014 09:17:32 +0800 Subject: [PATCH] Remove unused fake_flags fake_flags.py should have been removed in change I3424d0a401b3ef7a3254d3e913263554361a52ff but somehow it's left untouched in that change. This module has been replaced by cinder/tests/conf_fixture.py, and shouldn't be around anymore. Change-Id: Ied840b95253d998c1b3326c1dde9d469fa783c85 --- cinder/tests/fake_flags.py | 46 -------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 cinder/tests/fake_flags.py diff --git a/cinder/tests/fake_flags.py b/cinder/tests/fake_flags.py deleted file mode 100644 index b5b85ea68..000000000 --- a/cinder/tests/fake_flags.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from cinder import flags - -FLAGS = flags.FLAGS - -flags.DECLARE('iscsi_num_targets', 'cinder.volume.drivers.lvm') -flags.DECLARE('iser_num_targets', 'cinder.volume.drivers.lvm') -flags.DECLARE('policy_file', 'cinder.policy') -flags.DECLARE('volume_driver', 'cinder.volume.manager') -flags.DECLARE('xiv_proxy', 'cinder.volume.drivers.xiv') -flags.DECLARE('backup_driver', 'cinder.backup.manager') -def_vol_type = 'fake_vol_type' - - -def set_defaults(conf): - conf.set_default('default_volume_type', def_vol_type) - conf.set_default('volume_driver', - 'cinder.tests.fake_driver.FakeISCSIDriver') - conf.set_default('iscsi_helper', 'fake') - conf.set_default('iser_helper', 'fake') - conf.set_default('connection_type', 'fake') - conf.set_default('fake_rabbit', True) - conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake') - conf.set_default('iscsi_num_targets', 8) - conf.set_default('iser_num_targets', 8) - conf.set_default('verbose', True) - conf.set_default('connection', 'sqlite://', group='database') - conf.set_default('sqlite_synchronous', False) - conf.set_default('policy_file', 'cinder/tests/policy.json') - conf.set_default('xiv_proxy', 'cinder.tests.test_xiv.XIVFakeProxyDriver') - conf.set_default('backup_driver', 'cinder.tests.backup.fake_service') -- 2.45.2