Merge "Add some test-cases for cinder cli"