diff options
| author |   Ethan Lynn <ethanlynnl@vmware.com> | 2017-09-20 13:58:16 +0800 |
|---|---|---|
| committer | Ethan Lynn <ethanlynnl@vmware.com> | 2017-09-20 14:04:28 +0800 |
| commit | 9e76f8d1b1417fc06eb510cf668aa313ab94eb3d (patch) | |
| tree | 51925855d1959609fa09b5af5b2b3924f5846338 | |
| parent | 2e18b448e0f99ba90d22be929c6bfa2cd4e8adb1 (diff) | |
Fix namespace of plugins
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>
| -rw-r--r-- | multivimbroker/multivimbroker/forwarder/urls.py | 3 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/forwarder/views.py | 5 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/pub/utils/syscomm.py | 12 |
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: |