refactor openvpn.py code and its corresponding tests
resolve conflicts in OpenVPN.py and its according tests