openstack
/
kuryr-tempest-plugin
Code Issues Proposed changes

Merge "Retrieve KuryrNets CR when supported"

This commit is contained in:
Zuul 2020-06-26 18:35:03 +00:00 committed by Gerrit Code Review
parent 2bd290e74d 07b2267e59
commit 8c866223b8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kuryr_tempest_plugin/tests/scenario/test_network_policy.py
View File

@ -85,8 +85,13 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
def test_ipblock_network_policy_allow_except(self): def test_ipblock_network_policy_allow_except(self):
namespace_name, namespace = self.create_namespace() namespace_name, namespace = self.create_namespace()
self.addCleanup(self.delete_namespace, namespace_name) self.addCleanup(self.delete_namespace, namespace_name)
cidr = self.get_kuryr_network_crds( if CONF.kuryr_kubernetes.kuryrnetworks:
namespace_name)['status']['subnetCIDR'] cidr = self.get_kuryr_network_crds(
namespace_name)['status']['subnetCIDR']
else:
crd_name = 'ns-' + namespace_name
cidr = self.get_kuryr_net_crds(
crd_name)['spec']['subnetCIDR']
ipn = netaddr.IPNetwork(cidr) ipn = netaddr.IPNetwork(cidr)
max_prefixlen = "/32" max_prefixlen = "/32"