projects
/
osm
/
openvim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some typos
[osm/openvim.git]
/
osm_openvim
/
floodlight.py
diff --git
a/osm_openvim/floodlight.py
b/osm_openvim/floodlight.py
index
826e300
..
ee94f02
100644
(file)
--- a/
osm_openvim/floodlight.py
+++ b/
osm_openvim/floodlight.py
@@
-2,7
+2,7
@@
# -*- coding: utf-8 -*-
##
# -*- coding: utf-8 -*-
##
-# Copyright 2015 Telef
ónica Investigació
n y Desarrollo, S.A.U.
+# Copyright 2015 Telef
onica Investigacio
n y Desarrollo, S.A.U.
# This file is part of openvim
# All Rights Reserved.
#
# This file is part of openvim
# All Rights Reserved.
#
@@
-137,8
+137,8
@@
class OF_conn(openflow_conn.OpenflowConn):
if self.version == None:
if 'dpid' in info[0] and 'inetAddress' in info[0]:
self._set_version("0.9")
if self.version == None:
if 'dpid' in info[0] and 'inetAddress' in info[0]:
self._set_version("0.9")
- elif 'switchDPID' in info[0] and 'inetAddress' in info[0]:
- self._set_version("1.X")
+
#
elif 'switchDPID' in info[0] and 'inetAddress' in info[0]:
+
#
self._set_version("1.X")
else:
self.logger.error(
"get_of_switches. Unexpected response, not found 'dpid' or 'switchDPID' field: %s",
else:
self.logger.error(
"get_of_switches. Unexpected response, not found 'dpid' or 'switchDPID' field: %s",
@@
-154,7
+154,7
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_switches " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_switches " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
- except
ValueError
as e:
+ except
Exception
as e:
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_switches " + error_text)
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_switches " + error_text)
@@
-267,7
+267,7
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_rules " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_rules " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
- except
ValueError
as e:
+ except
Exception
as e:
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_rules " + error_text)
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("get_of_rules " + error_text)
@@
-345,7
+345,7
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("obtain_port_correspondence " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("obtain_port_correspondence " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
- except
ValueError
as e:
+ except
Exception
as e:
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("obtain_port_correspondence " + error_text)
# ValueError in the case that JSON can not be decoded
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("obtain_port_correspondence " + error_text)
@@
-381,6
+381,11
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("del_flow " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("del_flow " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
+ except Exception as e:
+ # ValueError in the case that JSON can not be decoded
+ error_text = type(e).__name__ + ": " + str(e)
+ self.logger.error("del_flow " + error_text)
+ raise openflow_conn.OpenflowconnUnexpectedResponse(error_text)
def new_flow(self, data):
"""
def new_flow(self, data):
"""
@@
-443,6
+448,11
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("new_flow " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("new_flow " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
+ except Exception as e:
+ # ValueError in the case that JSON can not be decoded
+ error_text = type(e).__name__ + ": " + str(e)
+ self.logger.error("new_flow " + error_text)
+ raise openflow_conn.OpenflowconnUnexpectedResponse(error_text)
def clear_all_flows(self):
"""
def clear_all_flows(self):
"""
@@
-470,4
+480,8
@@
class OF_conn(openflow_conn.OpenflowConn):
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("clear_all_flows " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
error_text = type(e).__name__ + ": " + str(e)
self.logger.error("clear_all_flows " + error_text)
raise openflow_conn.OpenflowconnConnectionException(error_text)
-
+ except Exception as e:
+ # ValueError in the case that JSON can not be decoded
+ error_text = type(e).__name__ + ": " + str(e)
+ self.logger.error("clear_all_flows " + error_text)
+ raise openflow_conn.OpenflowconnUnexpectedResponse(error_text)