From 09bceee79bf67b731c1c79fb9a7b6ad799c8b2f6 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 13 Feb 2013 13:46:12 +1300 Subject: [PATCH] ip_version is mandatory for quantum create_subnet Change-Id: I6e0e0afc5d825c00c4b4ecafa893c8a582faadc7 --- heat/engine/resources/subnet.py | 5 +++-- heat/tests/test_vpc.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/heat/engine/resources/subnet.py b/heat/engine/resources/subnet.py index bda5b2e7..87294d9e 100644 --- a/heat/engine/resources/subnet.py +++ b/heat/engine/resources/subnet.py @@ -52,9 +52,10 @@ class Subnet(resource.Resource): props = { 'network_id': network_id, 'cidr': self.properties.get('CidrBlock'), - 'name': self.name + 'name': self.name, + 'ip_version': 4 } - subnet = self.quantum().create_subnet({'subnet': props})['subnet'] + subnet = client.create_subnet({'subnet': props})['subnet'] client.add_interface_router( router_id, diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index 8b552a48..c4041004 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -134,6 +134,7 @@ class VPCTestBase(unittest.TestCase): {'subnet': { 'network_id': u'aaaa', 'cidr': u'10.0.0.0/24', + 'ip_version': 4, 'name': u'the_subnet'}}).AndReturn({ 'subnet': { 'status': 'ACTIVE', -- 2.45.2