Rename Marconi to Zaqar
Due to copyright issues Marconi is renamed to Zaqar. This patch updates all Marconi references to Zaqar. Change-Id: Ib37b95d99bbfc666e1a3a17174d87804ecd0649e
This commit is contained in:
parent
485a1e60ad
commit
8681e92a66
|
@ -999,9 +999,9 @@
|
|||
# value)
|
||||
#trove=false
|
||||
|
||||
# Whether or not Marconi is expected to be available (boolean
|
||||
# Whether or not Zaqar is expected to be available (boolean
|
||||
# value)
|
||||
#marconi=false
|
||||
#zaqar=false
|
||||
|
||||
|
||||
[stress]
|
||||
|
|
|
@ -26,7 +26,7 @@ LOG = logging.getLogger(__name__)
|
|||
class BaseQueuingTest(test.BaseTestCase):
|
||||
|
||||
"""
|
||||
Base class for the Queuing tests that use the Tempest Marconi REST client
|
||||
Base class for the Queuing tests that use the Tempest Zaqar REST client
|
||||
|
||||
It is assumed that the following option is defined in the
|
||||
[service_available] section of etc/tempest.conf
|
||||
|
@ -37,8 +37,8 @@ class BaseQueuingTest(test.BaseTestCase):
|
|||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super(BaseQueuingTest, cls).setUpClass()
|
||||
if not CONF.service_available.marconi:
|
||||
raise cls.skipException("Marconi support is required")
|
||||
if not CONF.service_available.zaqar:
|
||||
raise cls.skipException("Zaqar support is required")
|
||||
os = cls.get_client_manager()
|
||||
cls.queuing_cfg = CONF.queuing
|
||||
cls.client = os.queuing_client
|
||||
|
|
|
@ -247,7 +247,7 @@ def check_service_availability(os, update):
|
|||
'data_processing': 'sahara',
|
||||
'baremetal': 'ironic',
|
||||
'identity': 'keystone',
|
||||
'queuing': 'marconi',
|
||||
'queuing': 'zaqar',
|
||||
'database': 'trove'
|
||||
}
|
||||
# Get catalog list for endpoints to use for validation
|
||||
|
|
|
@ -911,9 +911,9 @@ ServiceAvailableGroup = [
|
|||
cfg.BoolOpt('trove',
|
||||
default=False,
|
||||
help="Whether or not Trove is expected to be available"),
|
||||
cfg.BoolOpt('marconi',
|
||||
cfg.BoolOpt('zaqar',
|
||||
default=False,
|
||||
help="Whether or not Marconi is expected to be available"),
|
||||
help="Whether or not Zaqar is expected to be available"),
|
||||
]
|
||||
|
||||
debug_group = cfg.OptGroup(name="debug",
|
||||
|
|
|
@ -20,7 +20,7 @@ import pep8
|
|||
|
||||
PYTHON_CLIENTS = ['cinder', 'glance', 'keystone', 'nova', 'swift', 'neutron',
|
||||
'trove', 'ironic', 'savanna', 'heat', 'ceilometer',
|
||||
'marconi', 'sahara']
|
||||
'zaqar', 'sahara']
|
||||
|
||||
PYTHON_CLIENT_RE = re.compile('import (%s)client' % '|'.join(PYTHON_CLIENTS))
|
||||
TEST_DEFINITION = re.compile(r'^\s*def test.*')
|
||||
|
|
Loading…
Reference in New Issue