Added API version to URL

Closes-Bug: 1287933
Change-Id: I48781f016f47f9b626410638271ce55fac3d39db

examples/claims.py

@@ -17,7 +17,7 @@ import time
 
 from marconiclient.queues.v1 import client
 
-URL = 'http://localhost:8888/v1'
+URL = 'http://localhost:8888'
 
 cli = client.Client(URL)
 queue = cli.queue('worker-jobs')

examples/management.py

@@ -14,7 +14,7 @@
 
 from marconiclient.queues import client
 
-URL = 'http://localhost:8888/v1'
+URL = 'http://localhost:8888'
 
 
 def healthy():

examples/simple.py

@@ -16,7 +16,7 @@
 # an upper package. It's version agnostic.
 from marconiclient.queues.v1 import client
 
-URL = 'http://localhost:8888/v1'
+URL = 'http://localhost:8888'
 
 
 def create_post_delete(queue_name, messages):

marconiclient/transport/http.py

@@ -72,8 +72,9 @@ class HttpTransport(base.Transport):
 
                 ref_params[param] = value
 
-        url = '{0}/{1}'.format(request.endpoint.rstrip('/'),
-                               ref.format(**ref_params))
+        url = '{0}/{1}/{2}'.format(request.endpoint.rstrip('/'),
+                                   request.api.label,
+                                   ref.format(**ref_params))
         return url, schema.get('method', 'GET'), request
 
     def send(self, request):

tests/unit/transport/test_http.py

@@ -49,7 +49,7 @@ class TestHttpTransport(base.TestBase):
             req._api = self.api
             self.transport.send(req)
 
-            final_url = 'http://example.org/test/Test'
+            final_url = 'http://example.org/v1/test/Test'
             final_params = {'address': 'Outer space'}
             final_headers = {'content-type': 'application/json'}