From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 3 Feb 2017 15:42:51 +0000 (+0100)
Subject: Merge branch 'master' of github.com:stevenvanrossem/son-emu
X-Git-Tag: v3.1~45^2~12
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=f20404dcbfb68cf29baa00e8f89dd50265ea3b1f;hp=-c;p=osm%2Fvim-emu.git

Merge branch 'master' of github.com:stevenvanrossem/son-emu

Conflicts:
	src/emuvim/api/rest/network.py
---

f20404dcbfb68cf29baa00e8f89dd50265ea3b1f
diff --combined src/emuvim/api/rest/monitor.py
index 209670c,6f99bdf..379c8d5
--- a/src/emuvim/api/rest/monitor.py
+++ b/src/emuvim/api/rest/monitor.py
@@@ -146,7 -146,7 +146,7 @@@ class MonitorLinkAction(Resource)
              return self._MonitorLinkAction(vnf_src_name, vnf_dst_name, command=command)
          except Exception as ex:
              logging.exception("API error.")
-             return ex.message, 500
+             return ex.message, 500, CORS_HEADER
  
      def delete(self, vnf_src_name, vnf_dst_name):
          logging.debug("REST CALL: monitor link flow remove")
@@@ -156,7 -156,7 +156,7 @@@
              return self._MonitorLinkAction(vnf_src_name, vnf_dst_name, command=command)
          except Exception as ex:
              logging.exception("API error.")
-             return ex.message, 500
+             return ex.message, 500, CORS_HEADER
  
      def _MonitorLinkAction(self, vnf_src_name, vnf_dst_name, command=None):
          # call DCNetwork method, not really datacenter specific API for now...
@@@ -211,10 -211,10 +211,10 @@@
                  c2 = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie)
  
              # return setChain response
-             return (str(c1) + " " + str(c2)), 200
+             return (str(c1) + " " + str(c2)), 200, CORS_HEADER
          except Exception as ex:
              logging.exception("API error.")
 -            return ex.message, 500
 +            return ex.message, 500, CORS_HEADER
  
  class MonitorSkewAction(Resource):
      """
@@@ -244,7 -244,7 +244,7 @@@
              c = net.monitor_agent.update_skewmon(vnf_name, resource_name, action='stop')
  
              # return monitor message response
-             return str(c), 200
+             return str(c), 200, CORS_HEADER
          except Exception as ex:
              logging.exception("API error.")
              return ex.message, 500, CORS_HEADER