Merge "Fix pep8 violations in base/run.py"

[integration/test.git] / test / tools / odl-mdsal-clustering-tests / clustering-functional-test / util.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py b/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py
index 9bc86b63447e709f4fa182b8fe440b710302abbc..1c81235c691865b1f75c21970931c198edbf9b9a 100644 (file)
--- a/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py
+++ b/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py
@@ -4,64 +4,49 @@ __license__ = "New-style BSD"
 __email__ = "syedbahm@cisco.com"
 
 
-import urllib
-from urllib import request
-import json
 import requests
-import socket
 
 
-#
-#Helps in making GET REST calls
-#
-
 def get(url, userId, password):
-
+    """Helps in making GET REST calls"""
     headers = {}
-    headers['Accept']= 'application/xml'
+    headers['Accept'] = 'application/xml'
 
     # Send the GET request
-    req = urllib.request.Request(url, None, headers)
+    req = requests.get(url, None, headers)
 
     # Read the response
-    return urllib.request.urlopen(req).read()
+    return req
 
-#
-#Helps in making POST REST calls without outputs
-#
-def nonprintpost(url, userId, password,data):
 
+def nonprintpost(url, userId, password, data):
+    """Helps in making POST REST calls without outputs"""
     headers = {}
     headers['Content-Type'] = 'application/json'
-    #headers['Accept']= 'application/xml'
-
-    resp = requests.post(url,data.encode(),headers=headers)
+    # headers['Accept']= 'application/xml'
 
+    resp = requests.post(url, data.encode(), headers=headers)
 
     return resp
 
-#
-#Helps in making POST REST calls
-#
-def post(url, userId, password,data):
-    print("post request with url "+url)
-    print("post request with data "+data)
+
+def post(url, userId, password, data):
+    """Helps in making POST REST calls"""
+    print("post request with url " + url)
+    print("post request with data " + data)
     headers = {}
     headers['Content-Type'] = 'application/json'
-    #headers['Accept']= 'application/xml'
+    # headers['Accept']= 'application/xml'
 
-    resp = requests.post(url,data.encode(),headers=headers)
+    resp = requests.post(url, data.encode(), headers=headers)
 
-    #print (resp.raise_for_status())
-    print (resp.headers)
+    # print (resp.raise_for_status())
+    print(resp.headers)
 
     return resp
 
-#
-#Helps in making DELET REST calls
-#
-def delete(url,userId,password):
-    print("delete all resources belonging to url"+url)
-    resp=requests.delete(url)
-
 
+def delete(url, userId, password):
+    """Helps in making DELET REST calls"""
+    print("delete all resources belonging to url" + url)
+    resp = requests.delete(url)  # noqa