CFY-1230 refactored openstack handler