From 97fb5f26f0088bed61c293b0c74c31a70b76a085 Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Fri, 13 Nov 2015 00:10:41 +0000 Subject: [PATCH] Adds Magnum Container Network Model to Swarm 1. Updates network-driver API validation. 2. Updates AtomicSwarm template definition for swarm, flannel and labels. 3. Adds initial unit test. Partially-Implements: blueprint extend-baymodel-net-attributes Partially-Implements: blueprint conductor-template-net-update Change-Id: Ia80f239bcbd29ae14de25ae3e915a49d9b9bafd1 --- magnum/tests/functional/common/datagen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magnum/tests/functional/common/datagen.py b/magnum/tests/functional/common/datagen.py index 5b6496d..700bc13 100644 --- a/magnum/tests/functional/common/datagen.py +++ b/magnum/tests/functional/common/datagen.py @@ -49,7 +49,7 @@ def generate_random_coe(): def generate_random_coe_dep_network_driver(coe): allowed_driver_types = { 'kubernetes': ['flannel', None], - 'swarm': ['docker', None], + 'swarm': ['docker', 'flannel', None], 'mesos': ['docker', None], } driver_types = allowed_driver_types[coe]