Hi gouthamr  carloss 
Please review.
https://review.opendev.org/c/openstack/python-manilaclient/+/913212
https://review.opendev.org/c/openstack/python-manilaclient/+/913216
Thanks