summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multivimbroker/multivimbroker/forwarder/urls.py3
-rw-r--r--multivimbroker/multivimbroker/forwarder/views.py5
-rw-r--r--multivimbroker/multivimbroker/pub/utils/syscomm.py12
3 files changed, 12 insertions, 8 deletions
diff --git a/multivimbroker/multivimbroker/forwarder/urls.py b/multivimbroker/multivimbroker/forwarder/urls.py
index 5b3fc41..8cc3fa8 100644
--- a/multivimbroker/multivimbroker/forwarder/urls.py
+++ b/multivimbroker/multivimbroker/forwarder/urls.py
@@ -19,6 +19,7 @@ from multivimbroker.forwarder.views import Extension
from multivimbroker.forwarder.views import Forward
from multivimbroker.forwarder.views import Identity
from multivimbroker.forwarder.views import Registry
+from multivimbroker.forwarder.views import UnRegistry
from multivimbroker.forwarder.views import VIMTypes
@@ -32,7 +33,7 @@ urlpatterns = [
url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/registry$',
Registry.as_view()),
url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)$',
- Registry.as_view()),
+ UnRegistry.as_view()),
url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/extensions$',
Extension.as_view()),
url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)',
diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index 623aaa8..59c566b 100644
--- a/multivimbroker/multivimbroker/forwarder/views.py
+++ b/multivimbroker/multivimbroker/forwarder/views.py
@@ -59,6 +59,9 @@ class Registry(BaseServer):
return self.send(vimid, request.get_full_path(), request.body, "POST")
+
+class UnRegistry(BaseServer):
+
def delete(self, request, vimid):
return self.send(vimid, request.get_full_path(), request.body,
@@ -82,7 +85,7 @@ class VIMTypes(BaseServer):
"vim_type": "openstack",
"versions": [
{
- "version": "mitaka",
+ "version": "titanium_cloud",
"extra_info_hint": ""
},
{
diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py
index cdc6480..7c5d94e 100644
--- a/multivimbroker/multivimbroker/pub/utils/syscomm.py
+++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py
@@ -36,13 +36,13 @@ def getHeadersKeys(response):
def findMultivimDriver(vim=None):
if vim and vim["type"] == "openstack":
- if vim["version"] == "kilo":
- multivimdriver = "multicloud-kilo"
- elif vim["version"] == "newton":
- multivimdriver = "multicloud-newton"
+ if vim["version"] == "ocata":
+ multivimdriver = "multicloud-ocata"
+ elif vim["version"] == "titanium_cloud":
+ multivimdriver = "multicloud-titanium_cloud"
else:
- # if vim type is openstack, use latest "newton" version as default
- multivimdriver = "multicloud-newton"
+ # if vim type is openstack, use "ocata" version as default
+ multivimdriver = "multicloud-ocata"
elif vim and vim["type"] == "vmware":
multivimdriver = "multicloud-vio"
else: