Return network options when AllocateNetwork called
The returned options are passed to CreateNetwork. Change-Id: I8e03d2b4fe8e4309ca22ba5f3f497d1c332e1c91 Closes-Bug: 1706481
This commit is contained in:
parent
5cc622f42a
commit
56633d2e14
|
@ -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'])
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue