import xmlrpclib
from PLC.Slices import Slices
-from PLC.SliceTags import SliceTags
-from PLC.Nodes import Nodes
+from PLC.SliceTags import SliceTags, SliceTag
+from PLC.TagTypes import TagTypes
+from PLC.NodeTags import NodeTags
from PLC.Config import Config
from pyaspects.meta import MetaAspect
+def ignore_exception(ExceptionType=None):
+ '''A decorator to ignore the given exception type. Use as
+ @ignore_exception() to ignore all exceptions.'''
+ def deco_ignore(f):
+ def f_ignore(*args, **kwargs):
+ if not ExceptionType:
+ try:
+ return f(*args, **kwargs)
+ except:
+ return None
+ else:
+ try:
+ return f(*args, **kwargs)
+ except ExceptionType, e:
+ return None
+ return f_ignore
+ return deco_ignore
+
+
class BaseOMF(object):
def __init__(self):
self.config = Config("/etc/planetlab/plc_config")
+ self.slice = None
+
# this was only for debugging, no need to log all method calls here -baris
# self.log = open("/var/log/omf/plc_slice_calls.log", "a")
self.log = None
+ @ignore_exception()
def logit(self, call, args, kwargs, data, slice):
if not self.log: return
self.log.write("%s\n\n" % slice)
self.log.flush()
-
+ @ignore_exception()
def get_slice(self, api, id_or_name):
slice_filter = {}
try: # if integer
except ValueError:
# we have a string
slice_filter['name'] = id_or_name
- slice = Slices(api, slice_filter = slice_filter)[0]
+ try:
+ slice = Slices(api, slice_filter = slice_filter)[0]
+ return slice
+ except IndexError:
+ return None
# don't bother to check for slice tags for the moment. we'll only
# create XMPP pubsub groups for all slices
#
# # OK, slice has the "omf" tag set.
# return slice
# return None
- return slice
- def get_node_hostname(self, api, node_id_or_hostname):
- node_filter = {}
+ @ignore_exception()
+ def get_node_hrn(self, api, node_id_or_hostname):
+ tag_filter = {'tagname': 'hrn'}
try:
- node_filter['node_id'] = int(str(node_id_or_hostname))
+ tag_filter['node_id'] = int(str(node_id_or_hostname))
except ValueError:
# we have a hostname
- node_filter['hostname'] = node_id_or_hostname
+ tag_filter['hostname'] = node_id_or_hostname
try:
- node = Nodes(api, node_filter = node_filter)[0]
- return node['hostname']
+ tag = NodeTags(api, node_tag_filter = tag_filter)[0]
+ return tag['value']
except IndexError:
return None
-
+
+ @ignore_exception()
def get_slice_tags(self, api, slice_id):
return SliceTags(api, slice_tag_filter = {'slice_id': slice_id})
+ @ignore_exception()
+ def get_tag_type(self, api, tagname):
+ try:
+ tag = TagTypes(api, {'tagname':tagname})[0]
+ return tag
+ except IndexError:
+ return None
+
+ @ignore_exception()
def create_slice(self, slice):
pass
+ @ignore_exception()
def add_resource(self, slice, resource):
pass
+ @ignore_exception()
def delete_slice(self, slice):
pass
+ @ignore_exception()
def delete_resource(self, slice, resource):
pass
def before(self, wobj, data, *args, **kwargs):
api_method_name = wobj.name
slice_name_or_id = None
- node_ids = None
- # DeleteSlice shall be handled before the actual method call;
- # after the call we won't be able to acess the slice.
- if api_method_name == "DeleteSlice":
+ if api_method_name == "AddSlice":
+ slice_name_or_id = args[1]['name']
+ elif api_method_name == "AddSliceToNodes" or api_method_name == "DeleteSliceFromNodes":
+ slice_name_or_id = args[1]
+ elif api_method_name == "AddSliceTag":
+ slice_name_or_id = args[1]
+ elif api_method_name == "DeleteSlice":
slice_name_or_id = args[1]
else: # ignore the rest
+ #self.logit(wobj.name, args, kwargs, data, "SLICE")
+ self.slice = None
return
- slice = self.get_slice(wobj.api, slice_name_or_id)
- if not slice:
- return
-
- if api_method_name == "DeleteSlice":
- self.delete_slice(slice['name'])
+ self.slice = self.get_slice(wobj.api, slice_name_or_id)
self.logit(wobj.name, args, kwargs, data, slice)
# aspect method
def after(self, wobj, data, *args, **kwargs):
api_method_name = wobj.name
- slice_name_or_id = None
- node_ids = None
- if api_method_name == "AddSlice":
- slice_name_or_id = args[1]['name']
- elif api_method_name == "AddSliceToNodes" or api_method_name == "DeleteSliceFromNodes":
- slice_name_or_id = args[1]
- node_ids = args[2]
- else: # ignore the rest
- #self.logit(wobj.name, args, kwargs, data, "SLICE")
- return
- slice = self.get_slice(wobj.api, slice_name_or_id)
- if not slice:
- return
+ if not self.slice:
+ if api_method_name == "AddSlice":
+ slice_name = args[1]['name']
+ self.slice = self.get_slice(wobj.api, slice_name)
+ else:
+ return
- if api_method_name == "AddSlice":
- self.create_slice(slice['name'])
- elif api_method_name == "AddSliceToNodes":
+ ret_val = None
+ if data.has_key("method_return_value"):
+ ret_val = data['method_return_value']
+
+ if api_method_name == "AddSlice" and ret_val > 0:
+ self.create_slice(self.slice['name'])
+
+ elif api_method_name == "AddSliceToNodes" and ret_val == 1:
+ node_ids = args[2]
for node_id in node_ids:
- node_hostname = self.get_node_hostname(wobj.api, node_id)
- self.add_resource(slice['name'], node_hostname)
- elif api_method_name == "DeleteSliceFromNodes":
+ node_hrn = self.get_node_hrn(wobj.api, node_id)
+ self.add_resource(self.slice['name'], node_hrn)
+
+ elif api_method_name == "DeleteSlice" and ret_val == 1:
+ self.delete_slice(self.slice['name'])
+
+ elif api_method_name == "DeleteSliceFromNodes" and ret_val == 1:
+ node_ids = args[2]
for node_id in node_ids:
- node_hostname = self.get_node_hostname(wobj.api, node_id)
- self.delete_resource(slice['name'], node_hostname)
+ node_hrn = self.get_node_hrn(wobj.api, node_id)
+ self.delete_resource(self.slice['name'], node_hrn)
- self.logit(wobj.name, args, kwargs, data, slice)
+ elif api_method_name == "AddSliceTag":
+ # OMF slices need to have dotsshmount vsys tag set to be
+ # able to access users' public keys.
+ tag_type_id_or_name = args[2]
+ omf_tag = self.get_tag_type(wobj.api, "omf_control")
+ vsys_tag = self.get_tag_type(wobj.api, "vsys")
+ if tag_type_id_or_name in (omf_tag['tagname'], omf_tag['tag_type_id']):
+ slice_tag = SliceTag(wobj.api)
+ slice_tag['slice_id'] = self.slice['slice_id']
+ slice_tag['tag_type_id'] = vsys_tag['tag_type_id']
+ slice_tag['value'] = u'dotsshmount'
+ slice_tag.sync()
+
+ self.logit(wobj.name, args, kwargs, data, self.slice)
slicemgr_url = self.config.PLC_OMF_SLICEMGR_URL
self.server = xmlrpclib.ServerProxy(slicemgr_url, allow_none = 1)
+ @ignore_exception()
def create_slice(self, slice):
self.server.createSlice(slice)
+ @ignore_exception()
def add_resource(self, slice, resource):
self.server.addResource(slice, resource)
+ @ignore_exception()
def delete_slice(self, slice):
self.server.deleteSlice(slice)
+ @ignore_exception()
def delete_resource(self, slice, resource):
self.server.removeResource(slice, resource)
git://git.onelab.eu / plcapi.git / blobdiff