mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-10 18:34:03 -07:00
Fix urlopen usage to use open_url instead
Add a travis test for urlopen usage
This commit is contained in:
parent
e97d448838
commit
3db8070aa3
9 changed files with 52 additions and 54 deletions
|
@ -28,7 +28,6 @@ version_added: None
|
|||
author: Michael Scherer
|
||||
'''
|
||||
|
||||
import urllib2
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
|
@ -39,6 +38,8 @@ import sys
|
|||
import ConfigParser
|
||||
import StringIO
|
||||
|
||||
from ansible.module_utils.urls import open_url
|
||||
|
||||
configparser = None
|
||||
|
||||
|
||||
|
@ -66,34 +67,21 @@ def get_config(env_var, config_var):
|
|||
return result
|
||||
|
||||
|
||||
def get_json_from_api(url):
|
||||
req = urllib2.Request(url, None, {'Accept': 'application/json; version=1.5'})
|
||||
response = urllib2.urlopen(req)
|
||||
def get_json_from_api(url, username, password):
|
||||
headers = {'Accept': 'application/json; version=1.5'}
|
||||
response = open_url(url, headers=headers, url_username=username, url_password=password)
|
||||
return json.loads(response.read())['data']
|
||||
|
||||
|
||||
def passwd_setup(top_level_url, username, password):
|
||||
# create a password manager
|
||||
password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
|
||||
password_mgr.add_password(None, top_level_url, username, password)
|
||||
|
||||
handler = urllib2.HTTPBasicAuthHandler(password_mgr)
|
||||
opener = urllib2.build_opener(handler)
|
||||
|
||||
urllib2.install_opener(opener)
|
||||
|
||||
|
||||
username = get_config('ANSIBLE_OPENSHIFT_USERNAME', 'default_rhlogin')
|
||||
password = get_config('ANSIBLE_OPENSHIFT_PASSWORD', 'password')
|
||||
broker_url = 'https://%s/broker/rest/' % get_config('ANSIBLE_OPENSHIFT_BROKER', 'libra_server')
|
||||
|
||||
|
||||
passwd_setup(broker_url, username, password)
|
||||
|
||||
response = get_json_from_api(broker_url + '/domains')
|
||||
response = get_json_from_api(broker_url + '/domains', username, password)
|
||||
|
||||
response = get_json_from_api("%s/domains/%s/applications" %
|
||||
(broker_url, response[0]['id']))
|
||||
(broker_url, response[0]['id']), username, password)
|
||||
|
||||
result = {}
|
||||
for app in response:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue