openstack
/
sahara-dashboard
Code Issues Proposed changes

Changing "Savanna" to "Sahara" in basic strings 

Changing "Savanna" to "Sahara" in basic strings as part of the
project renaming effort.  The strings changed here are mostly
of the most basic nature and mostly affect only displayed text.

Partial-Implements: blueprint savanna-renaming-dashboard

Change-Id: Ifdbff723894a2b6fb98e95e1f1595f6712ad662a
This commit is contained in:
Chad Roberts 2014-03-12 16:41:34 -04:00
parent 9cc79ab36d
commit 7632107e9a
37 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HACKING.rst
View File

@ -5,7 +5,7 @@ Sahara Style Commandments
http://docs.openstack.org/developer/hacking/
- Step 2: Read on
Savanna Specific Commandments
Sahara Specific Commandments
-----------------------------
None so far

2
saharadashboard/dashboard.py
View File

@ -42,5 +42,5 @@ class SaharaDashboard(horizon.Dashboard):
horizon.register(SaharaDashboard)
LOG.info('Savanna recognizes Dashboard release as "%s"' %
LOG.info('Sahara recognizes Dashboard release as "%s"' %
compatibility.get_dashboard_release())

4
saharadashboard/job_binaries/forms.py
View File

@ -59,7 +59,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
job_binary_url = forms.CharField(label=_("URL"),
required=False,
widget=LabeledInput())
job_binary_savanna_internal = forms.ChoiceField(label=_("Savanna binary"),
job_binary_savanna_internal = forms.ChoiceField(label=_("Internal binary"),
required=False)
job_binary_file = forms.FileField(label=_("Upload File"),
@ -90,7 +90,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
self.help_text_template = "job_binaries/_create_job_binary_help.html"
self.fields["job_binary_type"].choices =\
[("savanna-db", "Savanna internal database"),
[("savanna-db", "Internal database"),
("swift", "Swift")]
self.fields["job_binary_savanna_internal"].choices =\

4
saharadashboard/templates/cluster_templates/cluster_templates.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Templates") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/cluster_templates/configure.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Cluster Template" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Cluster Template") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Cluster Template") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/cluster_templates/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Cluster Template" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Cluster Template") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Cluster Template") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/cluster_templates/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Cluster Template Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Template Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Template Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/clusters/clusters.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Clusters") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/clusters/configure.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Launch Cluster" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Launch Cluster") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Launch Cluster") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/clusters/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Launch Cluster" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Launch Cluster") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Launch Cluster") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/clusters/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Cluster Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Details") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/clusters/scale.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Scale Cluster" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Scale Cluster") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Scale Cluster") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/data_sources/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Data Source" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Data Source") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Data Source") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/data_sources/data_sources.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Data Sources") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Data Sources") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/data_sources/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Data Source Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Data Source Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Data Source Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/image_registry/_help.html
View File

@ -2,10 +2,10 @@
<h3>Image Registry tool:</h3>
<br />
<p>
Image Registry is used to provide additional information about images for Savanna
Image Registry is used to provide additional information about images for Sahara
</p>
<p>
Specified username will be used by Savanna to apply configs and manage processes on instances.
Specified username will be used by Sahara to apply configs and manage processes on instances.
</p>
<p>
Tags are used for filtering images suitable for each plugin and each hadoop version.

4
saharadashboard/templates/image_registry/image_registry.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Image Registry") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/job_binaries/_create_job_binary_help.html
View File

@ -6,12 +6,12 @@
<p>
Select the storage type for your Job Binary.
<ul>
<li>Savanna internal database</li>
<li>Sahara internal database</li>
<li>Swift</li>
</ul>
</p>
<p>
For Savanna internal job binaries, you may choose from the following:
For Sahara internal job binaries, you may choose from the following:
<ul>
<li>Choose an existing file</li>
<li>Upload a new file</li>

