Merge "enable cinder v2 api for volumetype test"