X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fnitosv1Channel.py;h=04f4aa6e146a83941edd735d9ea454224ac96dfb;hb=6766a510ba0528c1c880497d4ae5a547cc76844a;hp=cf4a5f6106e171cf29dea3175eeaf80c24cd7944;hpb=4f9d407d0ce159bdb359e9ab500bf88b5f586e62;p=sfa.git diff --git a/sfa/rspecs/elements/versions/nitosv1Channel.py b/sfa/rspecs/elements/versions/nitosv1Channel.py index cf4a5f61..04f4aa6e 100644 --- a/sfa/rspecs/elements/versions/nitosv1Channel.py +++ b/sfa/rspecs/elements/versions/nitosv1Channel.py @@ -23,18 +23,18 @@ class NITOSv1Channel: @staticmethod def add_channels(xml, channels): - + network_elems = xml.xpath('//network') if len(network_elems) > 0: network_elem = network_elems[0] elif len(channels) > 0: - # dirty hack that handles no resource manifest rspec + # dirty hack that handles no resource manifest rspec network_urn = "omf" - network_elem = xml.add_element('network', name = network_urn) + network_elem = xml.add_element('network', name=network_urn) else: network_elem = xml -# spectrum_elems = xml.xpath('//spectrum') +# spectrum_elems = xml.xpath('//spectrum') # spectrum_elem = xml.add_element('spectrum') # if len(spectrum_elems) > 0: @@ -44,25 +44,28 @@ class NITOSv1Channel: # else: # spectrum_elem = xml - spectrum_elem = network_elem.add_instance('spectrum', []) - - channel_elems = [] + spectrum_elem = network_elem.add_instance('spectrum', []) + + channel_elems = [] for channel in channels: - channel_fields = ['channel_num', 'frequency', 'standard', 'component_id'] - channel_elem = spectrum_elem.add_instance('channel', channel, channel_fields) + channel_fields = ['channel_num', + 'frequency', 'standard', 'component_id'] + channel_elem = spectrum_elem.add_instance( + 'channel', channel, channel_fields) channel_elems.append(channel_elem) - @staticmethod def get_channels(xml, filter=None): - if filter is None: filter={} - xpath = '//channel%s | //default:channel%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) + if filter is None: + filter = {} + xpath = '//channel%s | //default:channel%s' % ( + XpathFilter.xpath(filter), XpathFilter.xpath(filter)) channel_elems = xml.xpath(xpath) return NITOSv1Channel.get_channel_objs(channel_elems) @staticmethod def get_channel_objs(channel_elems): - channels = [] + channels = [] for channel_elem in channel_elems: channel = Channel(channel_elem.attrib, channel_elem) channel['channel_num'] = channel_elem.attrib['channel_num'] @@ -71,5 +74,4 @@ class NITOSv1Channel: channel['component_id'] = channel_elem.attrib['component_id'] channels.append(channel) - return channels - + return channels