From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 9 Aug 2016 21:39:16 +0000 (+0200)
Subject: use python requests iso urllib2
X-Git-Tag: v3.1~82
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3fc139384794a089e702ecdab035390b9f63a455;p=osm%2Fvim-emu.git

use python requests iso urllib2
---

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 074506b..2c07ab5 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -359,8 +359,8 @@ class DCNetworkMonitor():
                 # query Ryu
                 ret = self.net.ryu_REST('stats/flow', dpid=flow_dict['switch_dpid'], data=data)
                 flow_stat_dict = ast.literal_eval(ret)
-
                 logging.debug('received flow stat:{0} '.format(flow_stat_dict))
+
                 self.set_flow_metric(flow_dict, flow_stat_dict)
 
             self.monitor_flow_lock.release()
diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index bca20b2..4503e1c 100755
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -32,8 +32,7 @@ import time
 from subprocess import Popen
 import os
 import re
-import urllib2
-from functools import partial
+import requests
 
 from mininet.net import Containernet
 from mininet.node import Controller, DefaultController, OVSSwitch, OVSKernelSwitch, Docker, RemoteController
@@ -540,11 +539,14 @@ class DCNetwork(Containernet):
                 url = self.ryu_REST_api + '/' + str(prefix)
             if data:
                 #LOG.info('POST: {0}'.format(str(data)))
-                req = urllib2.Request(url, str(data))
+                #req = urllib2.Request(url, str(data))
+                req = requests.post(url, data=str(data))
             else:
-                req = urllib2.Request(url)
+                #req = urllib2.Request(url)
+                req = requests.get(url)
 
-            ret = urllib2.urlopen(req).read()
+            #ret = urllib2.urlopen(req).read()
+            ret = req.text
             return ret
         except:
             LOG.info('error url: {0}'.format(str(url)))