add openvpn data formats

oonidata/src/oonidata/models/dataformats.py

@@ -283,6 +283,7 @@ class DNSQuery(BaseModel):
  dial_id: Optional[int] = None
 
 
+
 @add_slots
 @dataclass
 class TCPConnectStatus(BaseModel):
@@ -364,3 +365,48 @@ class NetworkEvent(BaseModel):
  # Deprecated fields
  dial_id: Optional[int] = None
  conn_id: Optional[int] = None
+
+@add_slots
+@dataclass
+class OpenVPNConnectStatus(BaseModel):
+ success: bool
+ failure: Union[Failure, bool] = None
+
+@add_slots
+@dataclass
+class OpenVPNHandshake(BaseModel):
+ bootstrap_time: float
+ endpoint: str
+ ip: str # we might want to make this optional, and scrub in favor of ASN/prefix
+ port: int
+ transport: str
+ provider: str
+ openvpn_options: Optional[dict] = None
+ status: OpenVPNConnectStatus
+ t0: float
+ t: float
+ tags: Optional[List[str]] = None
+ transaction_id: Optional[str] = None
+
+@add_slots
+@dataclass
+class OpenVPNPacket(BaseModel):
+ operation: str
+ stage: str
+ opcode: str
+ id: int
+ acks: List[int]
+ payload_size: int
+ send_attempts: Optional[int] = None
+
+
+@add_slots
+@dataclass
+class OpenVPNNetworkEvent(BaseModel):
+ operation: str
+ stage: str
+ t: float
+ tags: Optional[List[str]] = None
+ transaction_id: Optional[str] = None
+ packet: Optional[OpenVPNPacket] = None
+

oonidata/src/oonidata/models/nettests/openvpn.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+from typing import List, Optional
+from oonidata.compat import add_slots
+from oonidata.models.dataformats import (
+ BaseTestKeys,
+ Failure,
+ TCPConnect,
+ OpenVPNHandshake,
+ OpenVPNNetworkEvent,
+)
+from oonidata.models.nettests.base_measurement import BaseMeasurement
+
+
+@add_slots
+@dataclass
+class OpenVPNTestKeys(BaseTestKeys):
+ failure: Failure = None
+ success: Optional[bool] = False
+
+ network_events: Optional[List[OpenVPNNetworkEvent]] = None
+ openvpn_handshake: Optional[List[OpenVPNHandshake]] = None
+ tcp_connect: Optional[List[TCPConnect]] = None
+
+
+@add_slots
+@dataclass
+class OpenVPN(BaseMeasurement):
+ __test_name__ = "openvpn"
+
+ test_keys: OpenVPNTestKeys