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
Adding and formatting documentation for Sphinx.
[sfa.git]
/
sfa
/
rspecs
/
versions
/
iotlabv1.py
diff --git
a/sfa/rspecs/versions/iotlabv1.py
b/sfa/rspecs/versions/iotlabv1.py
index
6d15973
..
cee1f90
100644
(file)
--- a/
sfa/rspecs/versions/iotlabv1.py
+++ b/
sfa/rspecs/versions/iotlabv1.py
@@
-3,7
+3,7
@@
from copy import deepcopy
from sfa.rspecs.version import RSpecVersion
import sys
from sfa.rspecs.version import RSpecVersion
import sys
-from sfa.rspecs.elements.versions.iotlabv1Lease import Iotlabv1Lease
+
#
from sfa.rspecs.elements.versions.iotlabv1Lease import Iotlabv1Lease
from sfa.rspecs.elements.versions.iotlabv1Node import Iotlabv1Node
from sfa.rspecs.elements.versions.iotlabv1Sliver import Iotlabv1Sliver
from sfa.rspecs.elements.versions.iotlabv1Node import Iotlabv1Node
from sfa.rspecs.elements.versions.iotlabv1Sliver import Iotlabv1Sliver
@@
-12,9
+12,14
@@
from sfa.rspecs.elements.versions.sfav1Lease import SFAv1Lease
from sfa.util.sfalogging import logger
from sfa.util.sfalogging import logger
+
class Iotlabv1(RSpecVersion):
class Iotlabv1(RSpecVersion):
+ """
+ Defines Iotlab style RSpec and associated methods to parse and create a
+ valid Iotlab XML Rspec.
+ """
#enabled = True
#enabled = True
- type = '
S
lab'
+ type = '
Iot
lab'
content_type = 'ad'
version = '1'
#template = '<RSpec type="%s"></RSpec>' % type
content_type = 'ad'
version = '1'
#template = '<RSpec type="%s"></RSpec>' % type
@@
-38,7
+43,6
@@
class Iotlabv1(RSpecVersion):
network_elem in network_elems]
return networks
network_elem in network_elems]
return networks
-
def add_network(self, network):
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
def add_network(self, network):
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
@@
-47,9
+51,7
@@
class Iotlabv1(RSpecVersion):
network_tag = network_tags[0]
return network_tag
network_tag = network_tags[0]
return network_tag
-
# Nodes
# Nodes
-
def get_nodes(self, filter=None):
return Iotlabv1Node.get_nodes(self.xml, filter)
def get_nodes(self, filter=None):
return Iotlabv1Node.get_nodes(self.xml, filter)