openstack
/
sahara
Code Issues Proposed changes

Missed renames in code base 

Some searches were accidentally done as case sensitive. This
change fixes comments, and an environment variable in generate_sample.sh

Partial-Implements: blueprint savanna-renaming-service
Change-Id: If65c02a5478ee41ee089ec540d48ccf672407b07
This commit is contained in:
Trevor McKay 2014-03-21 10:55:17 -04:00
parent 7f5c83e57e
commit ee260e6629
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sahara/tests/integration/tests/base.py
View File

@ -389,7 +389,7 @@ class ITestCase(unittest2.TestCase):
def print_error_log(parameter, value):
print(
'\nImage with %s "%s" was found in image list but it was '
'possibly not registered for Savanna. Please, make sure image '
'possibly not registered for Sahara. Please, make sure image '
'was correctly registered.' % (parameter, value)
)
@ -444,7 +444,7 @@ class ITestCase(unittest2.TestCase):
)
self.fail(
'\n\nImage with tag "%s" not found in list of registered '
'images for Savanna. Please, make sure tag "%s" was added to '
'images for Sahara. Please, make sure tag "%s" was added to '
'image and image was correctly registered.\n'
% (plugin_config.IMAGE_TAG, plugin_config.IMAGE_TAG)
)
@ -475,14 +475,14 @@ class ITestCase(unittest2.TestCase):
'attempt to choose image by tag '
'"sahara_i_tests" and image with such tag '
'was found in image list but it was possibly '
'not registered for Savanna. Please, make '
'not registered for Sahara. Please, make '
'sure image was correctly registered.'
)
self.fail(
'\n\nNone of parameters of image (ID, name, tag) was specified in '
'configuration file of integration tests. That is why there was '
'attempt to choose image by tag "sahara_i_tests" but image with '
'such tag not found in list of registered images for Savanna. '
'such tag not found in list of registered images for Sahara. '
'Please, make sure image was correctly registered. Please, '
'specify one of parameters of image (ID, name or tag) in '
'configuration file of integration tests.\n'

4
tools/config/generate_sample.sh
View File

@ -95,11 +95,11 @@ then
source "$RC_FILE"
fi
for mod in ${SAVANNA_CONFIG_GENERATOR_EXTRA_MODULES}; do
for mod in ${SAHARA_CONFIG_GENERATOR_EXTRA_MODULES}; do
MODULES="$MODULES -m $mod"
done
for lib in ${SAVANNA_CONFIG_GENERATOR_EXTRA_LIBRARIES}; do
for lib in ${SAHARA_CONFIG_GENERATOR_EXTRA_LIBRARIES}; do
LIBRARIES="$LIBRARIES -l $lib"
done