from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import NodeElement
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
if len(network_elems) > 0:
network_elem = network_elems[0]
elif len(channels) > 0:
- #network_urn = Xrn(leases[0]['component_id']).get_authority_urn().split(':')[0]
- network_urn = "pla"
+ # dirty hack that handles no resource manifest rspec
+ network_urn = "omf"
network_elem = xml.add_element('network', name = network_urn)
else:
network_elem = xml
channel_elems = []
for channel in channels:
- channel_fields = ['channel_num', 'frequency', 'standard']
+ channel_fields = ['channel_num', 'frequency', 'standard', 'component_id']
channel_elem = spectrum_elem.add_instance('channel', channel, channel_fields)
channel_elems.append(channel_elem)
channel['channel_num'] = channel_elem.attrib['channel_num']
channel['frequency'] = channel_elem.attrib['frequency']
channel['standard'] = channel_elem.attrib['standard']
+ channel['component_id'] = channel_elem.attrib['component_id']
channels.append(channel)
return channels