# Network
def get_networks(self):
- #WARNING Added //default:network to the xpath
- #otherwise network element not detected 16/07/12 SA
+ # WARNING Added //default:network to the xpath
+ # otherwise network element not detected 16/07/12 SA
network_elems = self.xml.xpath('//network | //default:network')
- networks = [network_elem.get_instance(fields=['name', 'slice']) for \
+ networks = [network_elem.get_instance(fields=['name', 'slice']) for
network_elem in network_elems]
return networks
def get_nodes_with_slivers(self):
return Iotlabv1Node.get_nodes_with_slivers(self.xml)
- def get_slice_timeslot(self ):
+ def get_slice_timeslot(self):
return Iotlabv1Timeslot.get_slice_timeslot(self.xml)
def add_connection_information(self, ldap_username, sites_set):
- return Iotlabv1Node.add_connection_information(self.xml,ldap_username, sites_set)
+ return Iotlabv1Node.add_connection_information(self.xml, ldap_username, sites_set)
def add_nodes(self, nodes, check_for_dupes=False, rspec_content_type=None):
- return Iotlabv1Node.add_nodes(self.xml,nodes, rspec_content_type)
+ return Iotlabv1Node.add_nodes(self.xml, nodes, rspec_content_type)
- def merge_node(self, source_node_tag, network, no_dupes = False):
+ def merge_node(self, source_node_tag, network, no_dupes=False):
logger.debug("SLABV1 merge_node")
- #if no_dupes and self.get_node_element(node['hostname']):
- ## node already exists
- #return
+ # if no_dupes and self.get_node_element(node['hostname']):
+ # node already exists
+ # return
network_tag = self.add_network(network)
network_tag.append(deepcopy(source_node_tag))
# Slivers
def get_sliver_attributes(self, hostname, node, network=None):
- print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes hostname %s " %(hostname), file=sys.stderr)
- nodes = self.get_nodes({'component_id': '*%s*' %hostname})
+ print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes hostname %s " % (
+ hostname), file=sys.stderr)
+ nodes = self.get_nodes({'component_id': '*%s*' % hostname})
attribs = []
- print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes-----------------nodes %s " %(nodes), file=sys.stderr)
+ print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes-----------------nodes %s " %
+ (nodes), file=sys.stderr)
if nodes is not None and isinstance(nodes, list) and len(nodes) > 0:
node = nodes[0]
- #if node :
+ # if node :
#sliver = node.xpath('./default:sliver | ./sliver')
#sliver = node.xpath('./default:sliver', namespaces=self.namespaces)
sliver = node['slivers']
sliver = sliver[0]
attribs = sliver
#attribs = self.attributes_list(sliver)
- print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes----------NN------- sliver %s self.namespaces %s attribs %s " %(sliver, self.namespaces,attribs), file=sys.stderr)
+ print("\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes----------NN------- sliver %s self.namespaces %s attribs %s " %
+ (sliver, self.namespaces, attribs), file=sys.stderr)
return attribs
def get_slice_attributes(self, network=None):
# TODO: default sliver attributes in the PG rspec?
default_ns_prefix = self.namespaces['default']
for node in nodes_with_slivers:
- sliver_attributes = self.get_sliver_attributes(node['component_id'],node, network)
+ sliver_attributes = self.get_sliver_attributes(
+ node['component_id'], node, network)
for sliver_attribute in sliver_attributes:
name = str(sliver_attribute[0])
text = str(sliver_attribute[1])
attribs = sliver_attribute[2]
# we currently only suppor the <initscript> and <flack> attributes
- #if 'info' in name:
- #attribute = {'name': 'flack_info', 'value': str(attribs), 'node_id': node}
- #slice_attributes.append(attribute)
- #elif 'initscript' in name:
+ # if 'info' in name:
+ #attribute = {'name': 'flack_info', 'value': str(attribs), 'node_id': node}
+ # slice_attributes.append(attribute)
+ # elif 'initscript' in name:
if 'initscript' in name:
if attribs is not None and 'name' in attribs:
value = attribs['name']
else:
value = text
- attribute = {'name': 'initscript', 'value': value, 'node_id': node}
+ attribute = {'name': 'initscript',
+ 'value': value, 'node_id': node}
slice_attributes.append(attribute)
-
return slice_attributes
def attributes_list(self, elem):
pass
def add_slivers(self, hostnames, attributes=None, sliver_urn=None, append=False):
- if attributes is None: attributes=[]
+ if attributes is None:
+ attributes = []
# all nodes hould already be present in the rspec. Remove all
# nodes that done have slivers
print("\r\n \r\n \r\n \t\t\t Iotlabv1.PY add_slivers ----->get_node ", file=sys.stderr)
node_elem = node_elems[0]
# determine sliver types for this node
- #TODO : add_slivers valid type of sliver needs to be changed 13/07/12 SA
- valid_sliver_types = ['iotlab-node', 'emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
+ # TODO : add_slivers valid type of sliver needs to be changed
+ # 13/07/12 SA
+ valid_sliver_types = [
+ 'iotlab-node', 'emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
#valid_sliver_types = ['emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
requested_sliver_type = None
for sliver_type in node_elem.get('slivers', []):
if not requested_sliver_type:
continue
sliver = {'type': requested_sliver_type,
- 'pl_tags': attributes}
- print("\r\n \r\n \r\n \t\t\t Iotlabv1.PY add_slivers node_elem %s sliver_type %s \r\n \r\n " %(node_elem, sliver_type), file=sys.stderr)
+ 'pl_tags': attributes}
+ print("\r\n \r\n \r\n \t\t\t Iotlabv1.PY add_slivers node_elem %s sliver_type %s \r\n \r\n " % (
+ node_elem, sliver_type), file=sys.stderr)
# remove available element
for available_elem in node_elem.xpath('./default:available | ./available'):
node_elem.remove(available_elem)
def remove_slivers(self, slivers, network=None, no_dupes=False):
Iotlabv1Node.remove_slivers(self.xml, slivers)
-
# Utility
def merge(self, in_rspec):
in_rspec = RSpecConverter.to_sfa_rspec(rspec.toxml())
rspec = RSpec(in_rspec)
# just copy over all networks
- #Attention special get_networks using //default:network xpath
+ # Attention special get_networks using //default:network xpath
current_networks = self.get_networks()
networks = rspec.version.get_networks()
for network in networks:
self.xml.append(network.element)
current_networks.append(current_network)
-
-
-
-
# Leases
def get_leases(self, lease_filter=None):
return SFAv1Lease.get_leases(self.xml, lease_filter)
- #return Iotlabv1Lease.get_leases(self.xml, lease_filter)
+ # return Iotlabv1Lease.get_leases(self.xml, lease_filter)
- def add_leases(self, leases, network = None, no_dupes=False):
+ def add_leases(self, leases, network=None, no_dupes=False):
SFAv1Lease.add_leases(self.xml, leases)
#Iotlabv1Lease.add_leases(self.xml, leases)
def get_channels(self, filter=None):
return []
- def add_channels(self, channels, network = None, no_dupes=False):
+ def add_channels(self, channels, network=None, no_dupes=False):
pass
# Links
def add_links(self, links):
pass
+
def add_link_requests(self, links):
pass
-
def cleanup(self):
# remove unncecessary elements, attributes
if self.type in ['request', 'manifest']:
enabled = True
content_type = 'ad'
schema = 'http://senslab.info/resources/rspec/1/ad.xsd'
- #http://www.geni.net/resources/rspec/3/ad.xsd'
+ # http://www.geni.net/resources/rspec/3/ad.xsd'
template = '<rspec type="advertisement" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://senslab.info/resources/rspec/1" xmlns:flack="http://senslab.info/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xsi:schemaLocation="http://senslab.info/resources/rspec/1 http://senslab.info/resources/rspec/1/ad.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
+
class Iotlabv1Request(Iotlabv1):
enabled = True
content_type = 'request'
schema = 'http://senslab.info/resources/rspec/1/request.xsd'
- #http://www.geni.net/resources/rspec/3/request.xsd
+ # http://www.geni.net/resources/rspec/3/request.xsd
template = '<rspec type="request" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://senslab.info/resources/rspec/1" xmlns:flack="http://senslab.info/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xsi:schemaLocation="http://senslab.info/resources/rspec/1 http://senslab.info/resources/rspec/1/request.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
+
class Iotlabv1Manifest(Iotlabv1):
enabled = True
content_type = 'manifest'
schema = 'http://senslab.info/resources/rspec/1/manifest.xsd'
- #http://www.geni.net/resources/rspec/3/manifest.xsd
+ # http://www.geni.net/resources/rspec/3/manifest.xsd
template = '<rspec type="manifest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://senslab.info/resources/rspec/1" xmlns:flack="http://senslab.info/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xsi:schemaLocation="http://senslab.info/resources/rspec/1 http://senslab.info/resources/rspec/1/manifest.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd"/>'
git://git.onelab.eu / sfa.git / blobdiff