git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more macros
[tests.git]
/
qaapi
/
qa
/
Slices.py
diff --git
a/qaapi/qa/Slices.py
b/qaapi/qa/Slices.py
index
f16919b
..
af343f6
100644
(file)
--- a/
qaapi/qa/Slices.py
+++ b/
qaapi/qa/Slices.py
@@
-4,23
+4,30
@@
from Table import Table
class Slice(dict, Remote):
class Slice(dict, Remote):
-
fields = {
- 'plcs': ['TestPLC'],
+ fields = {
+ 'plcs': ['TestPLC'],
# which plc does this slice belong to
'name': None,
'instantiation': 'plc-instantiated',
'max_nodes': 1000,
'description': 'blank',
'url': None,
'name': None,
'instantiation': 'plc-instantiated',
'max_nodes': 1000,
'description': 'blank',
'url': None,
- 'key': None
+ 'key': None, # any valid ssh key
+ 'nodes': [], # nodes where this slice runs
+ 'persons': [], # persons on this slice
+ 'tests_path': '/usr/share/tests/',
+ '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(list, Table):
- def __init__(self, slices):
- slicelist = [Slice(slice) for slice in slices]
- list.__init__(self, slicelist)
+
+
+class Slices(Table):
+ def __init__(self, config, slices):
+ slicelist = [Slice(config, slice) for slice in slices]
+ Table.__init__(self, slicelist)
+ self.config = config