From 7b97cd07c1391f86eb97f7cf4880849ad3a047e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 14 Nov 2016 14:44:55 +0800 Subject: Add neutron vpnaas code into neutron-server container * Add neutron vpnaas source in neutron-server container. * Fix the test_build.py to support mutiple plugin configuration. Change-Id: I2778b7fbf23207576c21a3e7fa1b9a399c228cf3 Closes-Bug: #1641063 --- kolla/common/config.py | 4 ++++ kolla/tests/test_build.py | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 72c87e497..36541ad98 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -266,6 +266,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/networking-sfc/' 'networking-sfc-master.tar.gz')}, + 'neutron-server-plugin-vpnaas-agent': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/neutron-vpnaas/' + 'neutron-vpnaas-master.tar.gz')}, 'neutron-vpnaas-agent': { 'type': 'url', 'location': ('http://tarballs.openstack.org/neutron-vpnaas/' diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 980413468..8943f504f 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -188,11 +188,16 @@ class KollaWorkerTest(base.TestCase): 'source': 'https://git.openstack.org/openstack/networking-arista', 'type': 'git' } + + found = False for image in kolla.images: if image.name == 'neutron-server': - self.assertEqual(image.plugins[0], expected_plugin) + for plugin in image.plugins: + if plugin == expected_plugin: + found = True + break break - else: + if not found: self.fail('Can not find the expected neutron arista plugin') def test_build_image_list_plugin_parsing(self): -- cgit v1.2.3