minor changes to log sdn, minor changes onos openflow setup
Change-Id: Ic492752a9cfd1095d9bdbfd0e0f9da7b862a2702
Signed-off-by: lloretgalleg <illoret@indra.es>
diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
index 6883398..373b4e0 100644
--- a/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
+++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
@@ -87,8 +87,9 @@
self.auth = self.auth.decode()
self.headers['authorization'] = 'Basic ' + self.auth
- self.logger = logging.getLogger('SDN.onosOF')
- self.logger.setLevel( getattr(logging, params.get("of_debug", "ERROR")) )
+ self.logger = logging.getLogger('openmano.sdn.onosof')
+ #self.logger.setLevel( getattr(logging, params.get("of_debug", "ERROR")) )
+ self.logger.debug("onosof plugin initialized")
self.ip_address = None
def get_of_switches(self):
@@ -332,15 +333,16 @@
"""
try:
+ self.logger.debug("del_flow: delete flow name {}".format(flow_name))
self.headers['content-type'] = None
of_response = requests.delete(self.url + "flows/" + self.id + "/" + flow_name, headers=self.headers)
- error_text = "Openflow response %d: %s" % (of_response.status_code, of_response.text)
+ error_text = "Openflow response {}: {}".format(of_response.status_code, of_response.text)
if of_response.status_code != 204:
self.logger.warning("del_flow " + error_text)
raise OpenflowConnUnexpectedResponse(error_text)
- self.logger.debug("del_flow OK " + error_text)
+ self.logger.debug("del_flow: {} OK,: {} ".format(flow_name, error_text))
return None
except requests.exceptions.RequestException as e:
@@ -363,6 +365,7 @@
:return: Raise a openflowconnUnexpectedResponse expection in case of failure
"""
try:
+ self.logger.debug("new_flow data: {}".format(data))
if len(self.pp2ofi) == 0:
self.obtain_port_correspondence()
@@ -430,9 +433,10 @@
self.headers['content-type'] = 'application/json'
path = self.url + "flows/" + self.id
+ self.logger.debug("new_flow post: {}".format(flow))
of_response = requests.post(path, headers=self.headers, data=json.dumps(flow) )
- error_text = "Openflow response %d: %s" % (of_response.status_code, of_response.text)
+ error_text = "Openflow response {}: {}".format(of_response.status_code, of_response.text)
if of_response.status_code != 201:
self.logger.warning("new_flow " + error_text)
raise OpenflowConnUnexpectedResponse(error_text)
@@ -441,7 +445,7 @@
data['name'] = flowId
- self.logger.debug("new_flow OK " + error_text)
+ self.logger.debug("new_flow id: {},: {} ".format(flowId, error_text))
return None
except requests.exceptions.RequestException as e:
diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
index 79c1441..3a4e39b 100644
--- a/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
+++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
@@ -29,7 +29,7 @@
def __init__(self, wim, wim_account, config=None, logger=None):
"""Creates a connectivity based on pro-active openflow rules
"""
- self.logger = logging.getLogger('openmano.sdnconn.onosof')
+ self.logger = logging.getLogger('openmano.sdn.onosof')
super().__init__(wim, wim_account, config, logger)
of_params = {
"of_url": wim["wim_url"],
diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py
index 7050c0c..333ee58 100644
--- a/RO-SDN-onos_openflow/setup.py
+++ b/RO-SDN-onos_openflow/setup.py
@@ -44,7 +44,7 @@
packages=[_name],
include_package_data=True,
- dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"],
+ dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
install_requires=["requests", "osm-ro"],
setup_requires=['setuptools-version-command'],
entry_points={