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:
59ebbcf
)
Node is now NodeElement
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 25 Mar 2013 17:41:18 +0000
(18:41 +0100)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 25 Mar 2013 17:41:18 +0000
(18:41 +0100)
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
sfa/rspecs/elements/versions/slabv1Node.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/elements/versions/nitosv1Channel.py
b/sfa/rspecs/elements/versions/nitosv1Channel.py
index
b1e622d
..
1ebf7ab
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Channel.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Channel.py
@@
-3,7
+3,7
@@
from sfa.util.xml import XpathFilter
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import Node
Element
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
diff --git
a/sfa/rspecs/elements/versions/nitosv1Lease.py
b/sfa/rspecs/elements/versions/nitosv1Lease.py
index
dda33e9
..
0949597
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Lease.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Lease.py
@@
-3,7
+3,7
@@
from sfa.util.xml import XpathFilter
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import Node
Element
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
diff --git
a/sfa/rspecs/elements/versions/nitosv1Node.py
b/sfa/rspecs/elements/versions/nitosv1Node.py
index
9467884
..
9015077
100644
(file)
--- a/
sfa/rspecs/elements/versions/nitosv1Node.py
+++ b/
sfa/rspecs/elements/versions/nitosv1Node.py
@@
-3,7
+3,7
@@
from sfa.util.xml import XpathFilter
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import Node
Element
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.position_3d import Position3D
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.position_3d import Position3D
@@
-147,7
+147,7
@@
class NITOSv1Node:
def get_node_objs(node_elems):
nodes = []
for node_elem in node_elems:
def get_node_objs(node_elems):
nodes = []
for node_elem in node_elems:
- node = Node(node_elem.attrib, node_elem)
+ node = Node
Element
(node_elem.attrib, node_elem)
if 'site_id' in node_elem.attrib:
node['authority_id'] = node_elem.attrib['site_id']
# get location
if 'site_id' in node_elem.attrib:
node['authority_id'] = node_elem.attrib['site_id']
# get location
@@
-169,7
+169,7
@@
class NITOSv1Node:
# get slivers
node['slivers'] = NITOSv1Sliver.get_slivers(node_elem)
# get tags
# get slivers
node['slivers'] = NITOSv1Sliver.get_slivers(node_elem)
# get tags
- node['tags'] = NITOSv1PLTag.get_pl_tags(node_elem, ignore=Node.fields+["hardware_type"])
+ node['tags'] = NITOSv1PLTag.get_pl_tags(node_elem, ignore=Node
Element
.fields+["hardware_type"])
# get hardware types
hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
# get hardware types
hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
diff --git
a/sfa/rspecs/elements/versions/slabv1Node.py
b/sfa/rspecs/elements/versions/slabv1Node.py
index
e70b8b5
..
0804c9b
100644
(file)
--- a/
sfa/rspecs/elements/versions/slabv1Node.py
+++ b/
sfa/rspecs/elements/versions/slabv1Node.py
@@
-1,7
+1,7
@@
from sfa.util.xrn import Xrn
from sfa.util.xml import XpathFilter
from sfa.util.xrn import Xrn
from sfa.util.xml import XpathFilter
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import Node
Element
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
@@
-10,9
+10,9
@@
from sfa.rspecs.elements.interface import Interface
from sfa.rspecs.elements.versions.slabv1Sliver import Slabv1Sliver
from sfa.util.sfalogging import logger
from sfa.rspecs.elements.versions.slabv1Sliver import Slabv1Sliver
from sfa.util.sfalogging import logger
-class SlabNode(Node):
+class SlabNode(Node
Element
):
#First get the fields already defined in the class Node
#First get the fields already defined in the class Node
- fields = list(Node.fields)
+ fields = list(Node
Element
.fields)
#Extend it with senslab's specific fields
fields.extend (['archi', 'radio', 'mobile','position'])
#Extend it with senslab's specific fields
fields.extend (['archi', 'radio', 'mobile','position'])
@@
-159,7
+159,7
@@
class Slabv1Node:
def get_node_objs(node_elems):
nodes = []
for node_elem in node_elems:
def get_node_objs(node_elems):
nodes = []
for node_elem in node_elems:
- node = Node(node_elem.attrib, node_elem)
+ node = Node
Element
(node_elem.attrib, node_elem)
nodes.append(node)
if 'component_id' in node_elem.attrib:
node['authority_id'] = \
nodes.append(node)
if 'component_id' in node_elem.attrib:
node['authority_id'] = \