From: Ethan Lynn <ethanlynnl@vmware.com>
Date: Fri, 1 Mar 2019 08:56:35 +0000 (+0800)
Subject: Add vsphere type
X-Git-Tag: 1.3.0~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=e8bc6aba146411cf1652705fe3d98fbcf0f5304a;ds=sidebyside

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>
---

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))