Copy current functions from devstack

Change-Id: Ib26d3dae2ab84484aca081a29a9318a4914284f7
Merge "Copy current functions from devstack"