Revision a9b05ce4
b/snf-cyclades-app/synnefo/api/services.py | ||
---|---|---|
170 | 170 |
], |
171 | 171 |
'resources': {}, |
172 | 172 |
}, |
173 |
|
|
174 |
'cyclades_neutron': { |
|
175 |
'type': 'neutron', |
|
176 |
'component': 'cyclades', |
|
177 |
'prefix': 'neutron', |
|
178 |
'public': True, |
|
179 |
'endpoints': [ |
|
180 |
{'versionId': 'v2.0', |
|
181 |
'publicURL': None}, |
|
182 |
], |
|
183 |
'resources': {}, |
|
184 |
}, |
|
185 |
|
|
173 | 186 |
} |
b/snf-cyclades-app/synnefo/app_settings/urls.py | ||
---|---|---|
42 | 42 |
PLANKTON_PREFIX, HELPDESK_PREFIX, UI_PREFIX, ASTAKOS_BASE_URL, |
43 | 43 |
USERDATA_PREFIX, ADMIN_PREFIX, BASE_ASTAKOS_PROXY_PATH, |
44 | 44 |
ASTAKOS_ACCOUNTS_PREFIX, ASTAKOS_VIEWS_PREFIX, PROXY_USER_SERVICES, |
45 |
cyclades_services) |
|
45 |
NEUTRON_PREFIX, cyclades_services)
|
|
46 | 46 |
|
47 | 47 |
from functools import partial |
48 | 48 |
|
... | ... | |
65 | 65 |
(prefix_pattern(COMPUTE_PREFIX), include('synnefo.api.urls')), |
66 | 66 |
(prefix_pattern(USERDATA_PREFIX), include('synnefo.userdata.urls')), |
67 | 67 |
(prefix_pattern(ADMIN_PREFIX), include('synnefo.admin.urls')), |
68 |
(prefix_pattern(NEUTRON_PREFIX), include('synnefo.neutron.urls')), |
|
68 | 69 |
) |
69 | 70 |
|
70 | 71 |
cyclades_patterns += patterns( |
b/snf-cyclades-app/synnefo/cyclades_settings.py | ||
---|---|---|
60 | 60 |
UI_PREFIX = get_path(cyclades_services, 'cyclades_ui.prefix') |
61 | 61 |
USERDATA_PREFIX = get_path(cyclades_services, 'cyclades_userdata.prefix') |
62 | 62 |
ADMIN_PREFIX = get_path(cyclades_services, 'cyclades_admin.prefix') |
63 |
NEUTRON_PREFIX = get_path(cyclades_services, 'cyclades_neutron.prefix') |
|
63 | 64 |
|
64 | 65 |
COMPUTE_ROOT_URL = join_urls(BASE_URL, COMPUTE_PREFIX) |
65 | 66 |
|
b/snf-cyclades-app/synnefo/neutron/subnet_views.py | ||
---|---|---|
57 | 57 |
|
58 | 58 |
def subnet_demux(request, offset): |
59 | 59 |
if request.method == 'GET': |
60 |
return get_network(request, offset)
|
|
60 |
return get_subnet(request, offset)
|
|
61 | 61 |
elif request.method == 'DELETE': |
62 | 62 |
#return delete_network(request,offset) |
63 | 63 |
return HttpResponse("in subnet det delete") |
Also available in: Unified diff