Renaming savannadashboard directory to saharadashboard

* Renaming savannadashboard directory to saharadashboard which
also includes updating all of the places where that package
is referenced.
* Also including some renaming in the documentation.
* Changing the name of the top level panel to Sahara
* Changing the name of the top level Dashboard class to SaharaDashboard

Partial-Implements: blueprint savanna-renaming-dashboard

Change-Id: If51b85d22ec7798c214c56189359260198e69374

.testr.conf

@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover savannadashboard/tests $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover saharadashboard/tests $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
-test_list_option=--list
+test_list_option=--list

HACKING.rst

@@ -1,4 +1,4 @@
-Savanna Style Commandments
+Sahara Style Commandments
 ==========================
 
 - Step 1: Read the OpenStack Style Commandments

MANIFEST.in

@@ -3,7 +3,7 @@ include README.rst
 include ChangeLog
 include LICENSE
 
-include savannadashboard/templates/**.html
+include saharadashboard/templates/**.html
 
 exclude .gitignore
 exclude .gitreview

README.rst

@@ -1,19 +1,19 @@
-OpenStack Dashboard plugin for Savanna project
+OpenStack Dashboard plugin for Sahara project
 ==============================================
 
-Savanna project: https://github.com/stackforge/savanna
+Sahara project: https://github.com/openstack/sahara
 
-Savanna at wiki.openstack.org: https://wiki.openstack.org/wiki/Savanna
+Sahara at wiki.openstack.org: https://wiki.openstack.org/wiki/Sahara
 
-Launchpad project: https://launchpad.net/savanna
+Launchpad project: https://launchpad.net/sahara
 
-Savanna docs site: https://savanna.readthedocs.org/en/latest/index.html
+Sahara docs site: http://docs.openstack.org/developer/sahara
 
-Roadmap: https://wiki.openstack.org/wiki/Savanna/Roadmap
+Roadmap: https://wiki.openstack.org/wiki/Sahara/Roadmap
 
-Quickstart guide: https://savanna.readthedocs.org/en/latest/devref/quickstart.html
+Quickstart guide: http://docs.openstack.org/developer/sahara/devref/quickstart.html
 
-How to participate: https://savanna.readthedocs.org/en/latest/devref/how_to_participate.html
+How to participate: http://docs.openstack.org/developer/sahara/devref/how_to_participate.html
 
 
 License

saharadashboard/api/client.py

@@ -17,9 +17,10 @@ import logging
 
 from horizon import exceptions
 
+from saharadashboard.utils import importutils
 from savannaclient.api import base as api_base
 from savannaclient import client as api_client
-from savannadashboard.utils import importutils
+
 
 # horizon.api is for backward compatibility with folsom
 base = importutils.import_any('openstack_dashboard.api.base',

saharadashboard/api/helpers.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from savannadashboard.utils import workflow_helpers as work_helpers
+from saharadashboard.utils import workflow_helpers as work_helpers
 
 
 class Helpers(object):

saharadashboard/cluster_templates/forms.py

@@ -17,9 +17,9 @@ from django.utils.translation import ugettext_lazy as _
 from horizon import forms
 from horizon import messages
 
+from saharadashboard.api import client as savannaclient
+from saharadashboard.utils import workflow_helpers
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
-from savannadashboard.utils import workflow_helpers
 
 
 class UploadFileForm(forms.SelfHandlingForm,

saharadashboard/cluster_templates/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class ClusterTemplatesPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class ClusterTemplatesPanel(horizon.Panel):
     slug = 'cluster_templates'
 
 
-dashboard.SavannaDashboard.register(ClusterTemplatesPanel)
+dashboard.SaharaDashboard.register(ClusterTemplatesPanel)

saharadashboard/cluster_templates/tables.py

@@ -22,7 +22,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/cluster_templates/tabs.py

@@ -19,9 +19,9 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.utils import importutils
+from saharadashboard.utils import importutils
-from savannadashboard.utils import workflow_helpers as helpers
+from saharadashboard.utils import workflow_helpers as helpers
 nova = importutils.import_any('openstack_dashboard.api.nova',
                               'horizon.api.nova')
 

saharadashboard/cluster_templates/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.cluster_templates.views as views
+import saharadashboard.cluster_templates.views as views
 
 urlpatterns = patterns('',
                        url(r'^$', views.ClusterTemplatesView.as_view(),

saharadashboard/cluster_templates/views.py

@@ -21,12 +21,12 @@ from horizon import tables
 from horizon import tabs
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.cluster_templates import forms as cluster_forms
+from saharadashboard.cluster_templates import forms as cluster_forms
-from savannadashboard.cluster_templates.tables import ClusterTemplatesTable
+from saharadashboard.cluster_templates.tables import ClusterTemplatesTable
-import savannadashboard.cluster_templates.tabs as _tabs
+import saharadashboard.cluster_templates.tabs as _tabs
-import savannadashboard.cluster_templates.workflows.copy as copy_flow
+import saharadashboard.cluster_templates.workflows.copy as copy_flow
-import savannadashboard.cluster_templates.workflows.create as create_flow
+import saharadashboard.cluster_templates.workflows.create as create_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/cluster_templates/workflows/copy.py

@@ -17,9 +17,9 @@ import logging
 
 from django.utils.translation import ugettext as _
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-import savannadashboard.cluster_templates.workflows.create as create_flow
+import saharadashboard.cluster_templates.workflows.create as create_flow
-from savannadashboard.utils.workflow_helpers import build_node_group_fields
+from saharadashboard.utils.workflow_helpers import build_node_group_fields
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/cluster_templates/workflows/create.py

@@ -22,11 +22,11 @@ from horizon import exceptions
 from horizon import forms
 from horizon import workflows
 
+from saharadashboard.api import client as savannaclient
+from saharadashboard.api import helpers as helpers
+from saharadashboard.utils import anti_affinity as aa
+import saharadashboard.utils.workflow_helpers as whelpers
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
-from savannadashboard.api import helpers as helpers
-from savannadashboard.utils import anti_affinity as aa
-import savannadashboard.utils.workflow_helpers as whelpers
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/clusters/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class ClustersPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class ClustersPanel(horizon.Panel):
     slug = 'clusters'
 
 
-dashboard.SavannaDashboard.register(ClustersPanel)
+dashboard.SaharaDashboard.register(ClustersPanel)

saharadashboard/clusters/tables.py

@@ -18,7 +18,7 @@ import logging
 from django.utils.translation import ugettext_lazy as _
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/clusters/tabs.py

@@ -20,9 +20,9 @@ from django.utils.translation import ugettext_lazy as _
 from horizon import tables
 from horizon import tabs
 
-from savannadashboard.utils import compatibility
+from saharadashboard.utils import compatibility
-from savannadashboard.utils import importutils
+from saharadashboard.utils import importutils
-from savannadashboard.utils import workflow_helpers as helpers
+from saharadashboard.utils import workflow_helpers as helpers
 
 neutron = importutils.import_any('openstack_dashboard.api.quantum',
                                  'horizon.api.quantum',
@@ -33,7 +33,7 @@ glance = importutils.import_any('openstack_dashboard.api.glance',
                                 'horizon.api.glance')
 
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/clusters/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.clusters.views as views
+import saharadashboard.clusters.views as views
 
 urlpatterns = patterns('',
                        url(r'^$', views.ClustersView.as_view(),

saharadashboard/clusters/views.py

@@ -19,12 +19,12 @@ from horizon import tables
 from horizon import tabs
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-from savannadashboard.clusters.tables import ClustersTable
+from saharadashboard.clusters.tables import ClustersTable
-import savannadashboard.clusters.tabs as _tabs
+import saharadashboard.clusters.tabs as _tabs
-import savannadashboard.clusters.workflows.create as create_flow
+import saharadashboard.clusters.workflows.create as create_flow
-import savannadashboard.clusters.workflows.scale as scale_flow
+import saharadashboard.clusters.workflows.scale as scale_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/clusters/workflows/create.py

@@ -17,9 +17,9 @@ from horizon import exceptions
 from horizon import forms
 from horizon import workflows
 
-from savannadashboard.utils import importutils
+from saharadashboard.utils import importutils
-from savannadashboard.utils import neutron_support
+from saharadashboard.utils import neutron_support
-import savannadashboard.utils.workflow_helpers as whelpers
+import saharadashboard.utils.workflow_helpers as whelpers
 
 neutron = importutils.import_any('openstack_dashboard.api.quantum',
                                  'openstack_dashboard.api.neutron',
@@ -31,10 +31,10 @@ nova = importutils.import_any('openstack_dashboard.api.nova',
 
 from django.utils.translation import ugettext as _
 
+from saharadashboard.api import client as savannaclient
+from saharadashboard.api.client import SAVANNA_USE_NEUTRON
+import saharadashboard.cluster_templates.workflows.create as t_flows
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
-from savannadashboard.api.client import SAVANNA_USE_NEUTRON
-import savannadashboard.cluster_templates.workflows.create as t_flows
 
 import logging
 

saharadashboard/clusters/workflows/scale.py

@@ -19,12 +19,12 @@ import logging
 from django.utils.translation import ugettext as _
 from horizon import exceptions
 
+from saharadashboard.api import client as savannaclient
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
 
-import savannadashboard.cluster_templates.workflows.create as clt_create_flow
+import saharadashboard.cluster_templates.workflows.create as clt_create_flow
-import savannadashboard.clusters.workflows.create as cl_create_flow
+import saharadashboard.clusters.workflows.create as cl_create_flow
-import savannadashboard.utils.workflow_helpers as whelpers
+import saharadashboard.utils.workflow_helpers as whelpers
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/dashboard.py

@@ -18,13 +18,13 @@ import logging
 from django.utils.translation import ugettext as _
 import horizon
 
-from savannadashboard.utils import compatibility
+from saharadashboard.utils import compatibility
 
 LOG = logging.getLogger(__name__)
 
 
-class SavannaDashboard(horizon.Dashboard):
+class SaharaDashboard(horizon.Dashboard):
-    name = _("Savanna")
+    name = _("Sahara")
     slug = "savanna"
     panels = ('clusters',
               'cluster_templates',
@@ -40,7 +40,7 @@ class SavannaDashboard(horizon.Dashboard):
     supports_tenants = True
 
 
-horizon.register(SavannaDashboard)
+horizon.register(SaharaDashboard)
 
 LOG.info('Savanna recognizes Dashboard release as "%s"' %
          compatibility.get_dashboard_release())

saharadashboard/data_sources/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class DataSourcesPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class DataSourcesPanel(horizon.Panel):
     slug = 'data_sources'
 
 
-dashboard.SavannaDashboard.register(DataSourcesPanel)
+dashboard.SaharaDashboard.register(DataSourcesPanel)

saharadashboard/data_sources/tables.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/data_sources/tabs.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/data_sources/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.data_sources.views as views
+import saharadashboard.data_sources.views as views
 
 urlpatterns = patterns('',
                        url(r'^$', views.DataSourcesView.as_view(),

saharadashboard/data_sources/views.py

@@ -19,11 +19,11 @@ from horizon import tables
 from horizon import tabs
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-from savannadashboard.data_sources.tables import DataSourcesTable
+from saharadashboard.data_sources.tables import DataSourcesTable
-import savannadashboard.data_sources.tabs as _tabs
+import saharadashboard.data_sources.tabs as _tabs
-import savannadashboard.data_sources.workflows.create as create_flow
+import saharadashboard.data_sources.workflows.create as create_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/data_sources/workflows/create.py

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
 from horizon import forms
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/image_registry/forms.py

@@ -20,9 +20,9 @@ from horizon import exceptions
 from horizon import forms
 from horizon import messages
 
+from saharadashboard.api import client as savannaclient
+from saharadashboard.utils import importutils
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
-from savannadashboard.utils import importutils
 
 # horizon.api is for backward compatibility with folsom
 glance = importutils.import_any('openstack_dashboard.api.glance',

saharadashboard/image_registry/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class ImageRegistryPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class ImageRegistryPanel(horizon.Panel):
     slug = 'image_registry'
 
 
-dashboard.SavannaDashboard.register(ImageRegistryPanel)
+dashboard.SaharaDashboard.register(ImageRegistryPanel)

saharadashboard/image_registry/tables.py

@@ -20,8 +20,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.utils import compatibility
+from saharadashboard.utils import compatibility
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/image_registry/urls.py

@@ -16,9 +16,9 @@
 
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
-from savannadashboard.image_registry.views import EditTagsView
+from saharadashboard.image_registry.views import EditTagsView
-from savannadashboard.image_registry.views import ImageRegistryView
+from saharadashboard.image_registry.views import ImageRegistryView
-from savannadashboard.image_registry.views import RegisterImageView
+from saharadashboard.image_registry.views import RegisterImageView
 
 urlpatterns = patterns('',
                        url(r'^$', ImageRegistryView.as_view(),

saharadashboard/image_registry/views.py

@@ -20,10 +20,10 @@ from django.core.urlresolvers import reverse_lazy
 from horizon import forms
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.image_registry.forms import EditTagsForm
+from saharadashboard.image_registry.forms import EditTagsForm
-from savannadashboard.image_registry.forms import RegisterImageForm
+from saharadashboard.image_registry.forms import RegisterImageForm
-from savannadashboard.image_registry.tables import ImageRegistryTable
+from saharadashboard.image_registry.tables import ImageRegistryTable
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/job_binaries/forms.py

@@ -28,8 +28,8 @@ from django.utils.translation import ugettext as _
 from horizon import forms
 from horizon import messages
 
+from saharadashboard.api import client as savannaclient
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
 
 import uuid
 

saharadashboard/job_binaries/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class JobBinariesPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class JobBinariesPanel(horizon.Panel):
     slug = 'job_binaries'
 
 
-dashboard.SavannaDashboard.register(JobBinariesPanel)
+dashboard.SaharaDashboard.register(JobBinariesPanel)

saharadashboard/job_binaries/tables.py

@@ -19,8 +19,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
+from saharadashboard.api import client as savannaclient
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/job_binaries/tabs.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/job_binaries/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.job_binaries.views as views
+import saharadashboard.job_binaries.views as views
 
 urlpatterns = patterns('',
                        url(r'^$', views.JobBinariesView.as_view(),

saharadashboard/job_binaries/views.py

@@ -27,11 +27,11 @@ from horizon import forms
 from horizon import tables
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-import savannadashboard.job_binaries.forms as job_binary_forms
+import saharadashboard.job_binaries.forms as job_binary_forms
-from savannadashboard.job_binaries.tables import JobBinariesTable
+from saharadashboard.job_binaries.tables import JobBinariesTable
-import savannadashboard.job_binaries.tabs as _tabs
+import saharadashboard.job_binaries.tabs as _tabs
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/job_executions/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class JobExecutionsPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class JobExecutionsPanel(horizon.Panel):
     slug = 'job_executions'
 
 
-dashboard.SavannaDashboard.register(JobExecutionsPanel)
+dashboard.SaharaDashboard.register(JobExecutionsPanel)

saharadashboard/job_executions/tables.py

@@ -21,8 +21,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.jobs import tables as j_t
+from saharadashboard.jobs import tables as j_t
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/job_executions/tabs.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/job_executions/urls.py

@@ -17,8 +17,8 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.job_executions.views as views
+import saharadashboard.job_executions.views as views
-from savannadashboard.jobs import views as job_views
+from saharadashboard.jobs import views as job_views
 
 
 urlpatterns = patterns('',

saharadashboard/job_executions/views.py

@@ -18,10 +18,10 @@ import logging
 from horizon import tables
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-from savannadashboard.job_executions.tables import JobExecutionsTable
+from saharadashboard.job_executions.tables import JobExecutionsTable
-import savannadashboard.job_executions.tabs as _tabs
+import saharadashboard.job_executions.tabs as _tabs
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/jobs/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class JobsPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class JobsPanel(horizon.Panel):
     slug = 'jobs'
 
 
-dashboard.SavannaDashboard.register(JobsPanel)
+dashboard.SaharaDashboard.register(JobsPanel)

saharadashboard/jobs/tables.py

@@ -21,7 +21,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/jobs/tabs.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/jobs/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.jobs.views as views
+import saharadashboard.jobs.views as views
 
 urlpatterns = patterns('',
                        url(r'^$', views.JobsView.as_view(),

saharadashboard/jobs/views.py

@@ -21,12 +21,12 @@ from horizon import tables
 from horizon import tabs
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-import savannadashboard.jobs.tables as _tables
+import saharadashboard.jobs.tables as _tables
-import savannadashboard.jobs.tabs as _tabs
+import saharadashboard.jobs.tabs as _tabs
-import savannadashboard.jobs.workflows.create as create_flow
+import saharadashboard.jobs.workflows.create as create_flow
-import savannadashboard.jobs.workflows.launch as launch_flow
+import saharadashboard.jobs.workflows.launch as launch_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/jobs/workflows/create.py

@@ -21,7 +21,7 @@ from django.utils.translation import ugettext as _
 from horizon import forms
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/jobs/workflows/launch.py

@@ -21,10 +21,10 @@ from django.utils.translation import ugettext as _
 from horizon import forms
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-import savannadashboard.cluster_templates.workflows.create as t_flows
+import saharadashboard.cluster_templates.workflows.create as t_flows
-import savannadashboard.clusters.workflows.create as c_flow
+import saharadashboard.clusters.workflows.create as c_flow
-import savannadashboard.utils.workflow_helpers as whelpers
+import saharadashboard.utils.workflow_helpers as whelpers
 
 
 LOG = logging.getLogger(__name__)

saharadashboard/nodegroup_templates/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class NodegroupTemplatesPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class NodegroupTemplatesPanel(horizon.Panel):
     slug = 'nodegroup_templates'
 
 
-dashboard.SavannaDashboard.register(NodegroupTemplatesPanel)
+dashboard.SaharaDashboard.register(NodegroupTemplatesPanel)

saharadashboard/nodegroup_templates/tables.py

@@ -19,7 +19,7 @@ import logging
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/nodegroup_templates/tabs.py

@@ -18,8 +18,8 @@ import logging
 from django.utils.translation import ugettext_lazy as _
 from horizon import tabs
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.utils import importutils
+from saharadashboard.utils import importutils
 
 # horizon.api is for backward compatibility with folsom
 nova = importutils.import_any('openstack_dashboard.api.nova',

saharadashboard/nodegroup_templates/urls.py

@@ -17,7 +17,7 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-import savannadashboard.nodegroup_templates.views as views
+import saharadashboard.nodegroup_templates.views as views
 
 urlpatterns = patterns('savanna.nodegroup_templates.views',
                        url(r'^$', views.NodegroupTemplatesView.as_view(),

saharadashboard/nodegroup_templates/views.py

@@ -19,12 +19,12 @@ from horizon import tables
 from horizon import tabs
 from horizon import workflows
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
-import savannadashboard.nodegroup_templates.tables as _tables
+import saharadashboard.nodegroup_templates.tables as _tables
-import savannadashboard.nodegroup_templates.tabs as _tabs
+import saharadashboard.nodegroup_templates.tabs as _tabs
-import savannadashboard.nodegroup_templates.workflows.copy as copy_flow
+import saharadashboard.nodegroup_templates.workflows.copy as copy_flow
-import savannadashboard.nodegroup_templates.workflows.create as create_flow
+import saharadashboard.nodegroup_templates.workflows.create as create_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/nodegroup_templates/workflows/copy.py

@@ -17,8 +17,8 @@ import logging
 
 from django.utils.translation import ugettext as _
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-import savannadashboard.nodegroup_templates.workflows.create as create_flow
+import saharadashboard.nodegroup_templates.workflows.create as create_flow
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/nodegroup_templates/workflows/create.py

@@ -21,12 +21,12 @@ from django.utils.translation import ugettext as _
 from horizon import exceptions
 from horizon import workflows
 
+from saharadashboard.api import client as savannaclient
+from saharadashboard.utils import importutils
 from savannaclient.api import base as api_base
-from savannadashboard.api import client as savannaclient
-from savannadashboard.utils import importutils
 
-import savannadashboard.api.helpers as helpers
+import saharadashboard.api.helpers as helpers
-import savannadashboard.utils.workflow_helpers as whelpers
+import saharadashboard.utils.workflow_helpers as whelpers
 
 
 # horizon.api is for backward compatibility with folsom

saharadashboard/openstack/common/importutils.py

@@ -59,7 +59,7 @@ def import_module(import_str):
 
 
 def import_versioned_module(version, submodule=None):
-    module = 'savannadashboard.v%s' % version
+    module = 'saharadashboard.v%s' % version
     if submodule:
         module = '.'.join((module, submodule))
     return import_module(module)

saharadashboard/plugins/panel.py

@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import horizon
 
-from savannadashboard import dashboard
+from saharadashboard import dashboard
 
 
 class PluginsPanel(horizon.Panel):
@@ -25,4 +25,4 @@ class PluginsPanel(horizon.Panel):
     slug = 'plugins'
 
 
-dashboard.SavannaDashboard.register(PluginsPanel)
+dashboard.SaharaDashboard.register(PluginsPanel)

saharadashboard/plugins/tabs.py

@@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _
 import logging
 
 from horizon import tabs
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
 
 LOG = logging.getLogger(__name__)
 

saharadashboard/plugins/urls.py

@@ -17,8 +17,8 @@
 from django.conf.urls.defaults import patterns
 from django.conf.urls.defaults import url
 
-from savannadashboard.plugins.views import PluginDetailsView
+from saharadashboard.plugins.views import PluginDetailsView
-from savannadashboard.plugins.views import PluginsView
+from saharadashboard.plugins.views import PluginsView
 
 
 urlpatterns = patterns('',

saharadashboard/plugins/views.py

@@ -18,9 +18,9 @@ from horizon import tables
 from horizon import tabs
 import logging
 
-from savannadashboard.api.client import client as savannaclient
+from saharadashboard.api.client import client as savannaclient
-from savannadashboard.plugins.tables import PluginsTable
+from saharadashboard.plugins.tables import PluginsTable
-from savannadashboard.plugins.tabs import PluginDetailsTabs
+from saharadashboard.plugins.tabs import PluginDetailsTabs
 
 LOG = logging.getLogger(__name__)