import threading
import zerorpc
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
class ZeroRpcApiEndpoint(object):
def __init__(self, dcs):
self.dcs = dcs
- def compute_action_start(self, dc_name, compute_name):
+ def compute_action_start(self, dc_name, compute_name, image, 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:
- return self.dcs.get(dc_name).startCompute(compute_name)
+ c = self.dcs.get(dc_name).startCompute(
+ compute_name, image=image, network=network)
+ return str(c.name)
except Exception as ex:
logging.exception("RPC error.")
return ex.message
def compute_action_stop(self, dc_name, compute_name):
- logging.info("RPC CALL: compute stop")
+ logging.debug("RPC CALL: compute stop")
try:
return self.dcs.get(dc_name).stopCompute(compute_name)
except Exception as ex:
return ex.message
def compute_list(self, dc_name):
- logging.info("RPC CALL: compute list")
+ logging.debug("RPC CALL: compute list")
try:
- return [(c.name, c.IP())
- for c in self.dcs.get(dc_name).listCompute()]
+ if dc_name is None:
+ # return list with all compute nodes in all DCs
+ all_containers = []
+ for dc in self.dcs.itervalues():
+ all_containers += dc.listCompute()
+ return [(c.name, c.getStatus())
+ for c in all_containers]
+ else:
+ # return list of compute nodes for specified DC
+ return [(c.name, c.getStatus())
+ for c in self.dcs.get(dc_name).listCompute()]
except Exception as ex:
logging.exception("RPC error.")
return ex.message
def compute_status(self, dc_name, compute_name):
- logging.info("RPC CALL: compute status")
+ logging.debug("RPC CALL: compute status")
try:
return self.dcs.get(
dc_name).containers.get(compute_name).getStatus()