From: Huang Haibin <haibin.huang@intel.com>
Date: Wed, 30 Jan 2019 01:56:33 +0000 (+0000)
Subject: Merge "RN for Casablanca Maintenance Release"
X-Git-Tag: 1.3.0~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=06a2ace0479ca40b08d77ed8940ba70048bdf358;hp=eff6d982606da97178d61b48b8780f367cd34463

Merge "RN for Casablanca Maintenance Release"
---

diff --git a/multivimbroker/multivimbroker/pub/config/provider-plugin.json b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
index 64502a4..16b37a1 100644
--- a/multivimbroker/multivimbroker/pub/config/provider-plugin.json
+++ b/multivimbroker/multivimbroker/pub/config/provider-plugin.json
@@ -16,6 +16,11 @@
                 "version": "pike",
                 "extra_info_hint": "",
                 "provider_plugin": "multicloud-pike"
+            },
+            "starlingx": {
+                "version": "starlingx",
+                "extra_info_hint": "",
+                "provider_plugin": "multicloud-starlingx"
             }
         },
         "provider_plugin": "multicloud-ocata"
diff --git a/multivimbroker/multivimbroker/tests/test_syscomm.py b/multivimbroker/multivimbroker/tests/test_syscomm.py
index acad785..ee34649 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", "pike"],
+            "openstack": ["titanium_cloud", "ocata", "pike", "starlingx"],
             "vmware": ["4.0"],
             "azure": ["1.0"]
         }