summaryrefslogtreecommitdiff
path: root/ick2/trans.py
diff options
context:
space:
mode:
Diffstat (limited to 'ick2/trans.py')
-rw-r--r--ick2/trans.py40
1 files changed, 20 insertions, 20 deletions
diff --git a/ick2/trans.py b/ick2/trans.py
index 171c996..afbeeb2 100644
--- a/ick2/trans.py
+++ b/ick2/trans.py
@@ -19,14 +19,14 @@ import ick2
class TransactionalResource:
- def __init__(self, token, state, kind, rid):
+ def __init__(self, token, state, kind, name):
self.token = token
self.state = state
self.kind = kind
- self.rid = rid
- if state.has_resource(self.token, kind, rid):
+ self.name = name
+ if state.has_resource(self.token, kind, name):
self.new = False
- self.resource = state.get_resource(self.token, kind, rid)
+ self.resource = state.get_resource(self.token, kind, name)
else:
self.new = True
self.resource = ick2.resource_from_dict({})
@@ -48,10 +48,10 @@ class TransactionalResource:
if exc_type is None:
if self.new:
self.state.write_resource(
- self.token, self.kind, self.rid, self.resource)
+ self.token, self.kind, self.name, self.resource)
else:
self.state.update_resource(
- self.token, self.kind, self.rid, self.resource)
+ self.token, self.kind, self.name, self.resource)
class TransactionalState:
@@ -59,25 +59,25 @@ class TransactionalState:
def __init__(self, state):
self.state = state
- def new(self, token, kind, rid):
- return TransactionalResource(token, self.state, kind, rid)
+ def new(self, token, kind, name):
+ return TransactionalResource(token, self.state, kind, name)
- def modify(self, token, kind, rid):
- if not self.state.has_resource(token, kind, rid):
- raise ick2.NotFound(kind=kind, rid=rid)
- return TransactionalResource(token, self.state, kind, rid)
+ def modify(self, token, kind, name):
+ if not self.state.has_resource(token, kind, name):
+ raise ick2.NotFound(kind=kind, name=name)
+ return TransactionalResource(token, self.state, kind, name)
- def get_resource_ids(self, token, kind):
- return self.state.get_resource_ids(token, kind)
+ def get_resource_names(self, token, kind):
+ return self.state.get_resource_names(token, kind)
- def has_resource(self, token, kind, rid):
- return self.state.has_resource(token, kind, rid)
+ def has_resource(self, token, kind, name):
+ return self.state.has_resource(token, kind, name)
- def get_resource(self, token, kind, rid):
- return self.state.get_resource(token, kind, rid)
+ def get_resource(self, token, kind, name):
+ return self.state.get_resource(token, kind, name)
def get_resources(self, token, kind):
return self.state.get_resources(token, kind)
- def remove_resource(self, token, kind, rid):
- self.state.remove_resource(token, kind, rid)
+ def remove_resource(self, token, kind, name):
+ self.state.remove_resource(token, kind, name)