git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0eae512
)
Adjusting code as one can no longer pass 'expires' to AddSlice() and 'name' to Update...
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Thu, 23 Jul 2009 00:28:46 +0000
(
00:28
+0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Thu, 23 Jul 2009 00:28:46 +0000
(
00:28
+0000)
db-config
patch
|
blob
|
history
diff --git
a/db-config
b/db-config
index
efcf803
..
1eb78b1
100755
(executable)
--- a/
db-config
+++ b/
db-config
@@
-71,15
+71,25
@@
def SetConfFile(conf_file):
def SetSlice(slice, tags):
# Create or Update slice
def SetSlice(slice, tags):
# Create or Update slice
- slices = GetSlices([slice['name']])
+ slice_name = slice['name']
+ slices = GetSlices([slice_name])
if len(slices)==1:
slice_id = slices[0]['slice_id']
if len(slices)==1:
slice_id = slices[0]['slice_id']
+ if slice.has_key('name'):
+ del slice['name']
UpdateSlice(slice_id, slice)
UpdateSlice(slice_id, slice)
+ slice['name']=slice_name
else:
else:
- AddSlice(slice)
+ expires = None
+ if slice.has_key('expires'):
+ expires = slice['expires']
+ del slice['expires']
+ slice_id = AddSlice(slice)
+ if expires <> None:
+ UpdateSlice(slice_id, {'expires':expires})
# Get slice structure with all fields
# Get slice structure with all fields
- slice = GetSlices([slice
['name']
])[0]
+ slice = GetSlices([slice
_name
])[0]
# Create/update all tags
slice_tags = {}
# Create/update all tags
slice_tags = {}
@@
-94,9
+104,9
@@
def SetSlice(slice, tags):
# only update slice tags that have changed
for (name, value) in tags:
if name not in slice_tags:
# only update slice tags that have changed
for (name, value) in tags:
if name not in slice_tags:
- AddSliceTag(slice
['name']
, name, value)
+ AddSliceTag(slice
_name
, name, value)
elif value <> slice_tags[name]:
elif value <> slice_tags[name]:
- UpdateSliceTag(slice
['name']
,value)
+ UpdateSliceTag(slice
_name
,value)
def SetMessage(message):
messages = GetMessages([message['message_id']])
def SetMessage(message):
messages = GetMessages([message['message_id']])