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
added step sfa-describe that at the very least does a rain check on sfi describe...
[tests.git]
/
system
/
TestSliceSfa.py
diff --git
a/system/TestSliceSfa.py
b/system/TestSliceSfa.py
index
d230e5b
..
6621a44
100644
(file)
--- a/
system/TestSliceSfa.py
+++ b/
system/TestSliceSfa.py
@@
-105,11
+105,18
@@
class TestSliceSfa:
def reqfile (self): return self._resname("req", "rspec")
def empty_reqfile (self): return "empty-rspec.xml"
def nodefile (self): return self._resname("nodes", "txt")
def reqfile (self): return self._resname("req", "rspec")
def empty_reqfile (self): return "empty-rspec.xml"
def nodefile (self): return self._resname("nodes", "txt")
+ def describfile (self): return self._resname("describ", "rspec")
+ def sfa_describe(self, options):
+ "run sfi describe into described.rspec"
+ return self.test_plc.run_in_guest(self.sfi_user(
+ "describe {} -o {}/{}"
+ .format(self.hrn(), self.sfi_path(), self.describfile()))) == 0
+
# run as user
def sfa_discover(self, options):
# run as user
def sfa_discover(self, options):
- "discover resources into
resouces_in
.rspec"
- return self.test_plc.run_in_guest(self.sfi_user(
\
+ "discover resources into
ad
.rspec"
+ return self.test_plc.run_in_guest(self.sfi_user(
"resources {} -o {}/{}"\
.format(self.discover_option(),self.sfi_path(),self.adfile()))) == 0
"resources {} -o {}/{}"\
.format(self.discover_option(),self.sfi_path(),self.adfile()))) == 0
@@
-195,12
+202,12
@@
class TestSliceSfa:
# locate a key
private_key=self.locate_private_key()
if not private_key :
# locate a key
private_key=self.locate_private_key()
if not private_key :
- utils.header("WARNING: Cannot find a valid key for slice {}".format(self.
name
()))
+ utils.header("WARNING: Cannot find a valid key for slice {}".format(self.
hrn
()))
return False
command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
return False
command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
- tasks
=
[]
- slicename
=
self.plc_name()
+ tasks
=
[]
+ slicename
=
self.plc_name()
dry_run = getattr(options,'dry_run',False)
for nodename in self.slice_spec['nodenames']:
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
dry_run = getattr(options,'dry_run',False)
for nodename in self.slice_spec['nodenames']:
(site_spec,node_spec) = self.test_plc.locate_node(nodename)