Merge "Fix the load balancer description regex pattern for deleting cluster" into stable/train
This commit is contained in:
commit
21b819e584
|
@ -62,7 +62,7 @@ def delete_loadbalancers(context, cluster):
|
||||||
The load balancers created for kubernetes services and ingresses are
|
The load balancers created for kubernetes services and ingresses are
|
||||||
deleted.
|
deleted.
|
||||||
"""
|
"""
|
||||||
pattern = (r'Kubernetes .+ from cluster %s$' % cluster.uuid)
|
pattern = (r'Kubernetes .+ from cluster %s' % cluster.uuid)
|
||||||
valid_status = ["ACTIVE", "ERROR", "PENDING_DELETE", "DELETED"]
|
valid_status = ["ACTIVE", "ERROR", "PENDING_DELETE", "DELETED"]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -49,9 +49,9 @@ class OctaviaTest(base.TestCase):
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "fake_id_2",
|
"id": "fake_id_2",
|
||||||
"description": "Kubernetes external service "
|
"description": "Kubernetes Ingress test-octavia-ingress "
|
||||||
"a9f9ba08cf28811e89547fa163ea824f from "
|
"in namespace default from cluster %s, "
|
||||||
"cluster %s" % self.cluster.uuid,
|
"version: 32207" % self.cluster.uuid,
|
||||||
"name": "fake_name_2",
|
"name": "fake_name_2",
|
||||||
"provisioning_status": "ERROR",
|
"provisioning_status": "ERROR",
|
||||||
"vip_port_id": "c17c1a6e-1868-11e9-84cd-00224d6b7bc1"
|
"vip_port_id": "c17c1a6e-1868-11e9-84cd-00224d6b7bc1"
|
||||||
|
|
Loading…
Reference in New Issue