openstack
/
magnum
Code Issues Proposed changes

Merge "Fix the load balancer description regex pattern for deleting cluster" into stable/train

This commit is contained in:
Zuul 2020-02-27 02:29:19 +00:00 committed by Gerrit Code Review
parent b842242527 c121c92789
commit 21b819e584
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/common/octavia.py
View File

@ -62,7 +62,7 @@ def delete_loadbalancers(context, cluster):
The load balancers created for kubernetes services and ingresses are
deleted.
"""
pattern = (r'Kubernetes .+ from cluster %s$' % cluster.uuid)
pattern = (r'Kubernetes .+ from cluster %s' % cluster.uuid)
valid_status = ["ACTIVE", "ERROR", "PENDING_DELETE", "DELETED"]
try:

6
magnum/tests/unit/common/test_octavia.py
View File

@ -49,9 +49,9 @@ class OctaviaTest(base.TestCase):
},
{
"id": "fake_id_2",
"description": "Kubernetes external service "
"a9f9ba08cf28811e89547fa163ea824f from "
"cluster %s" % self.cluster.uuid,
"description": "Kubernetes Ingress test-octavia-ingress "
"in namespace default from cluster %s, "
"version: 32207" % self.cluster.uuid,
"name": "fake_name_2",
"provisioning_status": "ERROR",
"vip_port_id": "c17c1a6e-1868-11e9-84cd-00224d6b7bc1"