56d288f508
The current implementation calls interface create/delete in NetworkDriver.Join/NetworkDriver.Leave but Docker has been observed to release the interface to the default namespace in NetworkDriver.DeleteEndpoint. This would suggest in order to be compliant with Docker Libnetwork, interface creation and deletion should be done in NetworkDriver.CreateEndpoint and NetworkDriver.DeleteEndpoint Please note that while the implementation before this patch works anyway for vEth pairs, it is not compatible with other interface types (e.g. IPVlan) as it would be impossible for Kuryr to delete the endpoint until Docker moves it to the default namespace This patch moves the current interface creation/deletion from NetworkDriver.Join/NetworkDriver.Leave to NetworkDriver.CreateEndpoint/NetworkDriver.DeleteEndpoint _create_or_update port was refactored to return the neutron_port and subnets associated with the interface_cidr, the interface_response message creation has been moved to NetworkDriver.CreateEndpoint DocImpact Co-Authored-By: Marco Chiappero <marco.chiappero@intel.com> Change-Id: I84999989cec34a2a5b5cd2821155f150223c84cc
49 lines
1.9 KiB
Python
49 lines
1.9 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import ddt
|
|
from oslo_serialization import jsonutils
|
|
from werkzeug import exceptions as w_exceptions
|
|
|
|
from kuryr.lib import utils as lib_utils
|
|
from kuryr_libnetwork.tests.unit import base
|
|
|
|
|
|
@ddt.ddt
|
|
class TestKuryrLeaveFailures(base.TestKuryrFailures):
|
|
"""Unit tests for the failures for leaving the namespace."""
|
|
def _invoke_leave_request(self, docker_network_id,
|
|
docker_endpoint_id):
|
|
data = {
|
|
'NetworkID': docker_network_id,
|
|
'EndpointID': docker_endpoint_id,
|
|
}
|
|
response = self.app.post('/NetworkDriver.Leave',
|
|
content_type='application/json',
|
|
data=jsonutils.dumps(data))
|
|
|
|
return response
|
|
|
|
def test_leave_bad_request(self):
|
|
fake_docker_network_id = lib_utils.get_hash()
|
|
invalid_docker_endpoint_id = 'id-should-be-hexdigits'
|
|
|
|
response = self._invoke_leave_request(
|
|
fake_docker_network_id, invalid_docker_endpoint_id)
|
|
|
|
self.assertEqual(w_exceptions.BadRequest.code, response.status_code)
|
|
decoded_json = jsonutils.loads(response.data)
|
|
self.assertIn('Err', decoded_json)
|
|
# TODO(tfukushima): Add the better error message validation.
|
|
self.assertIn(invalid_docker_endpoint_id, decoded_json['Err'])
|
|
self.assertIn('EndpointID', decoded_json['Err'])
|