summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2018-10-11 13:58:11 +0800
committerHuang Haibin <haibin.huang@intel.com>2018-10-11 15:05:07 +0800
commit4cd5b6a9fcfe692393db485cdbef5282c8233e18 (patch)
tree4056bc894fadf169cc57e17457cb8cf69f5e74e0
parent0f7184f697298eaabe56b3960e6bc59197b7793e (diff)
Add pike to framework in multicloud
Change-Id: Ia567247acfcf00caf31c676d87900d2b5cda4e5a Issue-ID: MULTICLOUD-276 Signed-off-by: Huang Haibin <haibin.huang@intel.com>
-rw-r--r--multivimbroker/multivimbroker/pub/config/provider-plugin.json7
-rw-r--r--multivimbroker/multivimbroker/tests/test_syscomm.py2
2 files changed, 7 insertions, 2 deletions
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"]
}