Commit 116fb0d9 authored by Marco Mariani's avatar Marco Mariani

renamed 'slapos cache' to 'slapos cache-lookup'

parent b2b57e1c
...@@ -16,7 +16,7 @@ from slapos.grid.distribution import patched_linux_distribution ...@@ -16,7 +16,7 @@ from slapos.grid.distribution import patched_linux_distribution
def maybe_md5(s): def maybe_md5(s):
return re.match('[0-9a-f]{32}', s) return re.match('[0-9a-f]{32}', s)
def cache(): def cache_lookup():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("configuration_file", help="SlapOS configuration file") parser.add_argument("configuration_file", help="SlapOS configuration file")
parser.add_argument("software_url", help="Your software url or MD5 hash") parser.add_argument("software_url", help="Your software url or MD5 hash")
......
...@@ -36,7 +36,7 @@ from slapos.client import request as request ...@@ -36,7 +36,7 @@ from slapos.client import request as request
from slapos.client import remove as remove from slapos.client import remove as remove
from slapos.client import supply as supply from slapos.client import supply as supply
from slapos.format import main as format from slapos.format import main as format
from slapos.cache import cache from slapos.cache import cache_lookup
from slapos.grid.slapgrid import runComputerPartition as instance from slapos.grid.slapgrid import runComputerPartition as instance
from slapos.grid.slapgrid import runSoftwareRelease as software from slapos.grid.slapgrid import runSoftwareRelease as software
from slapos.grid.slapgrid import runUsageReport as report from slapos.grid.slapgrid import runUsageReport as report
...@@ -153,8 +153,8 @@ def dispatch(command, is_node_command): ...@@ -153,8 +153,8 @@ def dispatch(command, is_node_command):
raise EntryPointNotImplementedError(command) raise EntryPointNotImplementedError(command)
elif command == 'console': elif command == 'console':
call(console, config=USER_SLAPOS_CONFIGURATION) call(console, config=USER_SLAPOS_CONFIGURATION)
elif command == 'cache': elif command == 'cache-lookup':
call(cache, config=GLOBAL_SLAPOS_CONFIGURATION) call(cache_lookup, config=GLOBAL_SLAPOS_CONFIGURATION)
else: else:
return False return False
...@@ -180,7 +180,7 @@ Client subcommands usage: ...@@ -180,7 +180,7 @@ Client subcommands usage:
slapos request <instance-name> <software-url> [--configuration arg1=value1 arg2=value2 ... argN=valueN] slapos request <instance-name> <software-url> [--configuration arg1=value1 arg2=value2 ... argN=valueN]
slapos supply <software-url> <node-id> slapos supply <software-url> <node-id>
slapos console slapos console
slapos cache <software-url-or-md5> slapos cache-lookup <software-url-or-md5>
Node subcommands usage: Node subcommands usage:
slapos node slapos node
slapos node register <node-id> slapos node register <node-id>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment