From 44a2938c94a36ebfddf04334770261797e89b27d Mon Sep 17 00:00:00 2001
From: Arash Ghoreyshi <arashghoreyshi@gmail.com>
Date: Mon, 24 Jun 2013 15:32:47 -0500
Subject: [PATCH] Change the SERVICE_ENDPOINT env variable to BARBICAN_ENDPOINT

Add mock functions to kwargs in the Connection class
---
 barbicanclient/client.py | 16 ++++++++--------
 clientrc                 |  2 +-
 keep                     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index 8673c343..391f5a57 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -24,8 +24,7 @@ class Connection(object):
     ORDERS_PATH = 'orders'
 
     def __init__(self, auth_endpoint=None, user=None, key=None, tenant=None,
-                 token=None, authenticate=None, request=None, fake_env=None,
-                 **kwargs):
+                 token=None, **kwargs):
         """
         Authenticate and connect to the service endpoint, which can be
         received through authentication.
@@ -41,15 +40,15 @@ class Connection(object):
                     default: env('OS_PASSWORD')
         :param tenant: The tenant ID
                        default: env('OS_TENANT_NAME')
-        :keyword param endpoint: The service endpoint to connect to
-                       default: env('SERVICE_ENDPOINT')
+        :keyword param endpoint: The barbican endpoint to connect to
+                       default: env('BARBICAN_ENDPOINT')
 
         If a token is provided, an endpoint should be as well.
         """
 
         LOG.debug(_("Creating Connection object"))
 
-        self.env = fake_env or env
+        self.env = kwargs.get('fake_env') or env
         self._auth_endpoint = auth_endpoint or self.env('OS_AUTH_URL')
         self._user = user or self.env('OS_USERNAME')
         self._key = key or self.env('OS_PASSWORD')
@@ -58,9 +57,10 @@ class Connection(object):
             raise ClientException("The authorization endpoint, username, key,"
                                   " and tenant name should either be passed i"
                                   "n or defined as environment variables.")
-        self.authenticate = authenticate or auth.authenticate
-        self.request = request or requests.request
-        self._endpoint = kwargs.get('endpoint') or self.env('SERVICE_ENDPOINT')
+        self.authenticate = kwargs.get('authenticate') or auth.authenticate
+        self.request = kwargs.get('request') or requests.request
+        self._endpoint = (kwargs.get('endpoint') or
+                          self.env('BARBICAN_ENDPOINT'))
         self._cacert = kwargs.get('cacert')
 
         self.connect(token=token)
diff --git a/clientrc b/clientrc
index e953c919..26bee975 100644
--- a/clientrc
+++ b/clientrc
@@ -2,5 +2,5 @@ export OS_TENANT_NAME=demo
 export OS_USERNAME=demo
 export OS_PASSWORD=password
 export OS_AUTH_URL="http://keystone-int.cloudkeep.io:5000/v2.0/"
-export SERVICE_ENDPOINT="http://api-01-int.cloudkeep.io:9311/v1/"
+export BARBICAN_ENDPOINT="http://api-01-int.cloudkeep.io:9311/v1/"
 export SERVICE_TOKEN=''
diff --git a/keep b/keep
index d9b49559..6a0e8780 100755
--- a/keep
+++ b/keep
@@ -37,7 +37,7 @@ class Keep:
                             default=client.env('OS_TENANT_NAME'),
                             help='the tenant ID (default: %(default)s)')
         parser.add_argument('--endpoint', '-E',
-                            default=client.env('SERVICE_ENDPOINT'),
+                            default=client.env('BARBICAN_ENDPOINT'),
                             help='the URL of the barbican server (default: %'
                             '(default)s)')
         parser.add_argument('--token', '-K',