projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #24 from stevenvanrossem/master
[osm/vim-emu.git]
/
emuvim
/
cli
/
compute.py
diff --git
a/emuvim/cli/compute.py
b/emuvim/cli/compute.py
old mode 100644
(file)
new mode 100755
(executable)
index
df40814
..
15fea91
--- a/
emuvim/cli/compute.py
+++ b/
emuvim/cli/compute.py
@@
-34,6
+34,7
@@
class ZeroRpcClient(object):
args.get("datacenter"),
args.get("name"),
args.get("image"),
args.get("datacenter"),
args.get("name"),
args.get("image"),
+ args.get("docker_command"),
network)
pp.pprint(r)
network)
pp.pprint(r)
@@
-80,7
+81,8
@@
class ZeroRpcClient(object):
parser = argparse.ArgumentParser(description='son-emu compute')
parser.add_argument(
"command",
parser = argparse.ArgumentParser(description='son-emu compute')
parser.add_argument(
"command",
- help="Action to be executed: start|stop|list")
+ choices=['start', 'stop', 'list', 'status'],
+ help="Action to be executed.")
parser.add_argument(
"--datacenter", "-d", dest="datacenter",
help="Data center to in which the compute instance should be executed")
parser.add_argument(
"--datacenter", "-d", dest="datacenter",
help="Data center to in which the compute instance should be executed")
@@
-88,8
+90,11
@@
parser.add_argument(
"--name", "-n", dest="name",
help="Name of compute instance e.g. 'vnf1'")
parser.add_argument(
"--name", "-n", dest="name",
help="Name of compute instance e.g. 'vnf1'")
parser.add_argument(
- "--image", dest="image",
+ "--image",
"-i",
dest="image",
help="Name of container image to be used e.g. 'ubuntu'")
help="Name of container image to be used e.g. 'ubuntu'")
+parser.add_argument(
+ "--dcmd", "-c", dest="docker_command",
+ help="Startup command of the container e.g. './start.sh'")
parser.add_argument(
"--net", dest="network",
help="Network properties of compute instance e.g. '10.0.0.123/8'")
parser.add_argument(
"--net", dest="network",
help="Network properties of compute instance e.g. '10.0.0.123/8'")