Change 'savanna' references in tools

Partial-Implements: blueprint savanna-renaming-service
Change-Id: I5dfdeb41f290dd5679ca4ba53c7dd7c79e9886bd
This commit is contained in:
Trevor McKay 2014-03-19 15:05:10 -04:00
parent 1e7ed6e29d
commit 877c4002ef
3 changed files with 11 additions and 11 deletions

View File

@ -27,8 +27,8 @@ attr-rgx=[a-z_][a-z0-9_]{1,30}$
# Method names shold be at least 3 characters long and be lowercased with underscores
method-rgx=([a-z_][a-z0-9_]{1,30}|setUp|tearDown)$
# Module names matching savanna-* are ok (files in bin/)
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(savanna-[a-z0-9_-]+))$
# Module names matching sahara-* are ok (files in bin/)
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(sahara-[a-z0-9_-]+))$
# Don't require docstrings on tests.
no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$

View File

@ -24,7 +24,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
os.pardir,
os.pardir))
if os.path.exists(os.path.join(possible_topdir,
'savanna',
'sahara',
'__init__.py')):
sys.path.insert(0, possible_topdir)
@ -38,17 +38,17 @@ cli_opts = [
]
CONF = cfg.CONF
CONF.import_opt('os_admin_username', 'savanna.main')
CONF.import_opt('os_admin_password', 'savanna.main')
CONF.import_opt('os_admin_tenant_name', 'savanna.main')
CONF.import_opt('os_admin_username', 'sahara.main')
CONF.import_opt('os_admin_password', 'sahara.main')
CONF.import_opt('os_admin_tenant_name', 'sahara.main')
CONF.register_cli_opts(cli_opts)
def main():
dev_conf = os.path.join(possible_topdir,
'etc',
'savanna',
'savanna.conf')
'sahara',
'sahara.conf')
config_files = None
if os.path.exists(dev_conf):
config_files = [dev_conf]

View File

@ -31,10 +31,10 @@ from six.moves import cStringIO as StringIO
ignore_codes = ["E1103"]
# Note(maoy): the error message is the pattern of E0202. It should be ignored
# for sahara.tests modules
ignore_messages = ["An attribute affected in savanna.tests"]
ignore_messages = ["An attribute affected in sahara.tests"]
# We ignore all errors in openstack.common because it should be checked
# elsewhere.
ignore_modules = ["savanna/openstack/common/"]
ignore_modules = ["sahara/openstack/common/"]
KNOWN_PYLINT_EXCEPTIONS_FILE = "tools/pylint_exceptions"
@ -129,7 +129,7 @@ class ErrorKeys(object):
def run_pylint():
buff = StringIO()
reporter = text.ParseableTextReporter(output=buff)
args = ["--include-ids=y", "-E", "savanna"]
args = ["--include-ids=y", "-E", "sahara"]
lint.Run(args, reporter=reporter, exit=False)
val = buff.getvalue()
buff.close()