Merge "Use base.attach_volume in test_attach_volume"