from lxml import etree
from copy import deepcopy
from StringIO import StringIO
-from sfa.util.xrn import *
+from sfa.util.xrn import urn_to_sliver_id
from sfa.util.plxrn import hostname_to_urn, xrn_to_hostname
from sfa.rspecs.rspec_version import BaseVersion
from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
}
namespaces = dict(extensions.items() + [('default', namespace)])
- elements = [
- RSpecElement(RSpecElements.NETWORK, 'network', '//default:node[@component_manager_id][1]'),
- RSpecElement(RSpecElements.NODE, 'node', '//default:node | //node'),
- RSpecElement(RSpecElements.SLIVER, 'sliver', '//default:node/default:sliver_type | //node/sliver_type'),
- ]
+ elements = []
def get_network(self):
network = None
return slice_attributes
def get_links(self, network=None):
- links = PGv2Link.get_links(self.xml, self.namespaces)
- return links
+ return PGv2Link.get_links(self.xml)
+
+ def get_link_requests(self):
+ return PGv2Link.get_link_requests(self.xml)
def add_links(self, links):
PGv2Link.add_links(self.xml, links)
+ def add_link_requests(self, link_tuples, append=False):
+ PGv2Link.add_link_requests(self.xml, link_tuples, append)
+
def attributes_list(self, elem):
opts = []
if elem is not None:
def add_interfaces(self, interfaces, no_dupes=False):
pass
- def add_links(self, links, no_dupes=False):
- for link in links:
- link_elem = etree.SubElement(self.xml.root, 'link' )
- link_elem.set('component_name', link.component_name)
- link_elem.set('component_id', link.component_id)
- cm_elem = etree.SubElement(link_elem, 'component_manager')
- cm_elem.set('name', link.component_manager_name)
- for endpoint in [link.endpoint1, link.enpoint2]:
- interface_ref = etree.SubElement(link_elem, 'interface_ref', component_id=endpoint.id)
-
- property_attrs = {'capicity': link.capacity,
- 'latency': link.latency,
- 'packet_loss': link.packet_loss}
- property1 = etree.SubElement(link_elem, 'property', source_id=link.endpoint1.id, \
- dest_id = link.endpoint2.id, capacity = link.capacity, latency=link.latency, \
- packet_loss = link.packet_loss)
-
- property2 = etree.SubElement(link_elem, 'property', source_id=link.endpoint2.id, \
- dest_id = link.endpoint1.id, capacity = link.capacity, latency=link.latency, \
- packet_loss = link.packet_loss)
- link_type = etree.SubElement(link_elem, 'link_type', name=link.type)
-
def merge(self, in_rspec):
"""
Merge contents for specified rspec with current rspec