Move the savanna subdir to sahara

Rename the subdirectory and replace all instances
of "import savanna" with "import sahara" and all
instances of "from savanna" with "from sahara".

* Replaced mock patches like mock.patch('savanna...
* Updated config generator script
* Renamed entry points in setup.cfg
* Hacking checks also fixed
* Manual renaming in alembic scripts to force work migrations
* Fix doc building
* Renamed itests directories
* Some changes in gitignore
* Removed locale dir after rebase

Co-Authored-By: Alexander Ignatov <aignatov@mirantis.com>

Change-Id: Ia77252c24046c3e7283c0a7b96d11636020b949c
Partially implements: blueprint savanna-renaming-service

.coveragerc

@@ -1,13 +1,13 @@
 [run]
 branch = True
-source = savanna
+source = sahara
 omit =
  */openstack/common/*
  .tox/*
- savanna/tests/*
+ sahara/tests/*
 
 [paths]
-source = savanna
+source = sahara
 
 [report]
 ignore-errors = True

.gitignore

@@ -35,15 +35,18 @@ etc/local.cfg
 etc/savanna/*.conf
 etc/savanna/*.topology
 etc/savanna.conf
+etc/sahara/*.conf
+etc/sahara/*.topology
+etc/sahara.conf
 ChangeLog
-savanna/tests/integration/configs/itest.conf
+sahara/tests/integration/configs/itest.conf
 cscope.out
 tools/lintstack.head.py
 tools/pylint_exceptions
-savanna/tests/cover
-savanna/tests/coverage.xml
+sahara/tests/cover
+sahara/tests/coverage.xml
 cover
 htmlcov
-savanna/openstack/common/db/savanna.sqlite
+sahara/openstack/common/db/sahara.sqlite
 .testrepository
 AUTHORS

MANIFEST.in

@@ -2,36 +2,36 @@ include AUTHORS
 include README.rst
 include ChangeLog
 include LICENSE
-include savanna/db/migration/README
-include savanna/db/migration/alembic.ini
-include savanna/db/migration/alembic_migrations/script.py.mako
-include savanna/db/migration/alembic_migrations/versions/README
+include sahara/db/migration/README
+include sahara/db/migration/alembic.ini
+include sahara/db/migration/alembic_migrations/script.py.mako
+include sahara/db/migration/alembic_migrations/versions/README
 
-recursive-include savanna/locale *
+recursive-include sahara/locale *
 
-include savanna/plugins/intel/v2_5_1/resources/*.xml
-include savanna/plugins/intel/v2_5_1/resources/*.xsd
-include savanna/plugins/intel/v3_0_2/resources/*.xml
-include savanna/plugins/intel/v3_0_2/resources/*.xsd
-include savanna/plugins/vanilla/v1_2_1/resources/*.xml
-include savanna/plugins/vanilla/v1_2_1/resources/*.sh
-include savanna/plugins/vanilla/v1_2_1/resources/*.sql
-include savanna/plugins/vanilla/v2_3_0/resources/*.xml
-include savanna/plugins/vanilla/v2_3_0/resources/*.sh
-include savanna/plugins/vanilla/v2_3_0/resources/*.sql
-include savanna/plugins/vanilla/v2_3_0/resources/*.template
-include savanna/plugins/hdp/versions/1_3_2/resources/*.template
-include savanna/plugins/hdp/versions/1_3_2/resources/*.json
-include savanna/plugins/hdp/versions/2_0/resources/*.template
-include savanna/plugins/hdp/versions/2_0/resources/*.json
-include savanna/resources/*.heat
-include savanna/service/edp/resources/*.xml
-include savanna/swift/resources/*.xml
-include savanna/tests/unit/plugins/vanilla/v2_3_0/resources/*.txt
-include savanna/tests/unit/resources/*.heat
-include savanna/tests/unit/resources/*.xml
-include savanna/tests/unit/resources/*.txt
-include savanna/topology/resources/*.xml
+include sahara/plugins/intel/v2_5_1/resources/*.xml
+include sahara/plugins/intel/v2_5_1/resources/*.xsd
+include sahara/plugins/intel/v3_0_2/resources/*.xml
+include sahara/plugins/intel/v3_0_2/resources/*.xsd
+include sahara/plugins/vanilla/v1_2_1/resources/*.xml
+include sahara/plugins/vanilla/v1_2_1/resources/*.sh
+include sahara/plugins/vanilla/v1_2_1/resources/*.sql
+include sahara/plugins/vanilla/v2_3_0/resources/*.xml
+include sahara/plugins/vanilla/v2_3_0/resources/*.sh
+include sahara/plugins/vanilla/v2_3_0/resources/*.sql
+include sahara/plugins/vanilla/v2_3_0/resources/*.template
+include sahara/plugins/hdp/versions/1_3_2/resources/*.template
+include sahara/plugins/hdp/versions/1_3_2/resources/*.json
+include sahara/plugins/hdp/versions/2_0/resources/*.template
+include sahara/plugins/hdp/versions/2_0/resources/*.json
+include sahara/resources/*.heat
+include sahara/service/edp/resources/*.xml
+include sahara/swift/resources/*.xml
+include sahara/tests/unit/plugins/vanilla/v2_3_0/resources/*.txt
+include sahara/tests/unit/resources/*.heat
+include sahara/tests/unit/resources/*.xml
+include sahara/tests/unit/resources/*.txt
+include sahara/topology/resources/*.xml
 
 exclude .gitignore
 exclude .gitreview

doc/source/conf.py

@@ -25,7 +25,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('../../savanna'))
+sys.path.insert(0, os.path.abspath('../../sahara'))
 sys.path.append(os.path.abspath('..'))
 sys.path.append(os.path.abspath('../bin'))
 
@@ -63,10 +63,10 @@ copyright = u'2014, OpenStack Foundation'
 # built documents.
 #
 # Version info
-from savanna.version import version_info as savanna_version
-release = savanna_version.release_string()
+from sahara.version import version_info as s_version
+release = s_version.release_string()
 # The short X.Y version.
-version = savanna_version.version_string()
+version = s_version.version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -208,7 +208,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'savannadoc.tex', u'Savanna',
+    ('index', 'saharadoc.tex', u'Sahara',
      u'OpenStack Foundation', 'manual'),
 ]
 

etc/sahara/sahara.conf.sample

@@ -0,0 +1,431 @@
+[DEFAULT]
+
+#
+# Options defined in sahara.config
+#
+
+# Hostname or IP address that will be used to listen on.
+# (string value)
+#host=
+
+# Port that will be used to listen on. (integer value)
+#port=8386
+
+# Log request/response exchange details: environ, headers and
+# bodies. (boolean value)
+#log_exchange=false
+
+# Maximum length of job binary data in kilobytes that may be
+# stored or retrieved in a single operation (integer value)
+#job_binary_max_KB=5120
+
+# If set to True, Savanna will use floating IPs to communicate
+# with instances. To make sure that all instances have
+# floating IPs assigned in Nova Network set
+# "auto_assign_floating_ip=True" in nova.conf. If Neutron is
+# used for networking, make sure that all Node Groups have
+# "floating_ip_pool" parameter defined. (boolean value)
+#use_floating_ips=true
+
+# The suffix of the node's FQDN. In nova-network that is the
+# dhcp_domain config parameter. (string value)
+#node_domain=novalocal
+
+# Use Neutron Networking (False indicates the use of Nova
+# networking). (boolean value)
+#use_neutron=false
+
+# Use network namespaces for communication (only valid to use
+# in conjunction with use_neutron=True). (boolean value)
+#use_namespaces=false
+
+
+#
+# Options defined in sahara.main
+#
+
+# Protocol used to access OpenStack Identity service. (string
+# value)
+#os_auth_protocol=http
+
+# IP or hostname of machine on which OpenStack Identity
+# service is located. (string value)
+#os_auth_host=127.0.0.1
+
+# Port of OpenStack Identity service. (string value)
+#os_auth_port=5000
+
+# This OpenStack user is used to verify provided tokens. The
+# user must have admin role in <os_admin_tenant_name> tenant.
+# (string value)
+#os_admin_username=admin
+
+# Password of the admin user. (string value)
+#os_admin_password=nova
+
+# Name of tenant where the user is admin. (string value)
+#os_admin_tenant_name=admin
+
+# An engine which will be used to provision infrastructure for
+# Hadoop cluster. (string value)
+#infrastructure_engine=direct
+
+# A method for Savanna to execute commands on VMs. (string
+# value)
+#remote=ssh
+
+
+#
+# Options defined in sahara.db.base
+#
+
+# Driver to use for database access. (string value)
+#db_driver=sahara.db
+
+
+#
+# Options defined in sahara.openstack.common.db.sqlalchemy.session
+#
+
+# The file name to use with SQLite (string value)
+#sqlite_db=savanna.sqlite
+
+# If True, SQLite uses synchronous mode (boolean value)
+#sqlite_synchronous=true
+
+
+#
+# Options defined in sahara.openstack.common.eventlet_backdoor
+#
+
+# Enable eventlet backdoor.  Acceptable values are 0, <port>,
+# and <start>:<end>, where 0 results in listening on a random
+# tcp port number; <port> results in listening on the
+# specified port number (and not enabling backdoor if that
+# port is in use); and <start>:<end> results in listening on
+# the smallest unused port number within the specified range
+# of port numbers.  The chosen port is displayed in the
+# service's log file. (string value)
+#backdoor_port=<None>
+
+
+#
+# Options defined in sahara.openstack.common.lockutils
+#
+
+# Whether to disable inter-process locks (boolean value)
+#disable_process_locking=false
+
+# Directory to use for lock files. (string value)
+#lock_path=<None>
+
+
+#
+# Options defined in sahara.openstack.common.log
+#
+
+# Print debugging output (set logging level to DEBUG instead
+# of default WARNING level). (boolean value)
+#debug=false
+
+# Print more verbose output (set logging level to INFO instead
+# of default WARNING level). (boolean value)
+#verbose=false
+
+# Log output to standard error (boolean value)
+#use_stderr=true
+
+# Format string to use for log messages with context (string
+# value)
+#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
+
+# Format string to use for log messages without context
+# (string value)
+#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
+
+# Data to append to log format when level is DEBUG (string
+# value)
+#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
+
+# Prefix each line of exception output with this format
+# (string value)
+#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
+
+# List of logger=LEVEL pairs (list value)
+#default_log_levels=amqplib=WARN,qpid.messaging=INFO,stevedore=INFO,eventlet.wsgi.server=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,paramiko=WARN,requests=WARN,iso8601=WARN
+
+# Publish error events (boolean value)
+#publish_errors=false
+
+# Make deprecations fatal (boolean value)
+#fatal_deprecations=false
+
+# If an instance is passed with the log message, format it
+# like this (string value)
+#instance_format="[instance: %(uuid)s] "
+
+# If an instance UUID is passed with the log message, format
+# it like this (string value)
+#instance_uuid_format="[instance: %(uuid)s] "
+
+# The name of logging configuration file. It does not disable
+# existing loggers, but just appends specified logging
+# configuration to any other existing logging options. Please
+# see the Python logging module documentation for details on
+# logging configuration files. (string value)
+# Deprecated group/name - [DEFAULT]/log_config
+#log_config_append=<None>
+
+# DEPRECATED. A logging.Formatter log message format string
+# which may use any of the available logging.LogRecord
+# attributes. This option is deprecated.  Please use
+# logging_context_format_string and
+# logging_default_format_string instead. (string value)
+#log_format=<None>
+
+# Format string for %%(asctime)s in log records. Default:
+# %(default)s (string value)
+#log_date_format=%Y-%m-%d %H:%M:%S
+
+# (Optional) Name of log file to output to. If no default is
+# set, logging will go to stdout. (string value)
+# Deprecated group/name - [DEFAULT]/logfile
+#log_file=<None>
+
+# (Optional) The base directory used for relative --log-file
+# paths (string value)
+# Deprecated group/name - [DEFAULT]/logdir
+#log_dir=<None>
+
+# Use syslog for logging. Existing syslog format is DEPRECATED
+# during I, and then will be changed in J to honor RFC5424
+# (boolean value)
+#use_syslog=false
+
+# (Optional) Use syslog rfc5424 format for logging. If
+# enabled, will add APP-NAME (RFC5424) before the MSG part of
+# the syslog message.  The old format without APP-NAME is
+# deprecated in I, and will be removed in J. (boolean value)
+#use_syslog_rfc_format=false
+
+# Syslog facility to receive log lines (string value)
+#syslog_log_facility=LOG_USER
+
+
+#
+# Options defined in sahara.openstack.common.periodic_task
+#
+
+# Some periodic tasks can be run in a separate process. Should
+# we run them here? (boolean value)
+#run_external_periodic_tasks=true
+
+
+#
+# Options defined in sahara.plugins.base
+#
+
+# List of plugins to be loaded. Savanna preserves the order of
+# the list when returning it. (list value)
+#plugins=vanilla,hdp,idh
+
+
+#
+# Options defined in sahara.service.edp.job_manager
+#
+
+# Postfix for storing jobs in hdfs. Will be added to
+# /user/hadoop/. (string value)
+#job_workflow_postfix=
+
+
+#
+# Options defined in sahara.service.periodic
+#
+
+# Enable periodic tasks. (boolean value)
+#periodic_enable=true
+
+# Range in seconds to randomly delay when starting the
+# periodic task scheduler to reduce stampeding. (Disable by
+# setting to 0). (integer value)
+#periodic_fuzzy_delay=60
+
+# Max interval size between periodic tasks execution in
+# seconds (integer value)
+#periodic_interval_max=60
+
+# Minimal "lifetime" in seconds for a transient cluster.
+# Cluster is guarantied to be "alive" within this time period.
+# (integer value)
+#min_transient_cluster_active_time=0
+
+
+#
+# Options defined in sahara.topology.topology_helper
+#
+
+# Enables data locality for hadoop cluster.
+# Also enables data locality for Swift used by hadoop.
+# If enabled, 'compute_topology' and 'swift_topology'
+# configuration parameters should point to OpenStack and Swift
+# topology correspondingly. (boolean value)
+#enable_data_locality=false
+
+# Enables four-level topology for data locality.
+# Works only if corresponding plugin supports such mode.
+# (boolean value)
+#enable_hypervisor_awareness=true
+
+# File with nova compute topology.                 It should
+# contain mapping between nova computes and racks.
+# File format:                 compute1 /rack1
+# compute2 /rack2                 compute3 /rack2 (string
+# value)
+#compute_topology_file=etc/savanna/compute.topology
+
+# File with Swift topology.                 It should contain
+# mapping between Swift nodes and racks.                 File
+# format:                 node1 /rack1                 node2
+# /rack2                 node3 /rack2 (string value)
+#swift_topology_file=etc/savanna/swift.topology
+
+
+#
+# Options defined in sahara.utils.openstack.keystone
+#
+
+# Enables Savanna to use Keystone API v3. If that flag is
+# disabled, per-job clusters will not be terminated
+# automatically. (boolean value)
+#use_identity_api_v3=true
+
+
+#
+# Options defined in sahara.utils.remote
+#
+
+# A server to which guest agent running on a VM should connect
+# to. The parameter is needed only if agent remote is enabled.
+# (string value)
+#rpc_server_host=<None>
+
+# Maximum number of remote operations that will be running at
+# the same time. Note that each remote operation requires its
+# own process to run. (integer value)
+#global_remote_threshold=100
+
+# The same as global_remote_threshold, but for a single
+# cluster. (integer value)
+#cluster_remote_threshold=70
+
+
+[conductor]
+
+#
+# Options defined in sahara.conductor.api
+#
+
+# Perform savanna-conductor operations locally. (boolean
+# value)
+#use_local=true
+
+
+[database]
+
+#
+# Options defined in sahara.openstack.common.db.api
+#
+
+# The backend to use for db (string value)
+# Deprecated group/name - [DEFAULT]/db_backend
+#backend=sqlalchemy
+
+
+#
+# Options defined in sahara.openstack.common.db.sqlalchemy.session
+#
+
+# The SQLAlchemy connection string used to connect to the
+# database (string value)
+# Deprecated group/name - [DEFAULT]/sql_connection
+# Deprecated group/name - [DATABASE]/sql_connection
+# Deprecated group/name - [sql]/connection
+#connection=sqlite:////sahara/openstack/common/db/$sqlite_db
+
+# The SQLAlchemy connection string used to connect to the
+# slave database (string value)
+#slave_connection=
+
+# Timeout before idle sql connections are reaped (integer
+# value)
+# Deprecated group/name - [DEFAULT]/sql_idle_timeout
+# Deprecated group/name - [DATABASE]/sql_idle_timeout
+# Deprecated group/name - [sql]/idle_timeout
+#idle_timeout=3600
+
+# Minimum number of SQL connections to keep open in a pool
+# (integer value)
+# Deprecated group/name - [DEFAULT]/sql_min_pool_size
+# Deprecated group/name - [DATABASE]/sql_min_pool_size
+#min_pool_size=1
+
+# Maximum number of SQL connections to keep open in a pool
+# (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_pool_size
+# Deprecated group/name - [DATABASE]/sql_max_pool_size
+#max_pool_size=<None>
+
+# Maximum db connection retries during startup. (setting -1
+# implies an infinite retry count) (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_retries
+# Deprecated group/name - [DATABASE]/sql_max_retries
+#max_retries=10
+
+# Interval between retries of opening a sql connection
+# (integer value)
+# Deprecated group/name - [DEFAULT]/sql_retry_interval
+# Deprecated group/name - [DATABASE]/reconnect_interval
+#retry_interval=10
+
+# If set, use this value for max_overflow with sqlalchemy
+# (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_overflow
+# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
+#max_overflow=<None>
+
+# Verbosity of SQL debugging information. 0=None,
+# 100=Everything (integer value)
+# Deprecated group/name - [DEFAULT]/sql_connection_debug
+#connection_debug=0
+
+# Add python stack traces to SQL as comment strings (boolean
+# value)
+# Deprecated group/name - [DEFAULT]/sql_connection_trace
+#connection_trace=false
+
+# If set, use this value for pool_timeout with sqlalchemy
+# (integer value)
+# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
+#pool_timeout=<None>
+
+
+[ssl]
+
+#
+# Options defined in sahara.openstack.common.sslutils
+#
+
+# CA certificate file to use to verify connecting clients
+# (string value)
+#ca_file=<None>
+
+# Certificate file to use when starting the server securely
+# (string value)
+#cert_file=<None>
+
+# Private key file to use when starting the server securely
+# (string value)
+#key_file=<None>
+
+

run_tests.sh

@@ -81,7 +81,7 @@ function run_tests {
   set +e
   TESTRTESTS="$TESTRTESTS $testrargs"
   echo "Running \`${wrapper} $TESTRTESTS\`"
-  export DISCOVER_DIRECTORY=savanna/tests/unit
+  export DISCOVER_DIRECTORY=sahara/tests/unit
   ${wrapper} $TESTRTESTS
   RESULT=$?
   set -e

sahara/api/base.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import savanna.utils.api as u
+import sahara.utils.api as u
 
 
 def not_implemented():

sahara/api/v10.py

@@ -13,17 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import savanna.api.base as b
-from savanna.openstack.common import log as logging
-from savanna.service import api
-from savanna.service import validation as v
-from savanna.service.validations import cluster_templates as v_ct
-from savanna.service.validations import clusters as v_c
-from savanna.service.validations import clusters_scaling as v_c_s
-from savanna.service.validations import images as v_images
-from savanna.service.validations import node_group_templates as v_ngt
-from savanna.service.validations import plugins as v_p
-import savanna.utils.api as u
+import sahara.api.base as b
+from sahara.openstack.common import log as logging
+from sahara.service import api
+from sahara.service import validation as v
+from sahara.service.validations import cluster_templates as v_ct
+from sahara.service.validations import clusters as v_c
+from sahara.service.validations import clusters_scaling as v_c_s
+from sahara.service.validations import images as v_images
+from sahara.service.validations import node_group_templates as v_ngt
+from sahara.service.validations import plugins as v_p
+import sahara.utils.api as u
 
 
 LOG = logging.getLogger(__name__)

sahara/api/v11.py

@@ -13,15 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from savanna.openstack.common import log as logging
-from savanna.service.edp import api
-from savanna.service import validation as v
-from savanna.service.validations.edp import data_source as v_d_s
-from savanna.service.validations.edp import job as v_j
-from savanna.service.validations.edp import job_binary as v_j_b
-from savanna.service.validations.edp import job_binary_internal as v_j_b_i
-from savanna.service.validations.edp import job_executor as v_j_e
-import savanna.utils.api as u
+from sahara.openstack.common import log as logging
+from sahara.service.edp import api
+from sahara.service import validation as v
+from sahara.service.validations.edp import data_source as v_d_s
+from sahara.service.validations.edp import job as v_j
+from sahara.service.validations.edp import job_binary as v_j_b
+from sahara.service.validations.edp import job_binary_internal as v_j_b_i
+from sahara.service.validations.edp import job_executor as v_j_e
+import sahara.utils.api as u
 
 
 LOG = logging.getLogger(__name__)

sahara/cli/savanna_api.py

@@ -30,17 +30,17 @@ 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)
 
-gettext.install('sahara', unicode=1)
+gettext.install('savanna', unicode=1)
 
 
-from savanna import config
-from savanna.db import api as db_api
-import savanna.main as server
-from savanna.openstack.common import log as logging
+from sahara import config
+from sahara.db import api as db_api
+import sahara.main as server
+from sahara.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

sahara/conductor/__init__.py

@@ -15,7 +15,7 @@
 
 from oslo.config import cfg
 
-from savanna.conductor import api as conductor_api
+from sahara.conductor import api as conductor_api
 
 
 def Api(use_local=True, **kwargs):

sahara/conductor/api.py

@@ -17,9 +17,9 @@
 
 from oslo.config import cfg
 
-from savanna.conductor import manager
-from savanna.conductor import resource as r
-from savanna.openstack.common import log as logging
+from sahara.conductor import manager
+from sahara.conductor import resource as r
+from sahara.openstack.common import log as logging
 
 
 conductor_opts = [

sahara/conductor/manager.py

@@ -17,9 +17,9 @@
 
 import copy
 
-from savanna.db import base as db_base
-from savanna.utils import configs
-from savanna.utils import crypto
+from sahara.db import base as db_base
+from sahara.utils import configs
+from sahara.utils import crypto
 
 
 CLUSTER_DEFAULTS = {

sahara/conductor/objects.py

@@ -23,12 +23,12 @@ fields via docstrings and contains implementation of helper methods.
 
 from oslo.config import cfg
 
-from savanna.utils import configs
-from savanna.utils import remote
+from sahara.utils import configs
+from sahara.utils import remote
 
 
 CONF = cfg.CONF
-CONF.import_opt('node_domain', 'savanna.config')
+CONF.import_opt('node_domain', 'sahara.config')
 
 
 class Cluster(object):

sahara/conductor/resource.py

@@ -27,8 +27,8 @@ import datetime
 
 import six
 
-from savanna.conductor import objects
-from savanna.utils import types
+from sahara.conductor import objects
+from sahara.utils import types
 
 
 def wrap(resource_class):

sahara/config.py

@@ -15,8 +15,8 @@
 
 from oslo.config import cfg
 
-from savanna.openstack.common import log
-from savanna import version
+from sahara.openstack.common import log
+from sahara import version
 
 
 cli_opts = [

sahara/context.py

@@ -21,8 +21,8 @@ from eventlet import greenpool
 from eventlet import semaphore
 from oslo.config import cfg
 
-from savanna import exceptions
-from savanna.openstack.common import log as logging
+from sahara import exceptions
+from sahara.openstack.common import log as logging
 
 
 CONF = cfg.CONF

sahara/db/__init__.py

@@ -17,4 +17,4 @@
 DB abstraction for Sahara
 """
 
-from savanna.db.api import *  # noqa
+from sahara.db.api import *  # noqa

sahara/db/api.py

@@ -33,14 +33,14 @@ interface.
 
 from oslo.config import cfg
 
-from savanna.openstack.common.db import api as db_api
-from savanna.openstack.common import log as logging
+from sahara.openstack.common.db import api as db_api
+from sahara.openstack.common import log as logging
 
 
 CONF = cfg.CONF
 
 _BACKEND_MAPPING = {
-    'sqlalchemy': 'savanna.db.sqlalchemy.api',
+    'sqlalchemy': 'sahara.db.sqlalchemy.api',
 }
 
 IMPL = db_api.DBAPI(backend_mapping=_BACKEND_MAPPING)

sahara/db/base.py

@@ -17,11 +17,11 @@
 
 from oslo.config import cfg
 
-from savanna.openstack.common import importutils
+from sahara.openstack.common import importutils
 
 
 db_driver_opt = cfg.StrOpt('db_driver',
-                           default='savanna.db',
+                           default='sahara.db',
                            help='Driver to use for database access.')
 
 CONF = cfg.CONF

sahara/db/migration/alembic.ini

@@ -2,7 +2,7 @@
 
 [alembic]
 # path to migration scripts
-script_location = savanna/db/migration/alembic_migrations
+script_location = sahara/db/migration/alembic_migrations
 
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s

sahara/db/migration/alembic_migrations/env.py

@@ -22,11 +22,11 @@ from alembic import context
 from sqlalchemy import create_engine
 from sqlalchemy import pool
 
-from savanna.db.sqlalchemy import model_base
-from savanna.openstack.common import importutils
+from sahara.db.sqlalchemy import model_base
+from sahara.openstack.common import importutils
 
 
-importutils.import_module('savanna.db.sqlalchemy.models')
+importutils.import_module('sahara.db.sqlalchemy.models')
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

sahara/db/migration/alembic_migrations/versions/001_initial.py

@@ -28,7 +28,7 @@ down_revision = None
 from alembic import op
 import sqlalchemy as sa
 
-from savanna.db.sqlalchemy import types as st
+from sahara.db.sqlalchemy import types as st
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'

sahara/db/migration/alembic_migrations/versions/002_add_job_exec_extra.py

@@ -28,7 +28,7 @@ down_revision = '001'
 from alembic import op
 import sqlalchemy as sa
 
-from savanna.db.sqlalchemy import types as st
+from sahara.db.sqlalchemy import types as st
 
 
 def upgrade():

sahara/db/migration/cli.py

@@ -22,7 +22,7 @@ from oslo.config import cfg
 
 
 CONF = cfg.CONF
-CONF.import_opt("connection", "savanna.openstack.common.db.sqlalchemy.session",
+CONF.import_opt("connection", "sahara.openstack.common.db.sqlalchemy.session",
                 group="database")
 
 
@@ -103,9 +103,9 @@ def main():
         os.path.join(os.path.dirname(__file__), 'alembic.ini')
     )
     config.set_main_option('script_location',
-                           'savanna.db.migration:alembic_migrations')
+                           'sahara.db.migration:alembic_migrations')
     # attach the Sahara conf to the Alembic conf
     config.savanna_config = CONF
 
-    CONF(project='savanna')
+    CONF(project='sahara')
     CONF.command.func(config, CONF.command.name)

sahara/db/sqlalchemy/api.py

@@ -20,11 +20,11 @@ import sys
 from oslo.config import cfg
 import sqlalchemy as sa
 
-from savanna.db.sqlalchemy import models as m
-from savanna import exceptions as ex
-from savanna.openstack.common.db import exception as db_exc
-from savanna.openstack.common.db.sqlalchemy import session as db_session
-from savanna.openstack.common import log as logging
+from sahara.db.sqlalchemy import models as m
+from sahara import exceptions as ex
+from sahara.openstack.common.db import exception as db_exc
+from sahara.openstack.common.db.sqlalchemy import session as db_session
+from sahara.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

sahara/db/sqlalchemy/model_base.py

@@ -16,7 +16,7 @@
 from sqlalchemy.ext import declarative
 from sqlalchemy.orm import attributes
 
-from savanna.openstack.common.db.sqlalchemy import models as oslo_models
+from sahara.openstack.common.db.sqlalchemy import models as oslo_models
 
 
 class _SaharaBase(oslo_models.ModelBase, oslo_models.TimestampMixin):

sahara/db/sqlalchemy/models.py

@@ -19,8 +19,8 @@ import six
 import sqlalchemy as sa
 from sqlalchemy.orm import relationship
 
-from savanna.db.sqlalchemy import model_base as mb
-from savanna.db.sqlalchemy import types as st
+from sahara.db.sqlalchemy import model_base as mb
+from sahara.db.sqlalchemy import types as st
 
 
 ## Helpers

sahara/db/sqlalchemy/types.py

@@ -16,7 +16,7 @@
 import sqlalchemy as sa
 from sqlalchemy.ext import mutable
 
-from savanna.openstack.common import jsonutils
+from sahara.openstack.common import jsonutils
 
 
 class JsonEncoded(sa.TypeDecorator):

sahara/locale/savanna.pot

@@ -0,0 +1,406 @@
+# Translations template for sahara.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the sahara project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: sahara "
+"jenkins.sahara.propose.translation.update.153\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-02-03 06:09+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: sahara/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
+#: sahara/openstack/common/exception.py:103
+msgid "Uncaught exception"
+msgstr ""
+
+#: sahara/openstack/common/excutils.py:62
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: sahara/openstack/common/excutils.py:91
+#, python-format
+msgid "Unexpected exception occurred %d time(s)... retrying."
+msgstr ""
+
+#: sahara/openstack/common/fileutils.py:63
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: sahara/openstack/common/gettextutils.py:263
+msgid "Message objects do not support addition."
+msgstr ""
+
+#: sahara/openstack/common/gettextutils.py:272
+msgid ""
+"Message objects do not support str() because they may contain non-ascii "
+"characters. Please use unicode() or translate() instead."
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:103
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:168
+#, python-format
+msgid "Got semaphore \"%(lock)s\""
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:177
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\""
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:187
+#, python-format
+msgid "Created lock path: %s"
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:205
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s"
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:209
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s"
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:247
+#, python-format
+msgid "Got semaphore / lock \"%(function)s\""
+msgstr ""
+
+#: sahara/openstack/common/lockutils.py:251
+#, python-format
+msgid "Semaphore / lock released \"%(function)s\""
+msgstr ""
+
+#: sahara/openstack/common/log.py:313
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: sahara/openstack/common/log.py:416
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: sahara/openstack/common/log.py:467
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: sahara/openstack/common/log.py:654
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: sahara/openstack/common/loopingcall.py:82
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: sahara/openstack/common/loopingcall.py:89
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: sahara/openstack/common/loopingcall.py:129
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: sahara/openstack/common/loopingcall.py:136
+msgid "in dynamic looping call"
+msgstr ""
+
+#: sahara/openstack/common/periodic_task.py:41
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: sahara/openstack/common/periodic_task.py:132
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: sahara/openstack/common/periodic_task.py:137
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: sahara/openstack/common/periodic_task.py:175
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: sahara/openstack/common/periodic_task.py:184
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:58
+msgid "Unexpected error while running command."
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:61
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:139
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:145
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:154
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:187
+#: sahara/openstack/common/processutils.py:259
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:199
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:238
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:240
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: sahara/openstack/common/processutils.py:244
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: sahara/openstack/common/service.py:166
+#: sahara/openstack/common/service.py:384
+msgid "Full set of CONF:"
+msgstr ""
+
+#: sahara/openstack/common/service.py:175
+#: sahara/openstack/common/service.py:269
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: sahara/openstack/common/service.py:187
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: sahara/openstack/common/service.py:238
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: sahara/openstack/common/service.py:275
+msgid "Unhandled exception"
+msgstr ""
+
+#: sahara/openstack/common/service.py:308
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: sahara/openstack/common/service.py:327
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: sahara/openstack/common/service.py:337
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: sahara/openstack/common/service.py:354
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: sahara/openstack/common/service.py:358
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: sahara/openstack/common/service.py:362
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: sahara/openstack/common/service.py:392
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: sahara/openstack/common/service.py:410
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: sahara/openstack/common/sslutils.py:52
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: sahara/openstack/common/sslutils.py:55
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: sahara/openstack/common/sslutils.py:58
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: sahara/openstack/common/sslutils.py:61
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: sahara/openstack/common/sslutils.py:100
+#, python-format
+msgid "Invalid SSL version : %s"
+msgstr ""
+
+#: sahara/openstack/common/wsgi.py:187
+msgid "cannot understand JSON"
+msgstr ""
+
+#: sahara/openstack/common/wsgi.py:211
+msgid "cannot understand XML"
+msgstr ""
+
+#: sahara/openstack/common/crypto/utils.py:29
+msgid "An unknown error occurred in crypto utils."
+msgstr ""
+
+#: sahara/openstack/common/crypto/utils.py:36
+#, python-format
+msgid "Block size of %(given)d is too big, max = %(maximum)d"
+msgstr ""
+
+#: sahara/openstack/common/crypto/utils.py:45
+#, python-format
+msgid "Length of %(given)d is too long, max = %(maximum)d"
+msgstr ""
+
+#: sahara/openstack/common/db/exception.py:42
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/migration.py:191
+msgid "version should be an integer"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/migration.py:214
+#, python-format
+msgid ""
+"Tables \"%s\" have non utf8 collation, please make sure all tables are "
+"CHARSET=utf8"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/migration.py:238
+msgid ""
+"The database is not under version control, but has tables. Please stamp "
+"the current version of the schema manually."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/session.py:596
+msgid "DB exception wrapped."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/session.py:665
+#, python-format
+msgid "Database server has gone away: %s"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/session.py:743
+msgid ""
+"This application has not enabled MySQL traditional mode, which means "
+"silent data corruption may occur. Please encourage the application "
+"developers to enable this mode."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/session.py:767
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/test_migrations.py:63
+#, python-format
+msgid "Got lock \"%s\""
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/test_migrations.py:66
+#, python-format
+msgid "Lock released \"%s\""
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:58
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:97
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:119
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:194
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:200
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:280
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: sahara/openstack/common/db/sqlalchemy/utils.py:301
+msgid "Unsupported id columns type"
+msgstr ""
+

sahara/main.py

@@ -21,18 +21,18 @@ import six
 import stevedore
 from werkzeug import exceptions as werkzeug_exceptions
 
-from savanna.api import v10 as api_v10
-from savanna.api import v11 as api_v11
-from savanna import context
-from savanna.middleware import auth_valid
-from savanna.middleware import log_exchange
-from savanna.openstack.common import log
-from savanna.plugins import base as plugins_base
-from savanna.service import api as service_api
-from savanna.service import periodic
-from savanna.utils import api as api_utils
-from savanna.utils import patches
-from savanna.utils import remote
+from sahara.api import v10 as api_v10
+from sahara.api import v11 as api_v11
+from sahara import context
+from sahara.middleware import auth_valid
+from sahara.middleware import log_exchange
+from sahara.openstack.common import log
+from sahara.plugins import base as plugins_base
+from sahara.service import api as service_api
+from sahara.service import periodic
+from sahara.utils import api as api_utils
+from sahara.utils import patches
+from sahara.utils import remote
 
 
 LOG = log.getLogger(__name__)
@@ -85,7 +85,7 @@ def make_app():
 
     Entry point for Sahara REST API server
     """
-    app = flask.Flask('savanna.api')
+    app = flask.Flask('sahara.api')
 
     @app.route('/', methods=['GET'])
     def version_list():

sahara/middleware/auth_valid.py

@@ -15,8 +15,8 @@
 
 import webob.exc as ex
 
-from savanna.openstack.common import log as logging
-import savanna.openstack.commons as commons
+from sahara.openstack.common import log as logging
+import sahara.openstack.commons as commons
 
 
 LOG = logging.getLogger(__name__)

sahara/middleware/log_exchange.py

@@ -22,7 +22,7 @@ import sys
 
 import webob.dec
 
-from savanna.openstack.common.middleware import base
+from sahara.openstack.common.middleware import base
 
 
 class LogExchange(base.Middleware):

sahara/openstack/common/config/generator.py

@@ -31,8 +31,8 @@ from oslo.config import cfg
 import six
 import stevedore.named
 
-from savanna.openstack.common import gettextutils
-from savanna.openstack.common import importutils
+from sahara.openstack.common import gettextutils
+from sahara.openstack.common import importutils
 
 gettextutils.install('savanna')
 

sahara/openstack/common/crypto/utils.py

@@ -19,8 +19,8 @@ import base64
 from Crypto.Hash import HMAC
 from Crypto import Random
 
-from savanna.openstack.common.gettextutils import _  # noqa
-from savanna.openstack.common import importutils
+from sahara.openstack.common.gettextutils import _  # noqa
+from sahara.openstack.common import importutils
 
 
 class CryptoutilsException(Exception):

sahara/openstack/common/db/api.py

@@ -27,7 +27,7 @@ API methods.
 
 from oslo.config import cfg
 
-from savanna.openstack.common import importutils
+from sahara.openstack.common import importutils
 
 
 db_opts = [

sahara/openstack/common/db/exception.py

@@ -16,7 +16,7 @@
 
 """DB related custom exceptions."""
 
-from savanna.openstack.common.gettextutils import _
+from sahara.openstack.common.gettextutils import _
 
 
 class DBError(Exception):

sahara/openstack/common/db/sqlalchemy/migration.py

@@ -50,9 +50,9 @@ from migrate.versioning.repository import Repository
 import sqlalchemy
 from sqlalchemy.schema import UniqueConstraint
 
-from savanna.openstack.common.db import exception
-from savanna.openstack.common.db.sqlalchemy import session as db_session
-from savanna.openstack.common.gettextutils import _
+from sahara.openstack.common.db import exception
+from sahara.openstack.common.db.sqlalchemy import session as db_session
+from sahara.openstack.common.gettextutils import _
 
 
 get_engine = db_session.get_engine

sahara/openstack/common/db/sqlalchemy/models.py

@@ -26,8 +26,8 @@ from sqlalchemy import Column, Integer
 from sqlalchemy import DateTime
 from sqlalchemy.orm import object_mapper
 
-from savanna.openstack.common.db.sqlalchemy import session as sa
-from savanna.openstack.common import timeutils
+from sahara.openstack.common.db.sqlalchemy import session as sa
+from sahara.openstack.common import timeutils
 
 
 class ModelBase(object):

sahara/openstack/common/db/sqlalchemy/provision.py

@@ -23,7 +23,7 @@ import string
 from six import moves
 import sqlalchemy
 
-from savanna.openstack.common.db import exception as exc
+from sahara.openstack.common.db import exception as exc
 
 
 SQL_CONNECTION = os.getenv('OS_TEST_DBAPI_ADMIN_CONNECTION', 'sqlite://')

sahara/openstack/common/db/sqlalchemy/session.py

@@ -283,10 +283,10 @@ import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
 from sqlalchemy.sql.expression import literal_column
 
-from savanna.openstack.common.db import exception
-from savanna.openstack.common.gettextutils import _
-from savanna.openstack.common import log as logging
-from savanna.openstack.common import timeutils
+from sahara.openstack.common.db import exception
+from sahara.openstack.common.gettextutils import _
+from sahara.openstack.common import log as logging
+from sahara.openstack.common import timeutils
 
 sqlite_db_opts = [
     cfg.StrOpt('sqlite_db',

sahara/openstack/common/db/sqlalchemy/test_migrations.py

@@ -23,11 +23,11 @@ from six import moves
 import sqlalchemy
 import sqlalchemy.exc
 
-from savanna.openstack.common.db.sqlalchemy import utils
-from savanna.openstack.common.gettextutils import _
-from savanna.openstack.common import log as logging
-from savanna.openstack.common.py3kcompat import urlutils
-from savanna.openstack.common import test
+from sahara.openstack.common.db.sqlalchemy import utils
+from sahara.openstack.common.gettextutils import _
+from sahara.openstack.common import log as logging
+from sahara.openstack.common.py3kcompat import urlutils
+from sahara.openstack.common import test
 
 LOG = logging.getLogger(__name__)
 

sahara/openstack/common/db/sqlalchemy/utils.py

@@ -36,10 +36,10 @@ from sqlalchemy import String
 from sqlalchemy import Table
 from sqlalchemy.types import NullType
 
-from savanna.openstack.common.gettextutils import _
+from sahara.openstack.common.gettextutils import _
 
-from savanna.openstack.common import log as logging
-from savanna.openstack.common import timeutils
+from sahara.openstack.common import log as logging
+from sahara.openstack.common import timeutils
 
 
 LOG = logging.getLogger(__name__)

sahara/openstack/common/eventlet_backdoor.py

@@ -29,8 +29,8 @@ import eventlet.backdoor
 import greenlet
 from oslo.config import cfg
 
-from savanna.openstack.common.gettextutils import _LI
-from savanna.openstack.common import log as logging
+from sahara.openstack.common.gettextutils import _LI
+from sahara.openstack.common import log as logging
 
 help_for_backdoor_port = (
     "Acceptable values are 0, <port>, and <start>:<end>, where 0 results "

sahara/openstack/common/exception.py

@@ -21,7 +21,7 @@ Exceptions common to OpenStack projects
 
 import logging
 
-from savanna.openstack.common.gettextutils import _  # noqa
+from sahara.openstack.common.gettextutils import _  # noqa
 
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 

sahara/openstack/common/excutils.py

@@ -24,7 +24,7 @@ import traceback
 
 import six
 
-from savanna.openstack.common.gettextutils import _LE
+from sahara.openstack.common.gettextutils import _LE
 
 
 class save_and_reraise_exception(object):

sahara/openstack/common/fileutils.py

@@ -19,9 +19,9 @@ import errno
 import os
 import tempfile
 
-from savanna.openstack.common import excutils
-from savanna.openstack.common.gettextutils import _  # noqa
-from savanna.openstack.common import log as logging
+from sahara.openstack.common import excutils
+from sahara.openstack.common.gettextutils import _  # noqa
+from sahara.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

sahara/openstack/common/jsonutils.py

@@ -40,9 +40,9 @@ import json
 import six
 import six.moves.xmlrpc_client as xmlrpclib
 
-from savanna.openstack.common import gettextutils
-from savanna.openstack.common import importutils
-from savanna.openstack.common import timeutils
+from sahara.openstack.common import gettextutils
+from sahara.openstack.common import importutils
+from sahara.openstack.common import timeutils
 
 netaddr = importutils.try_import("netaddr")
 

sahara/openstack/common/lockutils.py

@@ -28,10 +28,10 @@ import weakref
 
 from oslo.config import cfg
 
-from savanna.openstack.common import fileutils
-from savanna.openstack.common.gettextutils import _  # noqa
-from savanna.openstack.common import local
-from savanna.openstack.common import log as logging
+from sahara.openstack.common import fileutils
+from sahara.openstack.common.gettextutils import _  # noqa
+from sahara.openstack.common import local
+from sahara.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

sahara/openstack/common/log.py

@@ -41,10 +41,10 @@ from oslo.config import cfg
 import six
 from six import moves
 
-from savanna.openstack.common.gettextutils import _
-from savanna.openstack.common import importutils
-from savanna.openstack.common import jsonutils
-from savanna.openstack.common import local
+from sahara.openstack.common.gettextutils import _
+from sahara.openstack.common import importutils
+from sahara.openstack.common import jsonutils
+from sahara.openstack.common import local
 
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"

sahara/openstack/common/loopingcall.py

@@ -20,9 +20,9 @@ import sys
 from eventlet import event
 from eventlet import greenthread
 
-from savanna.openstack.common.gettextutils import _LE, _LW
-from savanna.openstack.common import log as logging
-from savanna.openstack.common import timeutils
+from sahara.openstack.common.gettextutils import _LE, _LW
+from sahara.openstack.common import log as logging
+from sahara.openstack.common import timeutils
 
 LOG = logging.getLogger(__name__)
 

sahara/openstack/common/periodic_task.py

@@ -16,8 +16,8 @@ import time
 from oslo.config import cfg
 import six
 
-from savanna.openstack.common.gettextutils import _, _LE, _LI
-from savanna.openstack.common import log as logging
+from sahara.openstack.common.gettextutils import _, _LE, _LI
+from sahara.openstack.common import log as logging
 
 
 periodic_opts = [

sahara/openstack/common/processutils.py

@@ -28,8 +28,8 @@ from eventlet.green import subprocess
 from eventlet import greenthread
 import six
 
-from savanna.openstack.common.gettextutils import _
-from savanna.openstack.common import log as logging
+from sahara.openstack.common.gettextutils import _
+from sahara.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

sahara/openstack/common/sslutils.py

@@ -19,7 +19,7 @@ import ssl
 
 from oslo.config import cfg
 
-from savanna.openstack.common.gettextutils import _  # noqa
+from sahara.openstack.common.gettextutils import _  # noqa
 
 
 ssl_opts = [

sahara/openstack/common/systemd.py

@@ -20,7 +20,7 @@ import os
 import socket
 import sys
 
-from savanna.openstack.common import log as logging
+from sahara.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

sahara/openstack/common/threadgroup.py

@@ -16,8 +16,8 @@ import threading
 import eventlet
 from eventlet import greenpool
 
-from savanna.openstack.common import log as logging
-from savanna.openstack.common import loopingcall
+from sahara.openstack.common import log as logging
+from sahara.openstack.common import loopingcall
 
 
 LOG = logging.getLogger(__name__)

sahara/openstack/common/wsgi.py

@@ -24,11 +24,11 @@ import datetime
 from xml.dom import minidom
 from xml.parsers import expat
 
-from savanna.openstack.common import exception
-from savanna.openstack.common.gettextutils import _
-from savanna.openstack.common import jsonutils
-from savanna.openstack.common import log as logging
-from savanna.openstack.common import xmlutils
+from sahara.openstack.common import exception
+from sahara.openstack.common.gettextutils import _
+from sahara.openstack.common import jsonutils
+from sahara.openstack.common import log as logging
+from sahara.openstack.common import xmlutils
 
 LOG = logging.getLogger(__name__)
 

sahara/plugins/base.py

@@ -19,8 +19,8 @@ from oslo.config import cfg
 import six
 from stevedore import enabled
 
-from savanna.openstack.common import log as logging
-from savanna.utils import resources
+from sahara.openstack.common import log as logging
+from sahara.utils import resources
 
 
 LOG = logging.getLogger(__name__)

sahara/plugins/general/exceptions.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import savanna.exceptions as e
+import sahara.exceptions as e
 
 
 class NodeGroupCannotBeScaled(e.SaharaException):

sahara/plugins/general/utils.py

@@ -15,8 +15,8 @@
 
 from six.moves.urllib import parse as urlparse
 
-from savanna.openstack.common import network_utils
-from savanna.plugins.general import exceptions as ex
+from sahara.openstack.common import network_utils
+from sahara.plugins.general import exceptions as ex
 
 
 def get_node_groups(cluster, node_process=None):

sahara/plugins/hdp/ambariplugin.py

@@ -15,17 +15,17 @@
 
 from oslo.config import cfg
 
-from savanna import conductor
-from savanna import context
-from savanna import exceptions as exc
-from savanna.openstack.common import log as logging
-from savanna.plugins.general import exceptions as ex
-from savanna.plugins.general import utils as u
-from savanna.plugins.hdp import hadoopserver as h
-from savanna.plugins.hdp import savannautils as utils
-from savanna.plugins.hdp.versions import versionhandlerfactory as vhf
-from savanna.plugins import provisioning as p
-from savanna.topology import topology_helper as th
+from sahara import conductor
+from sahara import context
+from sahara import exceptions as exc
+from sahara.openstack.common import log as logging
+from sahara.plugins.general import exceptions as ex
+from sahara.plugins.general import utils as u
+from sahara.plugins.hdp import hadoopserver as h
+from sahara.plugins.hdp import savannautils as utils
+from sahara.plugins.hdp.versions import versionhandlerfactory as vhf
+from sahara.plugins import provisioning as p
+from sahara.topology import topology_helper as th
 
 
 conductor = conductor.API

sahara/plugins/hdp/clusterspec.py

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from savanna.openstack.common import jsonutils as json
-from savanna.openstack.common import log as logging
-from savanna.plugins.general import exceptions as ex
-from savanna.plugins.hdp.versions import versionhandlerfactory as vhf
+from sahara.openstack.common import jsonutils as json
+from sahara.openstack.common import log as logging
+from sahara.plugins.general import exceptions as ex
+from sahara.plugins.hdp.versions import versionhandlerfactory as vhf
 
 
 LOG = logging.getLogger(__name__)

sahara/plugins/hdp/configprovider.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from savanna import exceptions
-from savanna.plugins import provisioning as p
+from sahara import exceptions
+from sahara.plugins import provisioning as p
 
 
 class ConfigurationProvider:

sahara/plugins/hdp/hadoopserver.py

@@ -15,9 +15,9 @@
 
 import re
 
-from savanna.openstack.common import log as logging
-from savanna.plugins.hdp import savannautils
-from savanna.utils import files as f
+from sahara.openstack.common import log as logging
+from sahara.plugins.hdp import savannautils
+from sahara.utils import files as f
 
 
 AMBARI_RPM = 'http://s3.amazonaws.com/public-repo-1.hortonworks.com/' \