Merge "Change internal variables and classes to 'sahara'"

5 files changed, 32 insertions, 28 deletions

diff --git a/saharaclient/api/client.py b/saharaclient/api/client.py
index bbb701b..8c103a2 100644
--- a/saharaclient/api/client.py
+++ b/saharaclient/api/client.py
@@ -31,7 +31,7 @@ from saharaclient.api import plugins
 
 class Client(object):
     def __init__(self, username=None, api_key=None, project_id=None,
-                 project_name=None, auth_url=None, savanna_url=None,
+                 project_name=None, auth_url=None, sahara_url=None,
                  endpoint_type='publicURL', service_type='data_processing',
                  input_auth_token=None):
 
@@ -45,8 +45,8 @@ class Client(object):
         if not input_auth_token:
             raise RuntimeError("Not Authorized")
 
-        savanna_catalog_url = savanna_url
-        if not savanna_url:
+        sahara_catalog_url = sahara_url
+        if not sahara_url:
             keystone = self.get_keystone_client(username=username,
                                                 api_key=api_key,
                                                 auth_url=auth_url,
@@ -57,12 +57,12 @@ class Client(object):
             if service_type in catalog:
                 for e_type, endpoint in catalog.get(service_type)[0].items():
                     if str(e_type).lower() == str(endpoint_type).lower():
-                        savanna_catalog_url = endpoint
+                        sahara_catalog_url = endpoint
                         break
-        if not savanna_catalog_url:
+        if not sahara_catalog_url:
             raise RuntimeError("Could not find Sahara endpoint in catalog")
 
-        self.client = httpclient.HTTPClient(savanna_catalog_url,
+        self.client = httpclient.HTTPClient(sahara_catalog_url,
                                             input_auth_token)
 
         self.clusters = clusters.ClusterManager(self)
diff --git a/saharaclient/api/helpers.py b/saharaclient/api/helpers.py
index 79495c9..6633c92 100644
--- a/saharaclient/api/helpers.py
+++ b/saharaclient/api/helpers.py
@@ -17,9 +17,9 @@ from saharaclient.api import parameters as params
 
 
 class Helpers(object):
-    def __init__(self, savanna_client):
-        self.savanna = savanna_client
-        self.plugins = self.savanna.plugins
+    def __init__(self, sahara_client):
+        self.sahara = sahara_client
+        self.plugins = self.sahara.plugins
 
     def _get_node_processes(self, plugin):
         processes = []
diff --git a/saharaclient/shell.py b/saharaclient/shell.py
index 95b8190..098edbe 100644
--- a/saharaclient/shell.py
+++ b/saharaclient/shell.py
@@ -200,10 +200,10 @@ class SecretsHelper(object):
         return tenant_id
 
 
-class SavannaClientArgumentParser(argparse.ArgumentParser):
+class SaharaClientArgumentParser(argparse.ArgumentParser):
 
     def __init__(self, *args, **kwargs):
-        super(SavannaClientArgumentParser, self).__init__(*args, **kwargs)
+        super(SaharaClientArgumentParser, self).__init__(*args, **kwargs)
 
     def error(self, message):
         """error(message: string)
@@ -222,10 +222,10 @@ class SavannaClientArgumentParser(argparse.ArgumentParser):
                       'subp': progparts[2]})
 
 
-class OpenStackSavannaShell(object):
+class OpenStackSaharaShell(object):
 
     def get_base_parser(self):
-        parser = SavannaClientArgumentParser(
+        parser = SaharaClientArgumentParser(
             prog='sahara',
             description=__doc__.strip(),
             epilog='See "sahara help COMMAND" '
@@ -239,7 +239,7 @@ class OpenStackSavannaShell(object):
                             action='store_true',
                             help=argparse.SUPPRESS)
 
-# NA for Savanna
+# NA
 #        parser.add_argument('--version',
 #                            action='version',
 #                            version=saharaclient.__version__)
@@ -305,7 +305,7 @@ class OpenStackSavannaShell(object):
         parser.add_argument('--os_auth_url',
                             help=argparse.SUPPRESS)
 
-# NA for Savanna
+# NA
 #        parser.add_argument('--os-region-name',
 #            metavar='<region-name>',
 #            default=utils.env('OS_REGION_NAME', 'SAHARA_REGION_NAME'),
@@ -327,7 +327,7 @@ class OpenStackSavannaShell(object):
         parser.add_argument('--service_type',
                             help=argparse.SUPPRESS)
 
-# NA for Savanna
+# NA
 #        parser.add_argument('--service-name',
 #            metavar='<service-name>',
 #            default=utils.env('SAHARA_SERVICE_NAME'),
@@ -335,7 +335,7 @@ class OpenStackSavannaShell(object):
 #        parser.add_argument('--service_name',
 #            help=argparse.SUPPRESS)
 
-# NA for Savanna
+# NA
 #        parser.add_argument('--volume-service-name',
 #            metavar='<volume-service-name>',
 #            default=utils.env('NOVA_VOLUME_SERVICE_NAME'),
@@ -374,7 +374,7 @@ class OpenStackSavannaShell(object):
                             'verifying a TLS (https) server certificate. '
                             'Defaults to env[OS_CACERT].')
 
-# NA for Savanna
+# NA
 #        parser.add_argument('--insecure',
 #            default=utils.env('NOVACLIENT_INSECURE', default=False),
 #            action='store_true',
@@ -587,7 +587,7 @@ class OpenStackSavannaShell(object):
 
         if not service_type:
             service_type = DEFAULT_SERVICE_TYPE
-# NA for Savanna - there is only one service this CLI accesses
+# NA - there is only one service this CLI accesses
 #            service_type = utils.get_service_type(args.func) or service_type
 
         #FIXME(usrleon): Here should be restrict for project id same as
@@ -620,7 +620,7 @@ class OpenStackSavannaShell(object):
                                            "default url with --os-auth-system "
                                            "or env[OS_AUTH_SYSTEM]")
 
-# NA for Savanna
+# NA
 #        if (options.os_compute_api_version and
 #                options.os_compute_api_version != '1.0'):
 #            if not os_tenant_name and not os_tenant_id:
@@ -640,7 +640,7 @@ class OpenStackSavannaShell(object):
         # Now check for the password/token of which pieces of the
         # identifying keyring key can come from the underlying client
         if not cliutils.isunauthenticated(args.func):
-# NA for Savanna - Client can't be used with SecretsHelper
+# NA - Client can't be used with SecretsHelper
 #            helper = SecretsHelper(args, self.cs.client)
             if (auth_plugin and auth_plugin.opts and
                     "os_password" not in auth_plugin.opts):
@@ -674,7 +674,7 @@ class OpenStackSavannaShell(object):
 #                self.cs.client.password = os_password
 #                self.cs.client.keyring_saver = helper
 
-# NA for Savanna
+# NA
 #        try:
 #            if not utils.isunauthenticated(args.func):
 #                self.cs.authenticate()
@@ -688,7 +688,7 @@ class OpenStackSavannaShell(object):
                                 project_id=os_tenant_id,
                                 project_name=os_tenant_name,
                                 auth_url=os_auth_url,
-                                savanna_url=bypass_url)
+                                sahara_url=bypass_url)
 
         args.func(self.cs, args)
 
@@ -752,7 +752,7 @@ class OpenStackHelpFormatter(argparse.HelpFormatter):
 
 def main():
     try:
-        OpenStackSavannaShell().main(map(strutils.safe_decode, sys.argv[1:]))
+        OpenStackSaharaShell().main(map(strutils.safe_decode, sys.argv[1:]))
 
     except Exception as e:
         logger.debug(e, exc_info=1)
diff --git a/saharaclient/tests/nova/test_shell.py b/saharaclient/tests/nova/test_shell.py
index 66581e5..9e0d821 100644
--- a/saharaclient/tests/nova/test_shell.py
+++ b/saharaclient/tests/nova/test_shell.py
@@ -76,7 +76,7 @@ class ShellTest(utils.TestCase):
 
     def setUp(self):
         super(ShellTest, self).setUp()
-# NA for Savanna atm
+# NA atm
 #       self.useFixture(fixtures.MonkeyPatch(
 #                       'novaclient.client.get_client_class',
 #                       mock.MagicMock))
@@ -89,7 +89,7 @@ class ShellTest(utils.TestCase):
         try:
             sys.stdout = six.StringIO()
             sys.stderr = six.StringIO()
-            _shell = saharaclient.shell.OpenStackSavannaShell()
+            _shell = saharaclient.shell.OpenStackSaharaShell()
             _shell.main(argstr.split())
         except SystemExit:
             exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -106,7 +106,7 @@ class ShellTest(utils.TestCase):
     def test_help_unknown_command(self):
         self.assertRaises(exceptions.CommandError, self.shell, 'help foofoo')
 
-# NA for Savanna
+# NA
 #    def test_invalid_timeout(self):
 #        for f in [0, -1, -10]:
 #            cmd_text = '--timeout %s' % (f)
diff --git a/savannaclient/client.py b/savannaclient/client.py
index ac52ed8..354d506 100644
--- a/savannaclient/client.py
+++ b/savannaclient/client.py
@@ -16,4 +16,8 @@
 from saharaclient import client as saharaclient
 
 
-Client = saharaclient.Client
+def Client(version, *args, **kwargs):
+    if 'savanna_url' in kwargs:
+        kwargs['sahara_url'] = kwargs['savanna_url']
+        del kwargs['savanna_url']
+    return saharaclient.Client(version, *args, **kwargs)