updated code upto the changes in openstack(mar-18)