diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-10-12 02:30:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-12 02:30:22 +0000 |
| commit | dca83b12781926d1bd958e01b3e3d29b3cc9e24e (patch) | |
| tree | 12be9bf4e6a4e197487110308ddfb253f86d831a /multivimbroker | |
| parent | 7882e505aeb67cedfe4f23447bc1ba43922572d6 (diff) | |
| parent | 4cd5b6a9fcfe692393db485cdbef5282c8233e18 (diff) | |
Merge "Add pike to framework in multicloud"1.2.0
Diffstat (limited to 'multivimbroker')
| -rw-r--r-- | multivimbroker/multivimbroker/pub/config/provider-plugin.json | 7 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/tests/test_syscomm.py | 2 |
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"] } |