summaryrefslogtreecommitdiffstats
path: root/multivimbroker
diff options
context:
space:
mode:
authorEthan Lynn <ethanlynnl@vmware.com>2019-03-01 16:56:35 +0800
committerEthan Lynn <ethanlynnl@vmware.com>2019-03-01 16:58:46 +0800
commite8bc6aba146411cf1652705fe3d98fbcf0f5304a (patch)
tree647b9708eb6eb2ed662788b347728fde7b285b90 /multivimbroker
parent00c255862c383cceb71dc8343b4d833fc078d181 (diff)
Add vsphere type
Add vsphere type and point to multicloud-vio Change-Id: I6eab1b61892a9caa999d09cdc5e5dda174f3561b Issue-ID: MULTICLOUD-488 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
Diffstat (limited to 'multivimbroker')
-rw-r--r--multivimbroker/multivimbroker/pub/config/provider-plugin.json11
-rw-r--r--multivimbroker/multivimbroker/tests/test_syscomm.py3
-rw-r--r--multivimbroker/multivimbroker/tests/test_vim_types.py2
3 files changed, 14 insertions, 2 deletions
diff --git a/multivimbroker/multivimbroker/pub/config/provider-plugin.json b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
index 16b37a1..6aff236 100644
--- a/multivimbroker/multivimbroker/pub/config/provider-plugin.json
+++ b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
@@ -36,6 +36,17 @@
},
"provider_plugin": "multicloud-vio"
},
+ "vsphere": {
+ "vim_type": "vsphere",
+ "versions": {
+ "6.5": {
+ "version": "6.5",
+ "extra_info_hint": "",
+ "provider_plugin": "multicloud-vio"
+ }
+ },
+ "provider_plugin": "multicloud-vio"
+ },
"azure": {
"vim_type": "azure",
"versions": {
diff --git a/multivimbroker/multivimbroker/tests/test_syscomm.py b/multivimbroker/multivimbroker/tests/test_syscomm.py
index ee34649..75eda1c 100644
--- a/multivimbroker/multivimbroker/tests/test_syscomm.py
+++ b/multivimbroker/multivimbroker/tests/test_syscomm.py
@@ -22,7 +22,8 @@ class TestSyscomm(unittest.TestCase):
expected_body = {
"openstack": ["titanium_cloud", "ocata", "pike", "starlingx"],
"vmware": ["4.0"],
- "azure": ["1.0"]
+ "vsphere": ["6.5"],
+ "azure": ["1.0"],
}
ret = syscomm.getVIMTypes()
for item in ret:
diff --git a/multivimbroker/multivimbroker/tests/test_vim_types.py b/multivimbroker/multivimbroker/tests/test_vim_types.py
index b0148b5..0e8da75 100644
--- a/multivimbroker/multivimbroker/tests/test_vim_types.py
+++ b/multivimbroker/multivimbroker/tests/test_vim_types.py
@@ -23,4 +23,4 @@ class TestUrls(unittest.TestCase):
def test_vim_types_success(self):
resp = self.view.get(mock.Mock())
self.assertEqual(status.HTTP_200_OK, resp.status_code)
- self.assertEqual(3, len(resp.data))
+ self.assertEqual(4, len(resp.data))