projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update openflow port for ryu
[osm/vim-emu.git]
/
emuvim
/
api
/
zerorpcapi.py
diff --git
a/emuvim/api/zerorpcapi.py
b/emuvim/api/zerorpcapi.py
old mode 100644
(file)
new mode 100755
(executable)
index
1d5a6b1
..
fd814b3
--- a/
emuvim/api/zerorpcapi.py
+++ b/
emuvim/api/zerorpcapi.py
@@
-56,30
+56,30
@@
class MultiDatacenterApi(object):
def __init__(self, dcs):
self.dcs = dcs
def __init__(self, dcs):
self.dcs = dcs
- def compute_action_start(self, dc_
name, compute_name, image
, network):
+ def compute_action_start(self, dc_
label, compute_name, image, command
, network):
# network e.g. {"ip": "10.0.0.254/8"}
# TODO what to return UUID / given name / internal name ?
logging.debug("RPC CALL: compute start")
try:
# network e.g. {"ip": "10.0.0.254/8"}
# TODO what to return UUID / given name / internal name ?
logging.debug("RPC CALL: compute start")
try:
- c = self.dcs.get(dc_
name
).startCompute(
- compute_name, image=image, network=network)
+ c = self.dcs.get(dc_
label
).startCompute(
+ compute_name, image=image,
command=command,
network=network)
return str(c.name)
except Exception as ex:
logging.exception("RPC error.")
return ex.message
return str(c.name)
except Exception as ex:
logging.exception("RPC error.")
return ex.message
- def compute_action_stop(self, dc_
name
, compute_name):
+ def compute_action_stop(self, dc_
label
, compute_name):
logging.debug("RPC CALL: compute stop")
try:
logging.debug("RPC CALL: compute stop")
try:
- return self.dcs.get(dc_
name
).stopCompute(compute_name)
+ return self.dcs.get(dc_
label
).stopCompute(compute_name)
except Exception as ex:
logging.exception("RPC error.")
return ex.message
except Exception as ex:
logging.exception("RPC error.")
return ex.message
- def compute_list(self, dc_
name
):
+ def compute_list(self, dc_
label
):
logging.debug("RPC CALL: compute list")
try:
logging.debug("RPC CALL: compute list")
try:
- if dc_
name
is None:
+ if dc_
label
is None:
# return list with all compute nodes in all DCs
all_containers = []
for dc in self.dcs.itervalues():
# return list with all compute nodes in all DCs
all_containers = []
for dc in self.dcs.itervalues():
@@
-89,16
+89,16
@@
class MultiDatacenterApi(object):
else:
# return list of compute nodes for specified DC
return [(c.name, c.getStatus())
else:
# return list of compute nodes for specified DC
return [(c.name, c.getStatus())
- for c in self.dcs.get(dc_
name
).listCompute()]
+ for c in self.dcs.get(dc_
label
).listCompute()]
except Exception as ex:
logging.exception("RPC error.")
return ex.message
except Exception as ex:
logging.exception("RPC error.")
return ex.message
- def compute_status(self, dc_
name
, compute_name):
+ def compute_status(self, dc_
label
, compute_name):
logging.debug("RPC CALL: compute status")
try:
return self.dcs.get(
logging.debug("RPC CALL: compute status")
try:
return self.dcs.get(
- dc_
name
).containers.get(compute_name).getStatus()
+ dc_
label
).containers.get(compute_name).getStatus()
except Exception as ex:
logging.exception("RPC error.")
return ex.message
except Exception as ex:
logging.exception("RPC error.")
return ex.message
@@
-110,3
+110,11
@@
class MultiDatacenterApi(object):
except Exception as ex:
logging.exception("RPC error.")
return ex.message
except Exception as ex:
logging.exception("RPC error.")
return ex.message
+
+ def datacenter_status(self, dc_label):
+ logging.debug("RPC CALL: datacenter status")
+ try:
+ return self.dcs.get(dc_label).getStatus()
+ except Exception as ex:
+ logging.exception("RPC error.")
+ return ex.message