openstack/neutron
Code Issues Proposed changes

Adding client-side support for Keystone integration

Browse Source
This commit is contained in:
Salvatore Orlando 2011-09-01 17:49:25 +01:00
parent 42ddbf938a
commit fc1b6f0dbf
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/cli
View File

@ -126,6 +126,8 @@ if __name__ == "__main__":
action="store_true", default=False, help="turn on verbose logging") action="store_true", default=False, help="turn on verbose logging")
parser.add_option("-f", "--logfile", dest="logfile", parser.add_option("-f", "--logfile", dest="logfile",
type="string", default="syslog", help="log file path") type="string", default="syslog", help="log file path")
parser.add_option("-t", "--token", dest="token",
type="string", default=None, help="authentication token")
options, args = parser.parse_args() options, args = parser.parse_args()
if options.verbose: if options.verbose:
@ -158,7 +160,8 @@ if __name__ == "__main__":
LOG.info("Executing command \"%s\" with args: %s" % (cmd, args)) LOG.info("Executing command \"%s\" with args: %s" % (cmd, args))
client = Client(options.host, options.port, options.ssl, client = Client(options.host, options.port, options.ssl,
args[0], FORMAT) args[0], FORMAT,
auth_token=options.token)
commands[cmd]["func"](client, *args) commands[cmd]["func"](client, *args)
LOG.info("Command execution completed") LOG.info("Command execution completed")

11
quantum/client.py
View File

@ -34,6 +34,7 @@ EXCEPTIONS = {
431: exceptions.StateInvalid, 431: exceptions.StateInvalid,
432: exceptions.PortInUseClient, 432: exceptions.PortInUseClient,
440: exceptions.AlreadyAttachedClient} 440: exceptions.AlreadyAttachedClient}
AUTH_TOKEN_HEADER = "X-Auth-Token"
class ApiCall(object): class ApiCall(object):
@ -83,7 +84,8 @@ class Client(object):
def __init__(self, host="127.0.0.1", port=9696, use_ssl=False, tenant=None, def __init__(self, host="127.0.0.1", port=9696, use_ssl=False, tenant=None,
format="xml", testingStub=None, key_file=None, cert_file=None, format="xml", testingStub=None, key_file=None, cert_file=None,
logger=None, action_prefix="/v1.0/tenants/{tenant_id}"): auth_token=None, logger=None,
action_prefix="/v1.0/tenants/{tenant_id}"):
""" """
Creates a new client to some service. Creates a new client to some service.
@ -95,6 +97,9 @@ class Client(object):
:param testingStub: A class that stubs basic server methods for tests :param testingStub: A class that stubs basic server methods for tests
:param key_file: The SSL key file to use if use_ssl is true :param key_file: The SSL key file to use if use_ssl is true
:param cert_file: The SSL cert file to use if use_ssl is true :param cert_file: The SSL cert file to use if use_ssl is true
:param auth_token: authentication token to be passed to server
:param logger: Logger object for the client library
:param action_prefix: prefix for request URIs
""" """
self.host = host self.host = host
self.port = port self.port = port
@ -106,6 +111,7 @@ class Client(object):
self.key_file = key_file self.key_file = key_file
self.cert_file = cert_file self.cert_file = cert_file
self.logger = logger self.logger = logger
self.auth_token = auth_token
self.action_prefix = action_prefix self.action_prefix = action_prefix
def get_connection_type(self): def get_connection_type(self):
@ -163,6 +169,9 @@ class Client(object):
connection_type = self.get_connection_type() connection_type = self.get_connection_type()
headers = headers or {"Content-Type": headers = headers or {"Content-Type":
"application/%s" % self.format} "application/%s" % self.format}
# if available, add authentication token
if self.auth_token:
headers[AUTH_TOKEN_HEADER] = self.auth_token
# Open connection and send request, handling SSL certs # Open connection and send request, handling SSL certs
certs = {'key_file': self.key_file, 'cert_file': self.cert_file} certs = {'key_file': self.key_file, 'cert_file': self.cert_file}
certs = dict((x, certs[x]) for x in certs if certs[x] != None) certs = dict((x, certs[x]) for x in certs if certs[x] != None)