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 (from parent 1:
b738614
)
Make Nitos Rspecs version independante from the Nitos driver
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 18 Sep 2012 17:32:16 +0000
(19:32 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 18 Sep 2012 17:32:16 +0000
(19:32 +0200)
sfa/rspecs/elements/versions/nitosv1Channel.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/nitosv1Lease.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/nitosv1Node.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/elements/versions/nitosv1Channel.py
b/sfa/rspecs/elements/versions/nitosv1Channel.py
index
610c86b
..
5ca8737
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Channel.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Channel.py
@@
-18,7
+18,6
@@
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.spectrum import Spectrum
from sfa.rspecs.elements.channel import Channel
from sfa.rspecs.elements.spectrum import Spectrum
from sfa.rspecs.elements.channel import Channel
-from sfa.planetlab.plxrn import xrn_to_hostname
class NITOSv1Channel:
class NITOSv1Channel:
diff --git
a/sfa/rspecs/elements/versions/nitosv1Lease.py
b/sfa/rspecs/elements/versions/nitosv1Lease.py
index
5d175e6
..
dda33e9
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Lease.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Lease.py
@@
-18,7
+18,6
@@
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.channel import Channel
from sfa.rspecs.elements.channel import Channel
-from sfa.nitos.nitosxrn import xrn_to_hostname
class NITOSv1Lease:
class NITOSv1Lease:
diff --git
a/sfa/rspecs/elements/versions/nitosv1Node.py
b/sfa/rspecs/elements/versions/nitosv1Node.py
index
2d45d0a
..
c9235d6
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Node.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Node.py
@@
-16,7
+16,6
@@
from sfa.rspecs.elements.versions.nitosv1Sliver import NITOSv1Sliver
from sfa.rspecs.elements.versions.nitosv1PLTag import NITOSv1PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.versions.nitosv1PLTag import NITOSv1PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
-from sfa.nitos.nitosxrn import xrn_to_hostname
class NITOSv1Node:
class NITOSv1Node:
@@
-44,7
+43,7
@@
class NITOSv1Node:
# set component_name attribute and hostname element
if 'component_id' in node and node['component_id']:
# set component_name attribute and hostname element
if 'component_id' in node and node['component_id']:
- component_name =
xrn_to_hostname(node['component_id']
)
+ component_name =
Xrn(xrn=node['component_id']).get_leaf(
)
node_elem.set('component_name', component_name)
hostname_elem = node_elem.add_element('hostname')
hostname_elem.set_text(component_name)
node_elem.set('component_name', component_name)
hostname_elem = node_elem.add_element('hostname')
hostname_elem.set_text(component_name)