Merge "Add cinder CLI tests "qos-list" and "encryption-type-list""