git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
[sfa.git]
/
sfa
/
rspecs
/
versions
/
sfav1.py
diff --git
a/sfa/rspecs/versions/sfav1.py
b/sfa/rspecs/versions/sfav1.py
index
bdfeb47
..
6e973e7
100644
(file)
--- a/
sfa/rspecs/versions/sfav1.py
+++ b/
sfa/rspecs/versions/sfav1.py
@@
-46,8
+46,8
@@
class SFAv1(RSpecVersion):
def get_nodes_with_slivers(self):
return SFAv1Node.get_nodes_with_slivers(self.xml)
def get_nodes_with_slivers(self):
return SFAv1Node.get_nodes_with_slivers(self.xml)
- def add_nodes(self, nodes, network = None, no_dupes=False):
- SFAv1Node.add_nodes(self.xml, nodes)
+ def add_nodes(self, nodes, network = None, no_dupes=False
, rspec_content_type=None
):
+ SFAv1Node.add_nodes(self.xml, nodes
, rspec_content_type
)
def merge_node(self, source_node_tag, network, no_dupes=False):
if no_dupes and self.get_node_element(node['hostname']):
def merge_node(self, source_node_tag, network, no_dupes=False):
if no_dupes and self.get_node_element(node['hostname']):
@@
-59,7
+59,8
@@
class SFAv1(RSpecVersion):
# Slivers
# Slivers
- def add_slivers(self, hostnames, attributes=[], sliver_urn=None, append=False):
+ def add_slivers(self, hostnames, attributes=None, sliver_urn=None, append=False):
+ if attributes is None: attributes=[]
# add slice name to network tag
network_tags = self.xml.xpath('//network')
if network_tags:
# add slice name to network tag
network_tags = self.xml.xpath('//network')
if network_tags:
@@
-225,6
+226,14
@@
class SFAv1(RSpecVersion):
def add_leases(self, leases, network = None, no_dupes=False):
SFAv1Lease.add_leases(self.xml, leases)
def add_leases(self, leases, network = None, no_dupes=False):
SFAv1Lease.add_leases(self.xml, leases)
+ # Spectrum
+
+ def get_channels(self, filter=None):
+ return []
+
+ def add_channels(self, channels, network = None, no_dupes=False):
+ pass
+
if __name__ == '__main__':
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec_elements import *
if __name__ == '__main__':
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec_elements import *