From 56633d2e1470e3096de27bdf09668802baaebd4d Mon Sep 17 00:00:00 2001 From: Hyunsun Moon Date: Wed, 26 Jul 2017 02:40:37 +0000 Subject: [PATCH] Return network options when AllocateNetwork called The returned options are passed to CreateNetwork. Change-Id: I8e03d2b4fe8e4309ca22ba5f3f497d1c332e1c91 Closes-Bug: 1706481 --- kuryr_libnetwork/controllers.py | 7 +++---- kuryr_libnetwork/tests/unit/test_kuryr.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kuryr_libnetwork/controllers.py b/kuryr_libnetwork/controllers.py index 10be7aee..af9551d6 100644 --- a/kuryr_libnetwork/controllers.py +++ b/kuryr_libnetwork/controllers.py @@ -649,10 +649,9 @@ def network_driver_allocate_network(): json_data = flask.request.get_json(force=True) LOG.debug("Received JSON data %s for " "/NetworkDriver.AllocateNetwork", json_data) - # Note(limao): This API will only called in docker swarm mode, - # we do not have specific resource need to allocate - # right now, so just return SUCCESS. - return flask.jsonify(const.SCHEMA['SUCCESS']) + # Note(limao): This API will only called in docker swarm mode + # The returned options are passed to CreateNetwork. + return flask.jsonify({'Options': json_data.get('Options')}) @app.route('/NetworkDriver.FreeNetwork', methods=['POST']) diff --git a/kuryr_libnetwork/tests/unit/test_kuryr.py b/kuryr_libnetwork/tests/unit/test_kuryr.py index ad6e70dd..a385239a 100644 --- a/kuryr_libnetwork/tests/unit/test_kuryr.py +++ b/kuryr_libnetwork/tests/unit/test_kuryr.py @@ -2282,7 +2282,7 @@ class TestKuryr(base.TestKuryrBase): allocate_network_request)) self.assertEqual(200, response.status_code) decoded_json = jsonutils.loads(response.data) - self.assertEqual(constants.SCHEMA['SUCCESS'], decoded_json) + self.assertEqual({'Options': {}}, decoded_json) def test_network_driver_free_network(self): docker_network_id = lib_utils.get_hash()