git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
rspecs
/
versions
/
pgv3.py
diff --git
a/sfa/rspecs/versions/pgv3.py
b/sfa/rspecs/versions/pgv3.py
index
0de84bb
..
a4413c1
100644
(file)
--- a/
sfa/rspecs/versions/pgv3.py
+++ b/
sfa/rspecs/versions/pgv3.py
@@
-25,7
+25,7
@@
class GENIv3Ad(GENIv3):
<opstate:sliver_type name="plab-vserver" />
<opstate:sliver_type name="plos-pc" />
<opstate:state name="geni_notready">
<opstate:sliver_type name="plab-vserver" />
<opstate:sliver_type name="plos-pc" />
<opstate:state name="geni_notready">
- <opstate:action name="geni_start" next="geni_
configuring
">
+ <opstate:action name="geni_start" next="geni_
ready
">
<opstate:description>Boot the node</opstate:description>
</opstate:action>
<opstate:description>VMs begin powered down or inactive. They
<opstate:description>Boot the node</opstate:description>
</opstate:action>
<opstate:description>VMs begin powered down or inactive. They