@@ -170,10 +170,28 @@ def test_positive_custom_provision_pxe_host(
170170 delay = 20 ,
171171 )
172172 discovered_host = sat .api .DiscoveredHost ().search (query = {'mac' : mac })[0 ]
173- discovered_host .hostgroup = provisioning_hostgroup
174- discovered_host .location = provisioning_hostgroup .location [0 ]
175- discovered_host .organization = provisioning_hostgroup .organization [0 ]
176- discovered_host .build = True
173+ if is_open ('SAT-33477' ) and (
174+ sat .cli .DiscoveredHost .list (
175+ {
176+ 'organization-id' : module_org .id ,
177+ 'location-id' : module_location .id ,
178+ }
179+ )
180+ == []
181+ ):
182+ with sat .ui_session () as temp_session :
183+ temp_session .organization .select (org_name = 'Any organization' )
184+ temp_session .location .select (loc_name = 'Any location' )
185+ temp_session .discoveredhosts .apply_action (
186+ 'Assign Organization' ,
187+ discovered_host .name ,
188+ values = dict (organization = module_org .name ),
189+ )
190+ temp_session .discoveredhosts .apply_action (
191+ 'Assign Location' ,
192+ discovered_host .name ,
193+ values = dict (location = module_location .name ),
194+ )
177195
178196 discovered_host_name = discovered_host .name
179197 domain_name = provisioning_hostgroup .domain .read ().name
@@ -325,10 +343,28 @@ def test_positive_auto_provision_host_with_rule(
325343 delay = 20 ,
326344 )
327345 discovered_host = sat .api .DiscoveredHost ().search (query = {'mac' : mac })[0 ]
328- discovered_host .hostgroup = provisioning_hostgroup
329- discovered_host .location = provisioning_hostgroup .location [0 ]
330- discovered_host .organization = provisioning_hostgroup .organization [0 ]
331- discovered_host .build = True
346+ if is_open ('SAT-33477' ) and (
347+ sat .cli .DiscoveredHost .list (
348+ {
349+ 'organization-id' : module_org .id ,
350+ 'location-id' : module_location .id ,
351+ }
352+ )
353+ == []
354+ ):
355+ with sat .ui_session () as temp_session :
356+ temp_session .organization .select (org_name = 'Any organization' )
357+ temp_session .location .select (loc_name = 'Any location' )
358+ temp_session .discoveredhosts .apply_action (
359+ 'Assign Organization' ,
360+ discovered_host .name ,
361+ values = dict (organization = module_org .name ),
362+ )
363+ temp_session .discoveredhosts .apply_action (
364+ 'Assign Location' ,
365+ discovered_host .name ,
366+ values = dict (location = module_location .name ),
367+ )
332368
333369 discovered_host_name = discovered_host .name
334370 domain_name = provisioning_hostgroup .domain .read ().name
0 commit comments