Merge volumes.py and volumes_heat.py code

Change-Id: Ida00a678ff90389d80b94047d094e1a504581563
Merge "Merge volumes.py and volumes_heat.py code"