git://git.onelab.eu
/
tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3af2f93
)
minor updates
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 17 Jul 2008 21:31:05 +0000
(21:31 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 17 Jul 2008 21:31:05 +0000
(21:31 +0000)
qaapi/qa/Slices.py
patch
|
blob
|
history
diff --git
a/qaapi/qa/Slices.py
b/qaapi/qa/Slices.py
index
9bac1dc
..
af343f6
100644
(file)
--- a/
qaapi/qa/Slices.py
+++ b/
qaapi/qa/Slices.py
@@
-4,7
+4,7
@@
from Table import Table
class Slice(dict, Remote):
class Slice(dict, Remote):
-
fields = {
+ fields = {
'plcs': ['TestPLC'], # which plc does this slice belong to
'name': None,
'instantiation': 'plc-instantiated',
'plcs': ['TestPLC'], # which plc does this slice belong to
'name': None,
'instantiation': 'plc-instantiated',
@@
-13,17
+13,21
@@
class Slice(dict, Remote):
'url': None,
'key': None, # any valid ssh key
'nodes': [], # nodes where this slice runs
'url': None,
'key': None, # any valid ssh key
'nodes': [], # nodes where this slice runs
+ 'persons': [], # persons on this slice
'tests_path': '/usr/share/tests/',
'tests_path': '/usr/share/tests/',
- 'tests': [] # which test to run. None or empty list means run all
+ 'tests': []
,
# which test to run. None or empty list means run all
}
}
-
def __init__(self
, fields = {}):
+
def __init__(self, config
, fields = {}):
dict.__init__(self, self.fields)
dict.__init__(self, self.fields)
-
+ self.config = config
self.update(fields)
self.update(fields)
+
+
class Slices(Table):
class Slices(Table):
- def __init__(self, slices):
- slicelist = [Slice(slice) for slice in slices]
- Table.__init__(self, slicelist)
+ def __init__(self, config, slices):
+ slicelist = [Slice(config, slice) for slice in slices]
+ Table.__init__(self, slicelist)
+ self.config = config