2424)
2525
2626import zaza .model as zaza_model
27+ import zaza .charm_lifecycle .utils as lifecycle_utils
2728import zaza .openstack .charm_tests .test_utils as test_utils
2829
2930
@@ -44,26 +45,32 @@ def setUp(self):
4445 def test_configure_ips (self ):
4546 """Configure and un-configure 'service_ips' option."""
4647 config = {"service_ips" : self .VIP }
48+ test_config = lifecycle_utils .get_charm_config (fatal = False )
49+ states = test_config .get ("target_deploy_status" , {})
4750
4851 logging .info ("Configuring %s as a Service IP for %s unit." ,
4952 self .VIP , self .UNIT )
5053 zaza_model .set_application_config (self .APPLICATION , config )
51- zaza_model .wait_for_application_states ()
54+ zaza_model .wait_for_application_states (states = states )
5255
5356 for attempt in Retrying (wait = wait_fixed (2 ),
5457 retry = retry_if_exception_type (AssertionError ),
5558 reraise = True ,
5659 stop = stop_after_attempt (10 )):
5760 with attempt :
58- configured_ips = zaza_model .run_on_unit (self .UNIT ,
59- "ip addr" )
61+ configured_ips = zaza_model .run_on_unit (self .UNIT , "ip addr" )
6062 self .assertIn (self .VIP , configured_ips ["Stdout" ])
6163
6264 logging .info ("Removing service IP configuration from %s unit." ,
6365 self .UNIT )
6466 config ["service_ips" ] = ""
6567 zaza_model .set_application_config (self .APPLICATION , config )
66- zaza_model .wait_for_application_states ()
68+ zaza_model .wait_for_application_states (states = states )
6769
68- configured_ips = zaza_model .run_on_unit (self .UNIT , "ip addr" )
69- self .assertNotIn (self .VIP , configured_ips ["Stdout" ])
70+ for attempt in Retrying (wait = wait_fixed (2 ),
71+ retry = retry_if_exception_type (AssertionError ),
72+ reraise = True ,
73+ stop = stop_after_attempt (10 )):
74+ with attempt :
75+ configured_ips = zaza_model .run_on_unit (self .UNIT , "ip addr" )
76+ self .assertNotIn (self .VIP , configured_ips ["Stdout" ])
0 commit comments