2
saharadashboard/templates/job_binaries/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Job Binary" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Job Binary") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Job Binary") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/job_binaries/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Job Binary Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Job Binary Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Job Binary Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/job_binaries/job_binaries.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Job Binaries") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Job Binaries") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/job_executions/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Job Execution Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Job Execution Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Job Execution Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/job_executions/job_executions.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Job Executions") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Job Executions") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/jobs/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Job" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Job") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Job") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/jobs/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Job Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Job Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Job Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/jobs/jobs.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Jobs") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Jobs") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/jobs/launch.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Launch Job" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Launch Job") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Launch Job") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/nodegroup_templates/_configure_general_help.html
View File

@ -11,7 +11,7 @@
The Node Group Template object should specify processes that will be launched on each instance. Also an OpenStack flavor is required to boot VMs.
</p>
<p>
Savanna provides different storage location options. You may choose Ephemeral Drive or a Cinder Volume to be attached to instances.
Sahara provides different storage location options. You may choose Ephemeral Drive or a Cinder Volume to be attached to instances.
</p>
<p>
When processes are selected, you may set <b>node</b> scoped Hadoop configurations on corresponding tabs.

2
saharadashboard/templates/nodegroup_templates/configure.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Node Group Template" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Node Group Template") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/nodegroup_templates/create.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Create Node Group Template" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Create Node Group Template") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/nodegroup_templates/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Nodegroup Template Details" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna node group template details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara node group template details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/nodegroup_templates/nodegroup_templates.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Node Group Templates") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Node Group Templates") %}
{% endblock page_header %}
{% block main %}

2
saharadashboard/templates/plugins/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Plugin Detail" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna Plugin Details") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara Plugin Details") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/templates/plugins/plugins.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Savanna" %}{% endblock %}
{% block title %}{% trans "Sahara" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Plugins") %}
{% include "horizon/common/_page_header.html" with title=_("Sahara - Plugins") %}
{% endblock page_header %}
{% block main %}

4
saharadashboard/tests/base.py
View File

@ -249,8 +249,8 @@ class UITestCase(unittest2.TestCase):
self.find_clear_send(by.By.ID, "id_job_binary_password",
cfg.common.password)
elif storage_type == 'Savanna internal database':
savanna_binary = parameters_of_storage['Savanna binary']
elif storage_type == 'Internal database':
savanna_binary = parameters_of_storage['Internal binary']
driver.find_element_by_xpath(
"//select[@id='id_job_binary_savanna_internal']/option[text()"
"='%s']" % savanna_binary).click()

8
saharadashboard/tests/cluster_tests/test_clusters.py
View File

@ -125,15 +125,15 @@ class UICreateCluster(base.UITestCase):
'output', 'selenium-container.savanna/output')
parameters_of_storage = {
'storage_type': 'Savanna internal database',
'Savanna binary': '*Upload a new file',
'storage_type': 'Internal database',
'Internal binary': '*Upload a new file',
'filename': 'edp-lib.jar'}
self.create_job_binary('edp-lib.jar', parameters_of_storage)
parameters_of_storage = {
'storage_type': 'Savanna internal database',
'Savanna binary': '*Create a script',
'storage_type': 'Internal database',
'Internal binary': '*Create a script',
'script_name': 'edp-job.pig',
'script_text': open('saharadashboard/tests/resources/'
'edp-job.pig').read()}

4
saharadashboard/tests/configs/config.py
View File

@ -56,10 +56,10 @@ CommonGroup = [
help="await each web element in seconds"),
cfg.StrOpt('image_name_for_register',
default='fedora_19',
help='Image name for register to Savanna'),
help='Image name for register to Sahara'),
cfg.StrOpt('image_name_for_edit',
default='latest-ci-image',
help='Image name for edit in image registry in Savanna'),
help='Image name for edit in image registry in Sahara'),
cfg.IntOpt('job_launch_timeout',
default=5,
help='Timeout for job launch (in minutes); '