Refactored code to maintain uniformity
Refactored code to maintain uniformity
Added a blocked by bug 950146 for missing virt.host_type fact in GUI