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.util.sfalogging import logger
+
class Iotlabv1(RSpecVersion):
+ """
+ Defines Iotlab style RSpec and associated methods to parse and create a
+ valid Iotlab XML Rspec.
+ """
#enabled = True
- type = 'Slab'
+ type = 'Iotlab'
content_type = 'ad'
version = '1'
#template = '<RSpec type="%s"></RSpec>' % type
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:
network_tag = network_tags[0]
return network_tag
-
# Nodes
-
def get_nodes(self, filter=None):
return Iotlabv1Node.get_nodes(self.xml, filter)
def add_connection_information(self, ldap_username, sites_set):
return Iotlabv1Node.add_connection_information(self.xml,ldap_username, sites_set)
- def add_nodes(self, nodes, check_for_dupes=False):
- return Iotlabv1Node.add_nodes(self.xml,nodes )
+ def add_nodes(self, nodes, check_for_dupes=False, rspec_content_type=None):
+ return Iotlabv1Node.add_nodes(self.xml,nodes, rspec_content_type)
def merge_node(self, source_node_tag, network, no_dupes = False):
logger.debug("SLABV1 merge_node")