Implemented some functions for Inter G-switch link discovery
Fixing merge conflicts