From 1269e4a879bf43a73957487dfb2f4c375d890089 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <engapa@gmail.com>
Date: Tue, 27 Dec 2016 17:46:29 +0100
Subject: [PATCH] Ensure slash character for URL of dns service Solves a pep8
 warning too.

Change-Id: Ica53fc638aab9ad30b2a08acd9a9f8b77ee0304a
Closes-Bug: 1635570
---
 designatedashboard/api/rest/passthrough.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/designatedashboard/api/rest/passthrough.py b/designatedashboard/api/rest/passthrough.py
index 8a50569..61d250e 100644
--- a/designatedashboard/api/rest/passthrough.py
+++ b/designatedashboard/api/rest/passthrough.py
@@ -34,15 +34,20 @@ def _passthrough_request(request_method, url,
 
     Should set any necessary auth headers and SSL parameters.
     """
-    service = 'dns' \
-              ''
+
     # Set verify if a CACERT is set and SSL_NO_VERIFY isn't True
     verify = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
     if getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False):
         verify = False
 
+    service_url = _get_service_url(request, 'dns')
+    request_url = '{}{}'.format(
+        service_url,
+        url if service_url.endswith('/') else ('/' + url)
+    )
+
     response = request_method(
-        _get_service_url(request, service) + url,
+        request_url,
         headers={'X-Auth-Token': request.user.token.id},
         json=data,
         verify=verify,