openstack
/
kuryr-libnetwork
Code Issues Proposed changes

Merge "Return network options when AllocateNetwork called"

This commit is contained in:
Jenkins 2017-07-31 14:34:47 +00:00 committed by Gerrit Code Review
parent 9c3faffe7f 56633d2e14
commit ee47bcb7ea
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kuryr_libnetwork/controllers.py
View File

@ -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'])

2
kuryr_libnetwork/tests/unit/test_kuryr.py
View File

@ -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()