From 763013c5264e87dc8075d50117e5e394fccef1a7 Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Mon, 9 Jan 2012 10:28:55 -0800 Subject: renaming keystonelight to keystone --- bin/keystone | 6 +-- bin/ks | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bin/ksl | 122 ----------------------------------------------------------- 3 files changed, 125 insertions(+), 125 deletions(-) create mode 100755 bin/ks delete mode 100755 bin/ksl (limited to 'bin') diff --git a/bin/keystone b/bin/keystone index 7775b203..58e7b3a9 100755 --- a/bin/keystone +++ b/bin/keystone @@ -12,13 +12,13 @@ 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, - 'keystonelight', + 'keystone', '__init__.py')): sys.path.insert(0, possible_topdir) from paste import deploy -from keystonelight import wsgi +from keystone import wsgi def create_server(name, port): @@ -49,6 +49,6 @@ if __name__ == '__main__': servers = [] servers.append(create_server('keystone_admin', int(options['admin_port']))) - servers.append(create_server('keystonelight', + servers.append(create_server('keystone', int(options['public_port']))) serve(*servers) diff --git a/bin/ks b/bin/ks new file mode 100755 index 00000000..98a6ded2 --- /dev/null +++ b/bin/ks @@ -0,0 +1,122 @@ +#!/usr/bin/env python + +import sys + +import cli.app +import cli.log + +from keystone import client + + +DEFAULT_PARAMS = ( + (('--config',), {'dest': 'configfile', + 'action': 'store', + 'default': './etc/default.conf'}), + (('--url',), {'dest': 'url', + 'action': 'store', + 'default': 'http://localhost:5000'}), + (('--token',), {'dest': 'token', 'action': 'store'}), + ) + + +class BaseApp(cli.log.LoggingApp): + def __init__(self, *args, **kw): + kw.setdefault('name', self.__class__.__name__.lower()) + super(BaseApp, self).__init__(*args, **kw) + + def add_default_params(self): + for args, kw in DEFAULT_PARAMS: + self.add_param(*args, **kw) + + def _parse_keyvalues(self, args): + kv = {} + for x in args: + key, value = x.split('=', 1) + # make lists if there are multiple values + if key.endswith('[]'): + key = key[:-2] + existing = kv.get(key, []) + existing.append(value) + kv[key] = existing + else: + kv[key] = value + return kv + + +class LoadData(BaseApp): + def __init__(self, *args, **kw): + super(LoadData, self).__init__(*args, **kw) + self.add_default_params() + self.add_param('fixture', nargs='+') + + def main(self): + """Given some fixtures, create the appropriate data in Keystone Light.""" + pass + + +class CrudCommands(BaseApp): + ACTION_MAP = {} + + def __init__(self, *args, **kw): + super(CrudCommands, self).__init__(*args, **kw) + self.add_default_params() + self.add_param('action') + self.add_param('keyvalues', nargs='+') + + def main(self): + """Given some keyvalues create the appropriate data in Keystone Light.""" + c = client.HttpClient(self.params.url, token=self.params.token) + action_name = self.ACTION_MAP[self.params.action] + kv = self._parse_keyvalues(self.params.keyvalues) + resp = getattr(c, action_name)(**kv) + print resp + + +class UserCommands(CrudCommands): + ACTION_MAP = {'add': 'create_user', + 'create': 'create_user', + } + + +class TenantCommands(CrudCommands): + ACTION_MAP = {'add': 'create_tenant', + 'create': 'create_tenant', + } + + +class ExtrasCommands(CrudCommands): + ACTION_MAP = {'add': 'create_extras', + 'create': 'create_extras', + } + + +class Auth(BaseApp): + def __init__(self, *args, **kw): + super(Auth, self).__init__(*args, **kw) + self.add_default_params() + self.add_param('keyvalues', nargs='+') + + def main(self): + """Attempt to authenticate against the Keystone Light API.""" + c = client.HttpClient(self.params.url, token=self.params.token) + kv = self._parse_keyvalues(self.params.keyvalues) + resp = c.authenticate(**kv) + print resp + + +CMDS = {'loaddata': LoadData, + 'user': UserCommands, + 'tenant': TenantCommands, + 'extras': ExtrasCommands, + 'auth': Auth, + } + + +if __name__ == '__main__': + if not len(sys.argv) > 1: + print 'try one of:', ' '.join(CMDS.keys()) + sys.exit(1) + + cmd = sys.argv[1] + if cmd in CMDS: + CMDS[cmd](argv=(sys.argv[:1] + sys.argv[2:])).run() diff --git a/bin/ksl b/bin/ksl deleted file mode 100755 index 0a9d7736..00000000 --- a/bin/ksl +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python - -import sys - -import cli.app -import cli.log - -from keystonelight import client - - -DEFAULT_PARAMS = ( - (('--config',), {'dest': 'configfile', - 'action': 'store', - 'default': './etc/default.conf'}), - (('--url',), {'dest': 'url', - 'action': 'store', - 'default': 'http://localhost:5000'}), - (('--token',), {'dest': 'token', 'action': 'store'}), - ) - - -class BaseApp(cli.log.LoggingApp): - def __init__(self, *args, **kw): - kw.setdefault('name', self.__class__.__name__.lower()) - super(BaseApp, self).__init__(*args, **kw) - - def add_default_params(self): - for args, kw in DEFAULT_PARAMS: - self.add_param(*args, **kw) - - def _parse_keyvalues(self, args): - kv = {} - for x in args: - key, value = x.split('=', 1) - # make lists if there are multiple values - if key.endswith('[]'): - key = key[:-2] - existing = kv.get(key, []) - existing.append(value) - kv[key] = existing - else: - kv[key] = value - return kv - - -class LoadData(BaseApp): - def __init__(self, *args, **kw): - super(LoadData, self).__init__(*args, **kw) - self.add_default_params() - self.add_param('fixture', nargs='+') - - def main(self): - """Given some fixtures, create the appropriate data in Keystone Light.""" - pass - - -class CrudCommands(BaseApp): - ACTION_MAP = {} - - def __init__(self, *args, **kw): - super(CrudCommands, self).__init__(*args, **kw) - self.add_default_params() - self.add_param('action') - self.add_param('keyvalues', nargs='+') - - def main(self): - """Given some keyvalues create the appropriate data in Keystone Light.""" - c = client.HttpClient(self.params.url, token=self.params.token) - action_name = self.ACTION_MAP[self.params.action] - kv = self._parse_keyvalues(self.params.keyvalues) - resp = getattr(c, action_name)(**kv) - print resp - - -class UserCommands(CrudCommands): - ACTION_MAP = {'add': 'create_user', - 'create': 'create_user', - } - - -class TenantCommands(CrudCommands): - ACTION_MAP = {'add': 'create_tenant', - 'create': 'create_tenant', - } - - -class ExtrasCommands(CrudCommands): - ACTION_MAP = {'add': 'create_extras', - 'create': 'create_extras', - } - - -class Auth(BaseApp): - def __init__(self, *args, **kw): - super(Auth, self).__init__(*args, **kw) - self.add_default_params() - self.add_param('keyvalues', nargs='+') - - def main(self): - """Attempt to authenticate against the Keystone Light API.""" - c = client.HttpClient(self.params.url, token=self.params.token) - kv = self._parse_keyvalues(self.params.keyvalues) - resp = c.authenticate(**kv) - print resp - - -CMDS = {'loaddata': LoadData, - 'user': UserCommands, - 'tenant': TenantCommands, - 'extras': ExtrasCommands, - 'auth': Auth, - } - - -if __name__ == '__main__': - if not len(sys.argv) > 1: - print 'try one of:', ' '.join(CMDS.keys()) - sys.exit(1) - - cmd = sys.argv[1] - if cmd in CMDS: - CMDS[cmd](argv=(sys.argv[:1] + sys.argv[2:])).run() -- cgit