from PLC.Filter import Filter
from PLC.Debug import profile
from PLC.Table import Row, Table
-from PLC.SliceInstantiations import SliceInstantiations
+from PLC.SliceInstantiations import SliceInstantiation, SliceInstantiations
from PLC.Nodes import Node, Nodes
-import PLC.Persons
+from PLC.Persons import Person, Persons
class Slice(Row):
"""
table_name = 'slices'
primary_key = 'slice_id'
+ join_tables = ['slice_node', 'slice_person', 'slice_attribute', 'peer_slice']
fields = {
'slice_id': Parameter(int, "Slice identifier"),
'site_id': Parameter(int, "Identifier of the site to which this slice belongs"),
- 'peer_id': Parameter(int, "Peer at which this slice was created", nullok = True),
'name': Parameter(str, "Slice name", max = 32),
'instantiation': Parameter(str, "Slice instantiation state"),
'url': Parameter(str, "URL further describing this slice", max = 254, nullok = True),
'node_ids': Parameter([int], "List of nodes in this slice", ro = True),
'person_ids': Parameter([int], "List of accounts that can use this slice", ro = True),
'slice_attribute_ids': Parameter([int], "List of slice attributes", ro = True),
+ 'peer_id': Parameter(int, "Peer to which this slice belongs", nullok = True),
+ 'peer_slice_id': Parameter(int, "Foreign slice identifier at peer", nullok = True),
}
+ # for Cache
+ class_key = 'name'
+ foreign_fields = ['instantiation', 'url', 'description', 'max_nodes', 'expires']
+ foreign_xrefs = [
+ {'field': 'node_ids' , 'class': 'Node', 'table': 'slice_node' },
+ {'field': 'person_ids', 'class': 'Person', 'table': 'slice_person'},
+ {'field': 'creator_person_id', 'class': 'Person', 'table': 'unused-on-direct-refs'},
+ {'field': 'site_id', 'class': 'Site', 'table': 'unused-on-direct-refs'},
+ ]
+ # forget about this one, it is read-only anyway
+ # handling it causes Cache to re-sync all over again
+ # 'created'
def validate_name(self, name):
# N.B.: Responsibility of the caller to ensure that login_base
# desired.
# 1. Lowercase.
- # 2. Begins with login_base (only letters).
+ # 2. Begins with login_base (letters or numbers).
# 3. Then single underscore after login_base.
# 4. Then letters, numbers, or underscores.
- good_name = r'^[a-z]+_[a-z0-9_]+$'
+ good_name = r'^[a-z0-9]+_[a-z0-9_]+$'
if not name or \
not re.match(good_name, name):
raise PLCInvalidArgument, "Invalid slice name"
conflicts = Slices(self.api, [name])
for slice in conflicts:
if 'slice_id' not in self or self['slice_id'] != slice['slice_id']:
- raise PLCInvalidArgument, "Slice name already in use"
+ raise PLCInvalidArgument, "Slice name already in use, %s"%name
return name
return instantiation
+ validate_created = Row.validate_timestamp
+
def validate_expires(self, expires):
# N.B.: Responsibility of the caller to ensure that expires is
# not too far into the future.
- if expires < time.time():
- raise PLCInvalidArgument, "Expiration date must be in the future"
-
- return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(expires))
-
- def add_person(self, person, commit = True):
- """
- Add person to existing slice.
- """
-
- assert 'slice_id' in self
- assert isinstance(person, PLC.Persons.Person)
- assert 'person_id' in person
-
- slice_id = self['slice_id']
- person_id = person['person_id']
-
- if person_id not in self['person_ids']:
- assert slice_id not in person['slice_ids']
-
- self.api.db.do("INSERT INTO slice_person (person_id, slice_id)" \
- " VALUES(%(person_id)d, %(slice_id)d)",
- locals())
-
- if commit:
- self.api.db.commit()
-
- self['person_ids'].append(person_id)
- person['slice_ids'].append(slice_id)
-
- def remove_person(self, person, commit = True):
- """
- Remove person from existing slice.
- """
-
- assert 'slice_id' in self
- assert isinstance(person, PLC.Persons.Person)
- assert 'person_id' in person
-
- slice_id = self['slice_id']
- person_id = person['person_id']
-
- if person_id in self['person_ids']:
- assert slice_id in person['slice_ids']
-
- self.api.db.do("DELETE FROM slice_person" \
- " WHERE person_id = %(person_id)d" \
- " AND slice_id = %(slice_id)d",
- locals())
-
- if commit:
- self.api.db.commit()
-
- self['person_ids'].remove(person_id)
- person['slice_ids'].remove(slice_id)
-
- def add_node(self, node, commit = True):
- """
- Add node to existing slice.
- """
-
- assert 'slice_id' in self
- assert isinstance(node, Node)
- assert 'node_id' in node
-
- slice_id = self['slice_id']
- node_id = node['node_id']
-
- if node_id not in self['node_ids']:
- assert slice_id not in node['slice_ids']
-
- self.api.db.do("INSERT INTO slice_node (node_id, slice_id)" \
- " VALUES(%(node_id)d, %(slice_id)d)",
- locals())
-
- if commit:
- self.api.db.commit()
-
- self['node_ids'].append(node_id)
- node['slice_ids'].append(slice_id)
-
- def remove_node(self, node, commit = True):
- """
- Remove node from existing slice.
- """
-
- assert 'slice_id' in self
- assert isinstance(node, Node)
- assert 'node_id' in node
-
- slice_id = self['slice_id']
- node_id = node['node_id']
-
- if node_id in self['node_ids']:
- assert slice_id in node['slice_ids']
-
- self.api.db.do("DELETE FROM slice_node" \
- " WHERE node_id = %(node_id)d" \
- " AND slice_id = %(slice_id)d",
- locals())
-
- if commit:
- self.api.db.commit()
-
- self['node_ids'].remove(node_id)
- node['slice_ids'].remove(slice_id)
-
- ########## for foreign slices update, from ForeignSlices
- def purge_slice_node (self,commit=True):
- sql = "DELETE FROM slice_node WHERE slice_id=%d"%self['slice_id']
- self.api.db.do(sql)
- if commit:
- self.api.db.commit()
+ check_future = not ('is_deleted' in self and self['is_deleted'])
+ return Row.validate_timestamp(self, expires, check_future = check_future)
- def add_slice_nodes (self, node_ids, commit=True):
- slice_id = self['slice_id']
- ### xxx needs to be optimized
- ### tried to figure a way to use a single sql statement
- ### like: insert into table (x,y) values (1,2),(3,4);
- ### but apparently this is not supported under postgresql
- for node_id in node_ids:
- sql="INSERT INTO slice_node VALUES (%d,%d)"%(slice_id,node_id)
- self.api.db.do(sql)
- if commit:
- self.api.db.commit()
+ add_person = Row.add_object(Person, 'slice_person')
+ remove_person = Row.remove_object(Person, 'slice_person')
- def update_slice_nodes (self, node_ids):
- # xxx to be optimized
- # we could compute the (set) difference between
- # current and updated set of node_ids
- # and invoke the DB only based on that
- #
- # for now : clean all entries for this slice
- self.purge_slice_node()
- # and re-install new list
- self.add_slice_nodes (node_ids)
+ add_node = Row.add_object(Node, 'slice_node')
+ remove_node = Row.remove_object(Node, 'slice_node')
- ##########
def sync(self, commit = True):
"""
Add or update a slice.
assert 'slice_id' in self
# Clean up miscellaneous join tables
- for table in ['slice_node', 'slice_person', 'slice_attribute']:
- self.api.db.do("DELETE FROM %s" \
- " WHERE slice_id = %d" % \
- (table, self['slice_id']), self)
+ for table in self.join_tables:
+ self.api.db.do("DELETE FROM %s WHERE slice_id = %d" % \
+ (table, self['slice_id']))
# Mark as deleted
self['is_deleted'] = True
git://git.onelab.eu / plcapi.git / blobdiff