From 752760872c945e79a004e1a0c39fe307e8a5e5dd Mon Sep 17 00:00:00 2001 From: Aleksey Kasatkin Date: Thu, 22 Oct 2015 19:12:49 +0300 Subject: [PATCH] Fix test after gate tests fail Gate tests failed on https://review.openstack.org/#/c/235956/ Here it is fixed. Closes-Bug: #1509006 Change-Id: I66fbe9dd3ad7d93a53dd9b7839ccc157a66a9972 --- .../test/integration/test_orchestrator_serializer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py index 9fe0b736c1..b49faeb64d 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py @@ -1860,8 +1860,6 @@ class TestNeutronOrchestratorSerializer(OrchestratorSerializerTestBase): 'gateway': '199.10.1.1'}, 'storage': {'cidr': '199.10.2.0/24', 'gateway': '199.10.2.1'}, - 'private': {'cidr': '199.10.3.0/24', - 'gateway': '199.10.3.1'}, 'fuelweb_admin': {'cidr': '199.11.0.0/24', 'ip_ranges': [['199.11.0.5', '199.11.0.55']], 'gateway': '199.11.0.1'} @@ -1876,11 +1874,14 @@ class TestNeutronOrchestratorSerializer(OrchestratorSerializerTestBase): if network['id'] in netw_ids and network['name'] in ng2_networks: for pkey, pval in six.iteritems(ng2_networks[network['name']]): network[pkey] = pval - network['meta']['use_gateway'] = True + network['meta']['use_gateway'] = True + elif network['meta']['notation'] and not network['gateway']: + network['gateway'] = str(IPNetwork(network['cidr']).first) + network['meta']['use_gateway'] = True netconfig['networking_parameters']['floating_ranges'] = \ [['199.10.0.77', '199.10.0.177']] resp = self.env.neutron_networks_put(cluster.id, netconfig) - self.assertEqual(resp.json_body['status'], consts.TASK_STATUSES.ready) + self.assertEqual(resp.status_code, 200) self.prepare_for_deployment(cluster.nodes) facts = self.serializer.serialize(cluster, cluster.nodes)