Resolve disk by disk_id or Disk object

 - Fix deployment scenario of 1 vm per vapp