x/valence
Code Issues Proposed changes

Merge "Support more flexible url build"

Browse Source
This commit is contained in:
Jenkins 2016-11-09 13:13:20 +00:00 committed by Gerrit Code Review
commit ca1f5cd823
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
valence/redfish/redfish.py
View File

@ -15,6 +15,7 @@
import json import json
import logging import logging
import os
import requests import requests
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
from valence import config as cfg from valence import config as cfg
@ -26,12 +27,11 @@ LOG = logging.getLogger(__name__)
def get_rfs_url(serviceext): def get_rfs_url(serviceext):
REDFISH_BASE_EXT = "/redfish/v1/" REDFISH_BASE_EXT = "/redfish/v1/"
INDEX = ''
# '/index.json'
if REDFISH_BASE_EXT in serviceext: if REDFISH_BASE_EXT in serviceext:
return cfg.podm_url + serviceext + INDEX relative_url = serviceext
else: else:
return cfg.podm_url + REDFISH_BASE_EXT + serviceext + INDEX relative_url = os.path.join(REDFISH_BASE_EXT, serviceext)
return requests.compat.urljoin(cfg.podm_url, relative_url)
def send_request(resource, method="GET", **kwargs): def send_request(resource, method="GET", **kwargs):