For ocata, forward to multicloud-ocata.
For titanium cloud, forward to multicloud-titanium_cloud.
For vmware vio, forward to multicloud-vio.
Change-Id: If25e0f1694d721e5cc0dad40391c06cdfbe1e6e0
issue-id: MULTICLOUD-99
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
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
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_-]+)',
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,
"vim_type": "openstack",
"versions": [
{
- "version": "mitaka",
+ "version": "titanium_cloud",
"extra_info_hint": ""
},
{
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: