X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fplc%2Fnodes.py;h=f80bd1ab394eb4f60356d480120f3b3f7de82f85;hp=9a2a8534c4af487c573fce108ad81f26166e14ce;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hpb=7c1cf48e3a60344e3c381d1edac89d81659655f3 diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py index 9a2a8534..f80bd1ab 100644 --- 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: - raise GeniAPIError, "Unsupported plcapi version ", \ + raise SfaAPIError, "Unsupported plcapi version ", \ 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: - raise GeniAPIError, "Unsupported plcapi version ", \ + raise SfaAPIError, "Unsupported plcapi version ", \ 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: - raise GeniAPIError, "Unsupported plcapi version", \ + raise SfaAPIError, "Unsupported plcapi version", \ 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: - raise GeniAPIError, "Unsupported plcapi version", \ + raise SfaAPIError, "Unsupported plcapi version", \ self.api.plshell_version # convert and threshold to ints