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
2to3 -f raise
[sfa.git]
/
sfa
/
rspecs
/
versions
/
ofeliav1.py
diff --git
a/sfa/rspecs/versions/ofeliav1.py
b/sfa/rspecs/versions/ofeliav1.py
index
cd206ff
..
0608e7a
100755
(executable)
--- a/
sfa/rspecs/versions/ofeliav1.py
+++ b/
sfa/rspecs/versions/ofeliav1.py
@@
-1,5
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+from __future__ import print_function
+
from copy import deepcopy
from lxml import etree
from copy import deepcopy
from lxml import etree
@@
-28,7
+30,7
@@
class Ofelia(RSpecVersion):
# Network
def get_networks(self):
# Network
def get_networks(self):
- raise Exception
, "Not implemented"
+ raise Exception
("Not implemented")
network_elems = self.xml.xpath('//network')
networks = [network_elem.get_instance(fields=['name', 'slice']) for \
network_elem in network_elems]
network_elems = self.xml.xpath('//network')
networks = [network_elem.get_instance(fields=['name', 'slice']) for \
network_elem in network_elems]
@@
-36,7
+38,7
@@
class Ofelia(RSpecVersion):
def add_network(self, network):
def add_network(self, network):
- raise Exception
, "Not implemented"
+ raise Exception
("Not implemented")
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
network_tag = self.xml.add_element('network', name=network)
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
network_tag = self.xml.add_element('network', name=network)
@@
-86,7
+88,8
@@
class Ofelia(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:
@@
-230,7
+233,7
@@
if __name__ == '__main__':
import pprint
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec_elements import *
import pprint
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec_elements import *
- print
"main ofeliav1"
+ print
("main ofeliav1")
if len(sys.argv)!=2:
r = RSpec('/tmp/resources.rspec')
else:
if len(sys.argv)!=2:
r = RSpec('/tmp/resources.rspec')
else: