From: Bin Yang <bin.yang@windriver.com>
Date: Fri, 12 Oct 2018 02:30:22 +0000 (+0000)
Subject: Merge "Add pike to framework in multicloud"
X-Git-Tag: 1.2.0^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=dca83b12781926d1bd958e01b3e3d29b3cc9e24e;hp=7882e505aeb67cedfe4f23447bc1ba43922572d6

Merge "Add pike to framework in multicloud"
---

diff --git a/multivimbroker/multivimbroker/pub/config/provider-plugin.json b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
index 1103a24..64502a4 100644
--- a/multivimbroker/multivimbroker/pub/config/provider-plugin.json
+++ b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
@@ -11,6 +11,11 @@
                 "version": "ocata",
                 "extra_info_hint": "",
                 "provider_plugin": "multicloud-ocata"
+            },
+            "pike": {
+                "version": "pike",
+                "extra_info_hint": "",
+                "provider_plugin": "multicloud-pike"
             }
         },
         "provider_plugin": "multicloud-ocata"
@@ -37,4 +42,4 @@
         },
         "provider_plugin": "multicloud-azure"
     }
-}
\ No newline at end of file
+}
diff --git a/multivimbroker/multivimbroker/tests/test_syscomm.py b/multivimbroker/multivimbroker/tests/test_syscomm.py
index beed0b9..acad785 100644
--- a/multivimbroker/multivimbroker/tests/test_syscomm.py
+++ b/multivimbroker/multivimbroker/tests/test_syscomm.py
@@ -20,7 +20,7 @@ class TestSyscomm(unittest.TestCase):
 
     def test_getVIMTypes(self):
         expected_body = {
-            "openstack": ["titanium_cloud", "ocata"],
+            "openstack": ["titanium_cloud", "ocata", "pike"],
             "vmware": ["4.0"],
             "azure": ["1.0"]
         }