openstack
/
tempest
Code Issues Proposed changes

Merge "Dynamic creds does not support create subnet with ipv6"

This commit is contained in:
Jenkins 2017-07-13 02:38:51 +00:00 committed by Gerrit Code Review
parent 18ca366ebe 5b68f50c4b
commit 64055edffb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tempest/common/dynamic_creds.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import ipaddress
import netaddr
from oslo_log import log as logging
import six
@ -275,14 +277,16 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
name=subnet_name,
tenant_id=tenant_id,
enable_dhcp=self.network_resources['dhcp'],
ip_version=4)
ip_version=(ipaddress.ip_network(
six.text_type(subnet_cidr)).version))
else:
resp_body = self.subnets_admin_client.\
create_subnet(network_id=network_id,
cidr=str(subnet_cidr),
name=subnet_name,
tenant_id=tenant_id,
ip_version=4)
ip_version=(ipaddress.ip_network(
six.text_type(subnet_cidr)).version))
break
except lib_exc.BadRequest as e:
if 'overlaps with another subnet' not in str(e):