Merge "Sharing codes for cinder v1 and v2 tests"