Merge "network unit tests not run"

This commit is contained in:
Jenkins 2017-10-04 21:32:14 +00:00 committed by Gerrit Code Review
commit 12e24034e9
2 changed files with 10 additions and 3 deletions

View File

View File

@ -33,12 +33,16 @@ class FakeNeutronClient(object):
def update_port(self, port_id, port): def update_port(self, port_id, port):
pass pass
def list_ports(self): def list_ports(self, **kwargs):
return {'ports': [{'id': '1234567'}]} return {'ports': [{'id': '1234567'}]}
def delete_port(self, port_id): def delete_port(self, port_id):
pass pass
def get_neutron_port(self, port_id):
return {'fixed_ips': [{'ip_address': '192.168.2.22'}],
'id': '1234567'}
class FakeDockerClient(object): class FakeDockerClient(object):
@ -73,7 +77,7 @@ class KuryrNetowrkTestCase(base.TestCase):
self.docker_api = FakeDockerClient() self.docker_api = FakeDockerClient()
self.network_api = kuryr_network.KuryrNetwork() self.network_api = kuryr_network.KuryrNetwork()
self.network_api.init(self.context, self.docker_api) self.network_api.init(self.context, self.docker_api)
self.network_api.neutron = FakeNeutronClient() self.network_api.neutron_api = FakeNeutronClient()
def test_create_network(self): def test_create_network(self):
name = 'test_kuryr_network' name = 'test_kuryr_network'
@ -102,10 +106,13 @@ class KuryrNetowrkTestCase(base.TestCase):
def test_connect_container_to_network(self): def test_connect_container_to_network(self):
container = Container(self.context, **utils.get_test_container()) container = Container(self.context, **utils.get_test_container())
network_name = 'c02afe4e-8350-4263-8078' network_name = 'c02afe4e-8350-4263-8078'
kwargs = {'ip_version': 4, 'ipv4_address': '192.168.2.22',
'port': '1234567'}
expected = [{'version': 4, 'addr': '192.168.2.22', expected = [{'version': 4, 'addr': '192.168.2.22',
'port': '1234567'}] 'port': '1234567'}]
address = self.network_api.connect_container_to_network(container, address = self.network_api.connect_container_to_network(container,
network_name) network_name,
kwargs)
self.assertEqual(expected, address) self.assertEqual(expected, address)
def test_disconnect_container_from_network(self): def test_disconnect_container_from_network(self):