Revision d2c9adac snf-cyclades-app/synnefo/vmapi/models.py

b/snf-cyclades-app/synnefo/vmapi/models.py
35 35

  
36 36
from django.utils import simplejson as json
37 37
from django.core.urlresolvers import reverse
38
from urlparse import urljoin
38

  
39
from synnefo.lib import join_urls
39 40

  
40 41
from synnefo.api.servers import server_created
41 42
from synnefo.vmapi import backend, get_key, get_uuid, settings
......
50 51
    log.info("Setting vmapi params with key %s for %s", key, sender)
51 52
    backend.set(key, json_value)
52 53

  
53
    config_url = urljoin(settings.BASE_URL, reverse("vmapi_server_params",
54
                                                    args=[uuid]))
54
    config_url = join_urls(settings.BASE_URL, reverse("vmapi_server_params",
55
                                                      args=[uuid]))
55 56
    # inject sender (vm) with its configuration url
56 57
    setattr(sender, 'config_url', config_url)
57 58
    return uuid

Also available in: Unified diff