diff --git a/HACKING.rst b/HACKING.rst index a946560..a85ef29 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -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 diff --git a/saharadashboard/dashboard.py b/saharadashboard/dashboard.py index dad913a..2208601 100644 --- a/saharadashboard/dashboard.py +++ b/saharadashboard/dashboard.py @@ -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()) diff --git a/saharadashboard/job_binaries/forms.py b/saharadashboard/job_binaries/forms.py index bf538ad..e0c33c2 100644 --- a/saharadashboard/job_binaries/forms.py +++ b/saharadashboard/job_binaries/forms.py @@ -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 =\ diff --git a/saharadashboard/templates/cluster_templates/cluster_templates.html b/saharadashboard/templates/cluster_templates/cluster_templates.html index d0e69c2..ffac6d1 100644 --- a/saharadashboard/templates/cluster_templates/cluster_templates.html +++ b/saharadashboard/templates/cluster_templates/cluster_templates.html @@ -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 %} diff --git a/saharadashboard/templates/cluster_templates/configure.html b/saharadashboard/templates/cluster_templates/configure.html index 531b924..5abb8eb 100644 --- a/saharadashboard/templates/cluster_templates/configure.html +++ b/saharadashboard/templates/cluster_templates/configure.html @@ -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 %} diff --git a/saharadashboard/templates/cluster_templates/create.html b/saharadashboard/templates/cluster_templates/create.html index 531b924..5abb8eb 100644 --- a/saharadashboard/templates/cluster_templates/create.html +++ b/saharadashboard/templates/cluster_templates/create.html @@ -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 %} diff --git a/saharadashboard/templates/cluster_templates/details.html b/saharadashboard/templates/cluster_templates/details.html index 8cba746..b245f17 100644 --- a/saharadashboard/templates/cluster_templates/details.html +++ b/saharadashboard/templates/cluster_templates/details.html @@ -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 %} diff --git a/saharadashboard/templates/clusters/clusters.html b/saharadashboard/templates/clusters/clusters.html index fdcea1b..cca9f36 100644 --- a/saharadashboard/templates/clusters/clusters.html +++ b/saharadashboard/templates/clusters/clusters.html @@ -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 %} diff --git a/saharadashboard/templates/clusters/configure.html b/saharadashboard/templates/clusters/configure.html index d2c5d36..4a01255 100644 --- a/saharadashboard/templates/clusters/configure.html +++ b/saharadashboard/templates/clusters/configure.html @@ -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 %} diff --git a/saharadashboard/templates/clusters/create.html b/saharadashboard/templates/clusters/create.html index d2c5d36..4a01255 100644 --- a/saharadashboard/templates/clusters/create.html +++ b/saharadashboard/templates/clusters/create.html @@ -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 %} diff --git a/saharadashboard/templates/clusters/details.html b/saharadashboard/templates/clusters/details.html index aa9f414..e89e8b2 100644 --- a/saharadashboard/templates/clusters/details.html +++ b/saharadashboard/templates/clusters/details.html @@ -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 %} diff --git a/saharadashboard/templates/clusters/scale.html b/saharadashboard/templates/clusters/scale.html index e526dec..e3de6c4 100644 --- a/saharadashboard/templates/clusters/scale.html +++ b/saharadashboard/templates/clusters/scale.html @@ -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 %} diff --git a/saharadashboard/templates/data_sources/create.html b/saharadashboard/templates/data_sources/create.html index 3f9c205..cbd6663 100644 --- a/saharadashboard/templates/data_sources/create.html +++ b/saharadashboard/templates/data_sources/create.html @@ -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 %} diff --git a/saharadashboard/templates/data_sources/data_sources.html b/saharadashboard/templates/data_sources/data_sources.html index b6faadf..e0c47ff 100644 --- a/saharadashboard/templates/data_sources/data_sources.html +++ b/saharadashboard/templates/data_sources/data_sources.html @@ -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 %} diff --git a/saharadashboard/templates/data_sources/details.html b/saharadashboard/templates/data_sources/details.html index ea0cca3..78cc4e2 100644 --- a/saharadashboard/templates/data_sources/details.html +++ b/saharadashboard/templates/data_sources/details.html @@ -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 %} diff --git a/saharadashboard/templates/image_registry/_help.html b/saharadashboard/templates/image_registry/_help.html index 47ca941..c55ff06 100644 --- a/saharadashboard/templates/image_registry/_help.html +++ b/saharadashboard/templates/image_registry/_help.html @@ -2,10 +2,10 @@
- Image Registry is used to provide additional information about images for Savanna + Image Registry is used to provide additional information about images for Sahara
- 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.
Tags are used for filtering images suitable for each plugin and each hadoop version. diff --git a/saharadashboard/templates/image_registry/image_registry.html b/saharadashboard/templates/image_registry/image_registry.html index 4453233..2123b6d 100644 --- a/saharadashboard/templates/image_registry/image_registry.html +++ b/saharadashboard/templates/image_registry/image_registry.html @@ -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 %} diff --git a/saharadashboard/templates/job_binaries/_create_job_binary_help.html b/saharadashboard/templates/job_binaries/_create_job_binary_help.html index 17bf647..0d1e4c8 100644 --- a/saharadashboard/templates/job_binaries/_create_job_binary_help.html +++ b/saharadashboard/templates/job_binaries/_create_job_binary_help.html @@ -6,12 +6,12 @@
Select the storage type for your Job Binary.
- For Savanna internal job binaries, you may choose from the following: + For Sahara internal job binaries, you may choose from the following:
- 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.
When processes are selected, you may set node scoped Hadoop configurations on corresponding tabs. diff --git a/saharadashboard/templates/nodegroup_templates/configure.html b/saharadashboard/templates/nodegroup_templates/configure.html index 2e1fd92..4a088dc 100644 --- a/saharadashboard/templates/nodegroup_templates/configure.html +++ b/saharadashboard/templates/nodegroup_templates/configure.html @@ -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 %} diff --git a/saharadashboard/templates/nodegroup_templates/create.html b/saharadashboard/templates/nodegroup_templates/create.html index 2e1fd92..4a088dc 100644 --- a/saharadashboard/templates/nodegroup_templates/create.html +++ b/saharadashboard/templates/nodegroup_templates/create.html @@ -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 %} diff --git a/saharadashboard/templates/nodegroup_templates/details.html b/saharadashboard/templates/nodegroup_templates/details.html index 633752f..98d74b5 100644 --- a/saharadashboard/templates/nodegroup_templates/details.html +++ b/saharadashboard/templates/nodegroup_templates/details.html @@ -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 %} diff --git a/saharadashboard/templates/nodegroup_templates/nodegroup_templates.html b/saharadashboard/templates/nodegroup_templates/nodegroup_templates.html index 0334cdb..3d52c91 100644 --- a/saharadashboard/templates/nodegroup_templates/nodegroup_templates.html +++ b/saharadashboard/templates/nodegroup_templates/nodegroup_templates.html @@ -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 %} diff --git a/saharadashboard/templates/plugins/details.html b/saharadashboard/templates/plugins/details.html index a06fe90..5d3d3c8 100644 --- a/saharadashboard/templates/plugins/details.html +++ b/saharadashboard/templates/plugins/details.html @@ -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 %} diff --git a/saharadashboard/templates/plugins/plugins.html b/saharadashboard/templates/plugins/plugins.html index 9c67b18..ef4a452 100644 --- a/saharadashboard/templates/plugins/plugins.html +++ b/saharadashboard/templates/plugins/plugins.html @@ -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 %} diff --git a/saharadashboard/tests/base.py b/saharadashboard/tests/base.py index b236e51..b4c8eef 100644 --- a/saharadashboard/tests/base.py +++ b/saharadashboard/tests/base.py @@ -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() diff --git a/saharadashboard/tests/cluster_tests/test_clusters.py b/saharadashboard/tests/cluster_tests/test_clusters.py index cea3e57..92e1bac 100644 --- a/saharadashboard/tests/cluster_tests/test_clusters.py +++ b/saharadashboard/tests/cluster_tests/test_clusters.py @@ -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()} diff --git a/saharadashboard/tests/configs/config.py b/saharadashboard/tests/configs/config.py index 577aafb..8be2f09 100644 --- a/saharadashboard/tests/configs/config.py +++ b/saharadashboard/tests/configs/config.py @@ -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); '