From e0667e96cfb9dedcdcf0eb5bbafe6efb4cf5c437 Mon Sep 17 00:00:00 2001
From: Carl Baldwin <carl.baldwin@hpe.com>
Date: Fri, 19 Feb 2016 23:28:49 +0000
Subject: [PATCH] Add use_default_subnetpool to subnet create requests

Change-Id: I7dcbc8477b2ffa776a9bb272b896a5adfca860ae
Depends-On: Ifff57c0485e4727f352b2cc2bd1bdaabd0f1606b
Closes-Bug: #1547705
---
 neutronclient/neutron/v2_0/subnet.py          |  6 ++++++
 neutronclient/tests/unit/test_cli20_subnet.py | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py
index d8b594663..3ba4f170a 100644
--- a/neutronclient/neutron/v2_0/subnet.py
+++ b/neutronclient/neutron/v2_0/subnet.py
@@ -187,6 +187,10 @@ class CreateSubnet(neutronV20.CreateCommand):
             '--subnetpool', metavar='SUBNETPOOL',
             help=_('ID or name of subnetpool from which this subnet '
                    'will obtain a CIDR.'))
+        parser.add_argument(
+            '--use-default-subnetpool',
+            action='store_true',
+            help=_('Use default subnetpool for ip_version, if it exists.'))
         parser.add_argument(
             '--prefixlen', metavar='PREFIX_LENGTH',
             help=_('Prefix length for subnet allocation from subnetpool.'))
@@ -199,6 +203,8 @@ class CreateSubnet(neutronV20.CreateCommand):
         if parsed_args.prefixlen:
             body['prefixlen'] = parsed_args.prefixlen
         ip_version = parsed_args.ip_version
+        if parsed_args.use_default_subnetpool:
+            body['use_default_subnetpool'] = True
         if parsed_args.subnetpool:
             if parsed_args.subnetpool == 'None':
                 _subnetpool_id = None
diff --git a/neutronclient/tests/unit/test_cli20_subnet.py b/neutronclient/tests/unit/test_cli20_subnet.py
index 4a28198f5..a1ebf8952 100644
--- a/neutronclient/tests/unit/test_cli20_subnet.py
+++ b/neutronclient/tests/unit/test_cli20_subnet.py
@@ -290,6 +290,25 @@ class CLITestV20SubnetJSON(test_cli20.CLITestV20Base):
                                    position_names, position_values,
                                    tenant_id='tenantid')
 
+    def test_create_subnet_with_use_default_subnetpool(self):
+        # Create subnet: --tenant-id tenantid --use-default-subnetpool \
+        #     netid cidr.
+        resource = 'subnet'
+        cmd = subnet.CreateSubnet(test_cli20.MyApp(sys.stdout), None)
+        name = 'myname'
+        myid = 'myid'
+        netid = 'netid'
+        cidr = 'prefixvalue'
+        args = ['--tenant_id', 'tenantid',
+                '--use-default-subnetpool',
+                netid, cidr]
+        position_names = ['ip_version', 'use_default_subnetpool', 'network_id',
+                          'cidr']
+        position_values = [4, True, netid, cidr]
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
+
     def test_create_subnet_with_disable_dhcp(self):
         # Create subnet: --tenant-id tenantid --disable-dhcp netid cidr.
         resource = 'subnet'