from sfa.rspecs.version import RSpecVersion
import sys
-from sfa.rspecs.elements.versions.slabv1Lease import Slabv1Lease
-from sfa.rspecs.elements.versions.slabv1Node import Slabv1Node
-from sfa.rspecs.elements.versions.slabv1Sliver import Slabv1Sliver
+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.sfav1Lease import SFAv1Lease
from sfa.util.sfalogging import logger
-
-class Slabv1(RSpecVersion):
+
+class Iotlabv1(RSpecVersion):
#enabled = True
type = 'Slab'
content_type = 'ad'
}
namespaces = dict(extensions.items() + [('default', namespace)])
elements = []
-
- # Network
+
+ # Network
def get_networks(self):
- #WARNING Added //default:network to the xpath
+ #WARNING Added //default:network to the xpath
#otherwise network element not detected 16/07/12 SA
-
- network_elems = self.xml.xpath('//network | //default:network')
+
+ network_elems = self.xml.xpath('//network | //default:network')
networks = [network_elem.get_instance(fields=['name', 'slice']) for \
network_elem in network_elems]
- return networks
+ return networks
def add_network(self, network):
network_tag = network_tags[0]
return network_tag
-
+
# Nodes
def get_nodes(self, filter=None):
- return Slabv1Node.get_nodes(self.xml, filter)
+ return Iotlabv1Node.get_nodes(self.xml, filter)
def get_nodes_with_slivers(self):
- return Slabv1Node.get_nodes_with_slivers(self.xml)
-
+ return Iotlabv1Node.get_nodes_with_slivers(self.xml)
+
def get_slice_timeslot(self ):
- return Slabv1Timeslot.get_slice_timeslot(self.xml)
-
+ return Iotlabv1Timeslot.get_slice_timeslot(self.xml)
+
def add_connection_information(self, ldap_username, sites_set):
- return Slabv1Node.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):
- return Slabv1Node.add_nodes(self.xml,nodes )
-
+ return Iotlabv1Node.add_nodes(self.xml,nodes )
+
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']):
network_tag.append(deepcopy(source_node_tag))
# Slivers
-
- def get_sliver_attributes(self, hostname, node, network=None):
+
+ def get_sliver_attributes(self, hostname, node, network=None):
print>>sys.stderr, "\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes hostname %s " %(hostname)
nodes = self.get_nodes({'component_id': '*%s*' %hostname})
- attribs = []
+ attribs = []
print>>sys.stderr, "\r\n \r\n \r\n \t\t SLABV1.PY get_sliver_attributes-----------------nodes %s " %(nodes)
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']
-
+
if sliver is not None and isinstance(sliver, list) and len(sliver) > 0:
sliver = sliver[0]
attribs = sliver
return attribs
def get_slice_attributes(self, network=None):
-
+
slice_attributes = []
nodes_with_slivers = self.get_nodes_with_slivers()
value = text
attribute = {'name': 'initscript', 'value': value, 'node_id': node}
slice_attributes.append(attribute)
-
+
return slice_attributes
def add_slivers(self, hostnames, attributes=[], sliver_urn=None, append=False):
# all nodes hould already be present in the rspec. Remove all
# nodes that done have slivers
- print>>sys.stderr, "\r\n \r\n \r\n \t\t\t SLABv1.PY add_slivers ----->get_node "
+ print>>sys.stderr, "\r\n \r\n \r\n \t\t\t Iotlabv1.PY add_slivers ----->get_node "
for hostname in hostnames:
node_elems = self.get_nodes({'component_id': '*%s*' % hostname})
if not node_elems:
continue
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 = ['slab-node', 'emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
+ 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 sliver_type.get('type') in valid_sliver_types:
requested_sliver_type = sliver_type['type']
-
+
if not requested_sliver_type:
continue
sliver = {'type': requested_sliver_type,
'pl_tags': attributes}
- print>>sys.stderr, "\r\n \r\n \r\n \t\t\t SLABv1.PY add_slivers node_elem %s sliver_type %s \r\n \r\n " %(node_elem, sliver_type)
+ print>>sys.stderr, "\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)
# remove available element
for available_elem in node_elem.xpath('./default:available | ./available'):
node_elem.remove(available_elem)
-
+
# remove interface elements
for interface_elem in node_elem.xpath('./default:interface | ./interface'):
node_elem.remove(interface_elem)
-
+
# remove existing sliver_type elements
for sliver_type in node_elem.get('slivers', []):
node_elem.element.remove(sliver_type.element)
#node_elem.set('sliver_id', sliver_id)
# add the sliver type elemnt
- Slabv1Sliver.add_slivers(node_elem.element, sliver)
- #Slabv1SliverType.add_slivers(node_elem.element, sliver)
+ Iotlabv1Sliver.add_slivers(node_elem.element, sliver)
+ #Iotlabv1SliverType.add_slivers(node_elem.element, sliver)
# remove all nodes without slivers
if not append:
parent.remove(node_elem.element)
def remove_slivers(self, slivers, network=None, no_dupes=False):
- Slabv1Node.remove_slivers(self.xml, slivers)
-
-
+ Iotlabv1Node.remove_slivers(self.xml, slivers)
+
+
# Utility
-
+
def merge(self, in_rspec):
"""
Merge contents for specified rspec with current rspec
if not in_rspec:
return
-
+
from sfa.rspecs.rspec import RSpec
-
+
if isinstance(in_rspec, RSpec):
rspec = in_rspec
else:
rspec = RSpec(in_rspec)
# just copy over all networks
#Attention special get_networks using //default:network xpath
- current_networks = self.get_networks()
+ current_networks = self.get_networks()
networks = rspec.version.get_networks()
for network in networks:
current_network = network.get('name')
-
+
# Leases
def get_leases(self, lease_filter=None):
return SFAv1Lease.get_leases(self.xml, lease_filter)
- #return Slabv1Lease.get_leases(self.xml, lease_filter)
+ #return Iotlabv1Lease.get_leases(self.xml, lease_filter)
def add_leases(self, leases, network = None, no_dupes=False):
SFAv1Lease.add_leases(self.xml, leases)
- #Slabv1Lease.add_leases(self.xml, leases)
+ #Iotlabv1Lease.add_leases(self.xml, leases)
def cleanup(self):
# remove unncecessary elements, attributes
if self.type in ['request', 'manifest']:
# remove 'available' element from remaining node elements
self.xml.remove_element('//default:available | //available')
-
-
-class Slabv1Ad(Slabv1):
+
+
+class Iotlabv1Ad(Iotlabv1):
enabled = True
content_type = 'ad'
schema = 'http://senslab.info/resources/rspec/1/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 Slabv1Request(Slabv1):
+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
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 Slabv1Manifest(Slabv1):
+class Iotlabv1Manifest(Iotlabv1):
enabled = True
content_type = 'manifest'
schema = 'http://senslab.info/resources/rspec/1/manifest.xsd'
if __name__ == '__main__':
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec_elements import *
- r = RSpec('/tmp/slab.rspec')
- r.load_rspec_elements(Slabv1.elements)
- r.namespaces = Slabv1.namespaces
+ r = RSpec('/tmp/iotlab.rspec')
+ r.load_rspec_elements(Iotlabv1.elements)
+ r.namespaces = Iotlabv1.namespaces
print r.get(RSpecElements.NODE)
git://git.onelab.eu / sfa.git / blobdiff