Refactore hypervisor storage through model and role