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
removed another bunch of references to geni
[sfa.git]
/
sfa
/
plc
/
nodes.py
diff --git
a/sfa/plc/nodes.py
b/sfa/plc/nodes.py
index
9a2a853
..
f80bd1a
100644
(file)
--- a/
sfa/plc/nodes.py
+++ b/
sfa/plc/nodes.py
@@
-203,7
+203,7
@@
class Nodes(SimpleStorage):
elif self.api.plshell_version in ['4.3']:
interface_ids.extend(node['interface_ids'])
else:
elif self.api.plshell_version in ['4.3']:
interface_ids.extend(node['interface_ids'])
else:
- raise
Geni
APIError, "Unsupported plcapi version ", \
+ raise
Sfa
APIError, "Unsupported plcapi version ", \
self.api.plshell_version
if self.api.plshell_version in ['4.2']:
self.api.plshell_version
if self.api.plshell_version in ['4.2']:
@@
-211,7
+211,7
@@
class Nodes(SimpleStorage):
elif self.api.plshell_version in ['4.3']:
interfaces = self.api.plshell.GetInterfaces(self.api.plauth, interface_ids)
else:
elif self.api.plshell_version in ['4.3']:
interfaces = self.api.plshell.GetInterfaces(self.api.plauth, interface_ids)
else:
- raise
Geni
APIError, "Unsupported plcapi version ", \
+ raise
Sfa
APIError, "Unsupported plcapi version ", \
self.api.plshell_version
interface_dict = {}
for interface in interfaces:
self.api.plshell_version
interface_dict = {}
for interface in interfaces:
@@
-220,7
+220,7
@@
class Nodes(SimpleStorage):
elif self.api.plshell_version in ['4.3']:
interface_dict[interface['interface_id']] = interface
else:
elif self.api.plshell_version in ['4.3']:
interface_dict[interface['interface_id']] = interface
else:
- raise
Geni
APIError, "Unsupported plcapi version", \
+ raise
Sfa
APIError, "Unsupported plcapi version", \
self.api.plshell_version
# join nodes with thier interfaces
self.api.plshell_version
# join nodes with thier interfaces
@@
-233,7
+233,7
@@
class Nodes(SimpleStorage):
for interface_id in node['interface_ids']:
node['interfaces'].append(interface_dict[interface_id])
else:
for interface_id in node['interface_ids']:
node['interfaces'].append(interface_dict[interface_id])
else:
- raise
Geni
APIError, "Unsupported plcapi version", \
+ raise
Sfa
APIError, "Unsupported plcapi version", \
self.api.plshell_version
# convert and threshold to ints
self.api.plshell_version
# convert and threshold to ints