git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c1d6fc
)
All versions of rspecs need to support "links" and "channels" management methods
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 17:03:46 +0000
(19:03 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 17:09:21 +0000
(19:09 +0200)
sfa/rspecs/versions/iotlabv1.py
patch
|
blob
|
history
sfa/rspecs/versions/nitosv1.py
patch
|
blob
|
history
sfa/rspecs/versions/pgv2.py
patch
|
blob
|
history
sfa/rspecs/versions/sfav1.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/versions/iotlabv1.py
b/sfa/rspecs/versions/iotlabv1.py
index
561b61c
..
9d8045f
100644
(file)
--- a/
sfa/rspecs/versions/iotlabv1.py
+++ b/
sfa/rspecs/versions/iotlabv1.py
@@
-245,6
+245,28
@@
class Iotlabv1(RSpecVersion):
SFAv1Lease.add_leases(self.xml, leases)
#Iotlabv1Lease.add_leases(self.xml, leases)
SFAv1Lease.add_leases(self.xml, leases)
#Iotlabv1Lease.add_leases(self.xml, leases)
+ # Spectrum
+
+ def get_channels(self, filter=None):
+ return []
+
+ def add_channels(self, channels, network = None, no_dupes=False):
+ pass
+
+ # Links
+
+ def get_links(self, network=None):
+ return []
+
+ def get_link_requests(self):
+ return []
+
+ def add_links(self, links):
+ pass
+ def add_link_requests(self, links):
+ pass
+
+
def cleanup(self):
# remove unncecessary elements, attributes
if self.type in ['request', 'manifest']:
def cleanup(self):
# remove unncecessary elements, attributes
if self.type in ['request', 'manifest']:
diff --git
a/sfa/rspecs/versions/nitosv1.py
b/sfa/rspecs/versions/nitosv1.py
index
72133ac
..
af60d8e
100644
(file)
--- a/
sfa/rspecs/versions/nitosv1.py
+++ b/
sfa/rspecs/versions/nitosv1.py
@@
-173,21
+173,15
@@
class NITOSv1(RSpecVersion):
# Links
def get_links(self, network=None):
# Links
def get_links(self, network=None):
- return
PGv2Link.get_links(self.xml)
+ return
[]
def get_link_requests(self):
def get_link_requests(self):
- return
PGv2Link.get_link_requests(self.xml)
+ return
[]
def add_links(self, links):
def add_links(self, links):
- networks = self.get_networks()
- if len(networks) > 0:
- xml = networks[0].element
- else:
- xml = self.xml
- PGv2Link.add_links(xml, links)
-
+ pass
def add_link_requests(self, links):
def add_link_requests(self, links):
- PGv2Link.add_link_requests(self.xml, links)
+ pass
# utility
# utility
@@
-223,7
+217,8
@@
class NITOSv1(RSpecVersion):
def get_leases(self, filter=None):
return NITOSv1Lease.get_leases(self.xml, filter)
def get_leases(self, filter=None):
return NITOSv1Lease.get_leases(self.xml, filter)
- def add_leases(self, leases, channels, network = None, no_dupes=False):
+ def add_leases(self, leases_channels, network = None, no_dupes=False):
+ leases, channels = leases_channels
NITOSv1Lease.add_leases(self.xml, leases, channels)
# Spectrum
NITOSv1Lease.add_leases(self.xml, leases, channels)
# Spectrum
diff --git
a/sfa/rspecs/versions/pgv2.py
b/sfa/rspecs/versions/pgv2.py
index
cfe1eae
..
80febc9
100644
(file)
--- a/
sfa/rspecs/versions/pgv2.py
+++ b/
sfa/rspecs/versions/pgv2.py
@@
-182,6
+182,14
@@
class PGv2(RSpecVersion):
def add_leases(self, leases, network = None, no_dupes=False):
PGv2Lease.add_leases(self.xml, leases)
def add_leases(self, leases, network = None, no_dupes=False):
PGv2Lease.add_leases(self.xml, leases)
+ # Spectrum
+
+ def get_channels(self, filter=None):
+ return []
+
+ def add_channels(self, channels, network = None, no_dupes=False):
+ pass
+
# Utility
def merge(self, in_rspec):
# Utility
def merge(self, in_rspec):
diff --git
a/sfa/rspecs/versions/sfav1.py
b/sfa/rspecs/versions/sfav1.py
index
fa5f9d4
..
4ee8a4c
100644
(file)
--- a/
sfa/rspecs/versions/sfav1.py
+++ b/
sfa/rspecs/versions/sfav1.py
@@
-225,6
+225,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 *