From c18267e6f771ab8c5b8266f9213847e8f6bf4008 Mon Sep 17 00:00:00 2001 From: Alex Holden Date: Tue, 21 Oct 2014 02:06:09 +0100 Subject: [PATCH 1/3] Primitive disabling of IPV6 via the APIs --- neutronclient/neutron/v2_0/subnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py index de0569f30..eb2cc6606 100644 --- a/neutronclient/neutron/v2_0/subnet.py +++ b/neutronclient/neutron/v2_0/subnet.py @@ -80,12 +80,12 @@ def add_known_arguments(self, parser): parser.add_argument( '--ip-version', type=int, - default=4, choices=[4, 6], + default=4, choices=[4], help=_('IP version with default 4')) parser.add_argument( '--ip_version', type=int, - choices=[4, 6], + choices=[4], help=argparse.SUPPRESS) parser.add_argument( '--gateway', metavar='GATEWAY_IP', From 46698c48b905b4b88387389ea8e481139653204f Mon Sep 17 00:00:00 2001 From: Alex Holden Date: Tue, 21 Oct 2014 02:06:09 +0100 Subject: [PATCH 2/3] Implements: rally-user-story US6909 - Blocking Tenants from IPv6 Usage --- neutronclient/neutron/v2_0/subnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py index de0569f30..eb2cc6606 100644 --- a/neutronclient/neutron/v2_0/subnet.py +++ b/neutronclient/neutron/v2_0/subnet.py @@ -80,12 +80,12 @@ def add_known_arguments(self, parser): parser.add_argument( '--ip-version', type=int, - default=4, choices=[4, 6], + default=4, choices=[4], help=_('IP version with default 4')) parser.add_argument( '--ip_version', type=int, - choices=[4, 6], + choices=[4], help=argparse.SUPPRESS) parser.add_argument( '--gateway', metavar='GATEWAY_IP', From e002c261c0870ac4142f93ed0274b9dd171f5657 Mon Sep 17 00:00:00 2001 From: Alex Holden Date: Tue, 21 Oct 2014 19:39:45 +0100 Subject: [PATCH 3/3] Revert "Primitive disabling of IPV6 via the APIs" This reverts commit c18267e6f771ab8c5b8266f9213847e8f6bf4008. --- neutronclient/neutron/v2_0/subnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py index eb2cc6606..de0569f30 100644 --- a/neutronclient/neutron/v2_0/subnet.py +++ b/neutronclient/neutron/v2_0/subnet.py @@ -80,12 +80,12 @@ def add_known_arguments(self, parser): parser.add_argument( '--ip-version', type=int, - default=4, choices=[4], + default=4, choices=[4, 6], help=_('IP version with default 4')) parser.add_argument( '--ip_version', type=int, - choices=[4], + choices=[4, 6], help=argparse.SUPPRESS) parser.add_argument( '--gateway', metavar='GATEWAY_IP',