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:
1031a9a
)
Rspecs: remove testbed dependencies
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 1 Oct 2013 09:54:45 +0000
(11:54 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Wed, 2 Oct 2013 13:34:49 +0000
(15:34 +0200)
sfa/rspecs/elements/versions/pgv2Lease.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/pgv2Node.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/sfav1Lease.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/sfav1Node.py
patch
|
blob
|
history
sfa/rspecs/elements/versions/sfav1Sliver.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/elements/versions/pgv2Lease.py
b/sfa/rspecs/elements/versions/pgv2Lease.py
index
1d08d5a
..
8989275
100644
(file)
--- a/
sfa/rspecs/elements/versions/pgv2Lease.py
+++ b/
sfa/rspecs/elements/versions/pgv2Lease.py
@@
-15,7
+15,6
@@
from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType
from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
from sfa.rspecs.elements.lease import Lease
-from sfa.planetlab.plxrn import xrn_to_hostname
class PGv2Lease:
@staticmethod
class PGv2Lease:
@staticmethod
diff --git
a/sfa/rspecs/elements/versions/pgv2Node.py
b/sfa/rspecs/elements/versions/pgv2Node.py
index
769a72f
..
ea171d6
100644
(file)
--- a/
sfa/rspecs/elements/versions/pgv2Node.py
+++ b/
sfa/rspecs/elements/versions/pgv2Node.py
@@
-1,4
+1,4
@@
-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrn
, get_leaf
from sfa.util.xml import XpathFilter
from sfa.rspecs.elements.node import NodeElement
from sfa.util.xml import XpathFilter
from sfa.rspecs.elements.node import NodeElement
@@
-16,7
+16,6
@@
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.granularity import Granularity
from sfa.rspecs.elements.attribute import Attribute
from sfa.rspecs.elements.granularity import Granularity
from sfa.rspecs.elements.attribute import Attribute
-from sfa.planetlab.plxrn import xrn_to_hostname
class PGv2Node:
@staticmethod
class PGv2Node:
@staticmethod
@@
-28,7
+27,7
@@
class PGv2Node:
node_elems.append(node_elem)
# set component name
if node.get('component_id'):
node_elems.append(node_elem)
# set component name
if node.get('component_id'):
- component_name =
xrn_to_hostname(node['component_id']
)
+ component_name =
get_leaf(Xrn(node['component_id']).get_hrn()
)
node_elem.set('component_name', component_name)
# set hardware types
if node.get('hardware_types'):
node_elem.set('component_name', component_name)
# set hardware types
if node.get('hardware_types'):
@@
-39,7
+38,7
@@
class PGv2Node:
node_elem.add_instance('location', node['location'], Location.fields)
# set granularity
node_elem.add_instance('location', node['location'], Location.fields)
# set granularity
- if node
['exclusive']
== "true":
+ if node
.get('exclusive')
== "true":
granularity = node.get('granularity')
node_elem.add_instance('granularity', granularity, granularity.fields)
# set interfaces
granularity = node.get('granularity')
node_elem.add_instance('granularity', granularity, granularity.fields)
# set interfaces
diff --git
a/sfa/rspecs/elements/versions/sfav1Lease.py
b/sfa/rspecs/elements/versions/sfav1Lease.py
index
00c0499
..
c68b3ed
100644
(file)
--- a/
sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/
sfa/rspecs/elements/versions/sfav1Lease.py
@@
-17,7
+17,6
@@
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.lease import Lease
-from sfa.planetlab.plxrn import xrn_to_hostname
class SFAv1Lease:
class SFAv1Lease:
diff --git
a/sfa/rspecs/elements/versions/sfav1Node.py
b/sfa/rspecs/elements/versions/sfav1Node.py
index
630fd85
..
e7f6103
100644
(file)
--- a/
sfa/rspecs/elements/versions/sfav1Node.py
+++ b/
sfa/rspecs/elements/versions/sfav1Node.py
@@
-1,6
+1,6
@@
from sfa.util.sfalogging import logger
from sfa.util.xml import XpathFilter
from sfa.util.sfalogging import logger
from sfa.util.xml import XpathFilter
-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrn
, get_leaf
from sfa.rspecs.elements.element import Element
from sfa.rspecs.elements.node import NodeElement
from sfa.rspecs.elements.element import Element
from sfa.rspecs.elements.node import NodeElement
@@
-15,7
+15,6
@@
from sfa.rspecs.elements.versions.sfav1Sliver import SFAv1Sliver
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
-from sfa.planetlab.plxrn import xrn_to_hostname
class SFAv1Node:
class SFAv1Node:
@@
-43,7
+42,7
@@
class SFAv1Node:
# 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 =
get_leaf(Xrn(node['component_id']).get_hrn()
)
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)
diff --git
a/sfa/rspecs/elements/versions/sfav1Sliver.py
b/sfa/rspecs/elements/versions/sfav1Sliver.py
index
851d11c
..
a2b07a1
100644
(file)
--- a/
sfa/rspecs/elements/versions/sfav1Sliver.py
+++ b/
sfa/rspecs/elements/versions/sfav1Sliver.py
@@
-5,7
+5,6
@@
from sfa.rspecs.elements.element import Element
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
-from sfa.planetlab.plxrn import PlXrn
class SFAv1Sliver:
class SFAv1Sliver: