Revert "Implement user-defined tenant for neutron nets"

This reverts commit dc5e6c2db4660ca31a146250b84c1d4dee73997d
Merge "Revert "Implement user-defined tenant for neutron nets""