Merge "Fix cannot deny ipv6 access rules"
This commit is contained in:
commit
af8d4cc32e
|
@ -93,15 +93,17 @@ class ShareIpRulesForNFSTest(base.BaseSharesTest):
|
||||||
|
|
||||||
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
|
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
|
||||||
@ddt.data(*itertools.chain(
|
@ddt.data(*itertools.chain(
|
||||||
itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION},
|
itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION}, {4}),
|
||||||
{utils.rand_ip()}),
|
itertools.product({'2.38', LATEST_MICROVERSION}, {6})
|
||||||
itertools.product({'2.37', LATEST_MICROVERSION},
|
|
||||||
{utils.rand_ipv6_ip()})
|
|
||||||
))
|
))
|
||||||
@ddt.unpack
|
@ddt.unpack
|
||||||
def test_create_delete_access_rules_with_one_ip(self, version,
|
def test_create_delete_access_rules_with_one_ip(self, version,
|
||||||
access_to):
|
ip_version):
|
||||||
|
|
||||||
|
if ip_version == 4:
|
||||||
|
access_to = utils.rand_ip()
|
||||||
|
else:
|
||||||
|
access_to = utils.rand_ipv6_ip()
|
||||||
# create rule
|
# create rule
|
||||||
if utils.is_microversion_eq(version, '1.0'):
|
if utils.is_microversion_eq(version, '1.0'):
|
||||||
rule = self.shares_client.create_access_rule(
|
rule = self.shares_client.create_access_rule(
|
||||||
|
@ -145,14 +147,15 @@ class ShareIpRulesForNFSTest(base.BaseSharesTest):
|
||||||
|
|
||||||
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
|
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
|
||||||
@ddt.data(*itertools.chain(
|
@ddt.data(*itertools.chain(
|
||||||
itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION},
|
itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION}, {4}),
|
||||||
{utils.rand_ip(network=True)}),
|
itertools.product({'2.38', LATEST_MICROVERSION}, {6})
|
||||||
itertools.product({'2.37', LATEST_MICROVERSION},
|
|
||||||
{utils.rand_ipv6_ip(network=True)})
|
|
||||||
))
|
))
|
||||||
@ddt.unpack
|
@ddt.unpack
|
||||||
def test_create_delete_access_rule_with_cidr(self, version, access_to):
|
def test_create_delete_access_rule_with_cidr(self, version, ip_version):
|
||||||
|
if ip_version == 4:
|
||||||
|
access_to = utils.rand_ip(network=True)
|
||||||
|
else:
|
||||||
|
access_to = utils.rand_ipv6_ip(network=True)
|
||||||
# create rule
|
# create rule
|
||||||
if utils.is_microversion_eq(version, '1.0'):
|
if utils.is_microversion_eq(version, '1.0'):
|
||||||
rule = self.shares_client.create_access_rule(
|
rule = self.shares_client.create_access_rule(
|
||||||
|
|
Loading…
Reference in New Issue