from types import StringTypes
import time
import re
+import datetime
from PLC.Faults import *
-from PLC.Parameter import Parameter
-from PLC.Filter import Filter
+from PLC.Parameter import Parameter, Mixed
from PLC.Debug import profile
-from PLC.Table import Row, Table
-from PLC.SliceInstantiations import SliceInstantiations
-from PLC.Nodes import Node, Nodes
-from PLC.ForeignNodes import ForeignNode, ForeignNodes
-import PLC.Persons
-
-class Slice(Row):
+from PLC.Nodes import Node
+from PLC.Persons import Person, Persons
+from PLC.SlicePersons import SlicePerson, SlicePersons
+from PLC.SliceNodes import SliceNode, SliceNodes
+from PLC.SliceTags import SliceTag, SliceTags
+from PLC.Timestamp import Timestamp
+from PLC.Storage.AlchemyObject import AlchemyObj
+
+class Slice(AlchemyObj):
"""
Representation of a row in the slices table. To use, optionally
instantiate with a dict of values. Update as you would a
with a dict of values.
"""
- table_name = 'slices'
- primary_key = 'slice_id'
+ tablename = 'slices'
+
fields = {
- 'slice_id': Parameter(int, "Slice identifier"),
+ 'slice_id': Parameter(int, "Slice identifier", primary_key=True),
'site_id': Parameter(int, "Identifier of the site to which this slice belongs"),
+ 'tenant_id': Parameter(int, "Keystone tenant identifier"),
'name': Parameter(str, "Slice name", max = 32),
- 'instantiation': Parameter(str, "Slice instantiation state"),
+ 'instantiation': Parameter(str, "Slice instantiation state", nullok=True),
'url': Parameter(str, "URL further describing this slice", max = 254, nullok = True),
'description': Parameter(str, "Slice description", max = 2048, nullok = True),
'max_nodes': Parameter(int, "Maximum number of nodes that can be assigned to this slice"),
- 'creator_person_id': Parameter(int, "Identifier of the account that created this slice"),
- 'created': Parameter(int, "Date and time when slice was created, in seconds since UNIX epoch", ro = True),
- 'expires': Parameter(int, "Date and time when slice expires, in seconds since UNIX epoch"),
- '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),
+ 'creator_person_id': Parameter(str, "Identifier of the account that created this slice"),
+ 'created': Parameter(datetime, "Date and time when slice was created, in seconds since UNIX epoch", ro = True),
+ 'expires': Parameter(datetime, "Date and time when slice expires, in seconds since UNIX epoch"),
+ 'node_ids': Parameter([str], "List of nodes in this slice", joined = True),
+ 'person_ids': Parameter([str], "List of accounts that can use this slice", joined = True),
+ 'slice_tag_ids': Parameter([int], "List of slice attributes", joined = 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),
}
+ tags = {}
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-zA-Z0-9_]+$'
if not name or \
not re.match(good_name, name):
raise PLCInvalidArgument, "Invalid slice name"
conflicts = Slices(self.api, [name])
- for slice_id, slice in conflicts.iteritems():
- if 'slice_id' not in self or self['slice_id'] != slice_id:
- raise PLCInvalidArgument, "Slice name already in use"
+ for slice in conflicts:
+ if 'slice_id' not in self or self['slice_id'] != slice.slice_id:
+ raise PLCInvalidArgument, "Slice name already in use, %s"%name
return name
- def validate_instantiation(self, instantiation):
- instantiations = SliceInstantiations(self.api)
- if instantiation not in instantiations:
- raise PLCInvalidArgument, "No such instantiation state"
-
- return instantiation
-
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)
+ check_future = not ('is_deleted' in self and self['is_deleted'])
+ return Timestamp.sql_validate( expires, check_future = check_future)
- def add_node(self, node, is_foreign_node = False, commit = True):
- """
- Add node to existing slice.
- """
-
- assert 'slice_id' in self
- if not is_foreign_node:
- assert isinstance(node, Node)
- else:
- assert isinstance(node, ForeignNode)
- 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())
+ #add_person = Row.add_object(Person, 'slice_person')
+ #remove_person = Row.remove_object(Person, 'slice_person')
- if commit:
- self.api.db.commit()
+ #add_node = Row.add_object(Node, 'slice_node')
+ #remove_node = Row.remove_object(Node, 'slice_node')
- self['node_ids'].remove(node_id)
- node['slice_ids'].remove(slice_id)
+ #add_to_node_whitelist = Row.add_object(Node, 'node_slice_whitelist')
+ #delete_from_node_whitelist = Row.remove_object(Node, 'node_slice_whitelist')
- def sync(self, commit = True):
+ def sync(self, commit = True, validate=True):
"""
Add or update a slice.
"""
-
- # Before a new slice is added, delete expired slices
+ # sync the nova record and the plc record
+ AlchemyObj.sync(self, commit=commit, validate=validate)
+ # create the nova record
+ nova_fields = ['enabled', 'name', 'description']
+ nova_can_update = lambda (field, value): field in nova_fields
+ nova_slice = dict(filter(nova_can_update, self.items()))
if 'slice_id' not in self:
- expired = Slices(self.api, expires = -int(time.time())).values()
- for slice in expired:
- slice.delete(commit)
-
- Row.sync(self, commit)
+ # Before a new slice is added, delete expired slices
+ #expired = Slices(self.api, expires = -int(time.time()))
+ #for slice in expired:
+ # slice.delete(commit)
+ self.object = self.api.client_shell.keystone.tenants.create(**nova_slice)
+ self['tenant_id'] = self.object.id
+ AlchemyObj.insert(self, dict(self))
+ else:
+ self.object = self.api.client_shell.keystone.tenants.update(self['tenant_id'], **nova_slice)
+ AlchemyObj.update(self, {'slice_id': self['slice_id']}, dict(self))
def delete(self, commit = True):
"""
Delete existing slice.
"""
-
assert 'slice_id' in self
+ assert 'tenant_id' in self
+
+ # delete the nova object
+ tenant = self.api.client_shell.keystone.tenants.find(id=self['tenant_id'])
+ self.api.client_shell.keystone.tenants.delete(tenant)
- # 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)
+ # delete relationships
+ SlicePerson().delete(self, filter={'slice_id': self['slice_id']})
+ SliceNode().delete(self, filter={'slice_id': self['slice_id']})
+ SliceTag().delete(self, filter={'slice_id': self['slice_id']})
+
+ # delete slice
+ AlchemyObj.delete(self, dict(self))
- # Mark as deleted
- self['is_deleted'] = True
- self.sync(commit)
-class Slices(Table):
+class Slices(list):
"""
Representation of row(s) from the slices table in the
database.
"""
- def __init__(self, api, slice_filter = None, expires = int(time.time())):
- Table.__init__(self, api, Slice)
-
- sql = "SELECT %s FROM view_slices WHERE is_deleted IS False" % \
- ", ".join(Slice.fields)
-
- if expires is not None:
- if expires >= 0:
- sql += " AND expires > %(expires)d"
- else:
- expires = -expires
- sql += " AND expires < %(expires)d"
-
- if slice_filter is not None:
- if isinstance(slice_filter, list):
- # Separate the list into integers and strings
- ints = filter(lambda x: isinstance(x, (int, long)), slice_filter)
- strs = filter(lambda x: isinstance(x, StringTypes), slice_filter)
- slice_filter = Filter(Slice.fields, {'slice_id': ints, 'name': strs})
- sql += " AND (%s)" % slice_filter.sql(api, "OR")
- elif isinstance(slice_filter, dict):
- slice_filter = Filter(Slice.fields, slice_filter)
- sql += " AND (%s)" % slice_filter.sql(api, "AND")
-
- self.selectall(sql, locals())
+ def __init__(self, api, slice_filter = None, columns = None, expires = int(time.time())):
+
+ # the view that we're selecting upon: start with view_slices
+ if not slice_filter:
+ slices = Slice().select()
+ elif isinstance (slice_filter, StringTypes):
+ slices = Slice().select(filter={'name': slice_filter})
+ elif isinstance(slice_filter, dict):
+ slices = Slice().select(filter=slice_filter)
+ elif isinstance(slice_filter, (list, tuple, set)):
+ slices = Slice().select()
+ slices = [slice for slice in slices if slice.id in slice_filter]
+ else:
+ raise PLCInvalidArgument, "Wrong slice filter %r"%slice_filter
+
+ for slice in slices:
+ slice = Slice(api, object=slice)
+ if not columns or 'person_ids' in columns:
+ slice_persons = SlicePerson().select(filter={'slice_id': slice.id})
+ slice['person_ids'] = [rec.person_id for rec in slice_persons]
+
+ if not columns or 'node_ids' in columns:
+ slice_nodes = SliceNode().select(filter={'slice_id': slice.id})
+ slice['node_ids'] = [rec.node_id for rec in slice_nodes]
+
+ if not columns or 'slice_tag_ids' in columns:
+ slice_tags = SliceTag().select(filter={'slice_id': slice.id})
+ slice['slice_tag_ids'] = [rec.slice_tag_id for rec in slice_tags]
+
+ self.append(slice)
git://git.onelab.eu / plcapi.git / blobdiff