git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8903c52
)
remove dubugging output
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 5 Feb 2009 19:14:40 +0000
(19:14 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 5 Feb 2009 19:14:40 +0000
(19:14 +0000)
geni/util/specdict.py
patch
|
blob
|
history
diff --git
a/geni/util/specdict.py
b/geni/util/specdict.py
index
4b225db
..
0fe52c9
100644
(file)
--- a/
geni/util/specdict.py
+++ b/
geni/util/specdict.py
@@
-38,7
+38,6
@@
class SpecDict(dict):
if isinstance(expected, StringTypes):
if self.plc_fields.has_key(field):
plc_field = self.plc_fields[field]
if isinstance(expected, StringTypes):
if self.plc_fields.has_key(field):
plc_field = self.plc_fields[field]
- print self.type, spec_dict
if spec_dict.has_key(plc_field):
value = spec_dict[plc_field]
elif isinstance(expected, ListType):
if spec_dict.has_key(plc_field):
value = spec_dict[plc_field]
elif isinstance(expected, ListType):
@@
-47,8
+46,6
@@
class SpecDict(dict):
plc_field = self.plc_fields[field]
if spec_dict.has_key(plc_field):
value = [expected(value) for value in spec_dict[plc_field]]
plc_field = self.plc_fields[field]
if spec_dict.has_key(plc_field):
value = [expected(value) for value in spec_dict[plc_field]]
-
-
spec[field] = value
return {self.type: spec}
spec[field] = value
return {self.type: spec}
@@
-100,6
+97,9
@@
class RspecDict(SpecDict):
'duration': '',
'networks': [NetSpecDict]
}
'duration': '',
'networks': [NetSpecDict]
}
- plc_fields = {'networks': 'networks'}
+ plc_fields = {'networks': 'networks',
+ 'start_time': 'start_tim',
+ 'duration': 'duration'
+ }
# vim:ts=4:expandtab
# vim:ts=4:expandtab