Clean useless class attributes out of VPN model

Author: Jamie-

openvpn_api/vpn.py

@@ -19,17 +19,6 @@ class VPNType:
 
 
 class VPN:
-    _mgmt_host = None  # Management interface host
-    _mgmt_port = None  # Management interface port
-    _mgmt_socket = None  # Management interface UNIX socket
-    _type: Optional[str] = None  # VPNType object to choose between IP (host:port) and socket
-    _socket = None
-
-    _release = None  # OpenVPN release string
-    _state = None  # State object
-    stats = ServerStats()  # Stats object
-    sessions = []  # Client sessions
-
     def __init__(self, host: Optional[str] = None, port: Optional[int] = None, socket: Optional[str] = None):
         if (socket and host) or (socket and port) or (not socket and not host and not port):
             raise errors.VPNError("Must specify either socket or host and port")
@@ -40,6 +29,8 @@ def __init__(self, host: Optional[str] = None, port: Optional[int] = None, socke
             self._mgmt_host = host
             self._mgmt_port = port
             self._type = VPNType.IP
+        self._socket = None
+        self.clear_cache()  # Initialise release info and daemon state caches
 
     @property
     def type(self) -> Optional[str]:
@@ -62,7 +53,6 @@ def connect(self) -> Optional[bool]:
         try:
             if self.type == VPNType.IP:
                 self._socket = socket.create_connection((self._mgmt_host, self._mgmt_port), timeout=3)
-
             else:
                 self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                 self._socket.connect(self._mgmt_socket)

tests/test_vpn_model.py

@@ -35,18 +35,21 @@ def test_host_port(self):
         vpn = VPN(host="localhost", port=1234)
         self.assertEqual(vpn._mgmt_host, "localhost")
         self.assertEqual(vpn._mgmt_port, 1234)
-        self.assertIsNone(vpn._mgmt_socket)
         self.assertEqual(vpn.type, VPNType.IP)
         self.assertEqual(vpn.mgmt_address, "localhost:1234")
 
     def test_socket(self):
         vpn = VPN(socket="file.sock")
         self.assertEqual(vpn._mgmt_socket, "file.sock")
-        self.assertIsNone(vpn._mgmt_host)
-        self.assertIsNone(vpn._mgmt_port)
         self.assertEqual(vpn.type, VPNType.UNIX_SOCKET)
         self.assertEqual(vpn.mgmt_address, "file.sock")
 
+    def test_initialisation(self):
+        vpn = VPN(socket="file.sock")
+        self.assertIsNone(vpn._release)
+        self.assertIsNone(vpn._state)
+        self.assertIsNone(vpn._socket)
+
     @patch("openvpn_api.vpn.socket.create_connection")
     def test_connect_ip_failure(self, mock_create_connection):
         vpn = VPN(host="localhost", port=1234)