Update router test

Change-Id: Ib78062a136758a29a3078662f80c336967cf176c

Author: ahorcom

tests/e2e/mysqloperator/cluster/router_t.py

@@ -465,8 +465,6 @@ def test_1_verify_provided_options(self):
 
 
     def test_2_update_bootstrap_config(self):
-        [old_pod] = kutil.ls_po(self.ns, pattern="mycluster-router-.*")
-
         patch = {
             "spec": {
                 "router": {
@@ -476,18 +474,15 @@ def test_2_update_bootstrap_config(self):
                 }
             }
         }
+        waiter = tutil.get_deploy_rollover_update_waiter(self, "mycluster", timeout=300, delay=5)
         kutil.patch_ic(self.ns, "mycluster", patch, type="merge")
-
-        self.wait_pod_gone(old_pod["NAME"], ns=self.ns)
-        self.wait_routers("mycluster-router-.*", 1)
+        waiter()
 
         [new_pod] = kutil.ls_po(self.ns, pattern="mycluster-router-.*")
         router_config = kutil.cat(self.ns, new_pod["NAME"], "/tmp/mysqlrouter/mysqlrouter.conf")
         self.assertIn(b"name=othername", router_config, "router config does not contain the name")
 
     def test_3_update_config(self):
-        [old_pod] = kutil.ls_po(self.ns, pattern="mycluster-router-.*")
-
         patch = {
             "spec": {
                 "router": {
@@ -497,10 +492,9 @@ def test_3_update_config(self):
                 }
             }
         }
+        waiter = tutil.get_deploy_rollover_update_waiter(self, "mycluster", timeout=300, delay=5)
         kutil.patch_ic(self.ns, "mycluster", patch, type="merge")
-
-        self.wait_pod_gone(old_pod["NAME"], ns=self.ns)
-        self.wait_routers("mycluster-router-.*", 1)
+        waiter()
 
         [new_pod] = kutil.ls_po(self.ns, pattern="mycluster-router-.*")
         self.assertTrue(kutil.file_exists(self.ns, new_pod["NAME"], "/tmp/with`backtick"))
@@ -524,6 +518,7 @@ def test_5_add_routing_options(self):
             }
         }
         kutil.patch_ic(self.ns, "mycluster", patch, type="merge")
+        sleep(5)
         routing_options = get_routing_options(self.ns, "mycluster-0")
         rules = routing_options["configuration"]["routing_rules"]
         self.assertEqual(rules["read_only_targets"], "read_replicas")
@@ -538,6 +533,7 @@ def test_6_remove_routing_options(self):
             }
         }
         kutil.patch_ic(self.ns, "mycluster", patch, type="merge")
+        sleep(5)
         routing_options = get_routing_options(self.ns, "mycluster-0")
         rules = routing_options["configuration"]["routing_rules"]
         self.assertEqual(rules["read_only_targets"], "secondaries")