Removed temp code in vpnaas.py and fixed PEP8
Removed duplication for more services