ip_version is mandatory for quantum create_subnet

Change-Id: I6e0e0afc5d825c00c4b4ecafa893c8a582faadc7

diff --git a/heat/engine/resources/subnet.py b/heat/engine/resources/subnet.py
index bda5b2e712e963d423fd76186c601264e2df28e2..87294d9eae884220080cf636cc3b2587f2d5a340 100644 (file)
--- 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 8b552a48f83d9f9ef550edeafab091856a6dc8d2..c404100435c6cc09f7ad3bf1ec1a6b0ea515f50b 100644 (file)
--- 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',