feat: OKD Dhcp config works and is actually savec on opnsense firewall, its alive!! First real run on wk cluster

harmony-rs/opnsense-config-xml/src/data/opnsense.rs

@@ -27,7 +27,7 @@ pub struct OPNsense {
     pub opnsense: OPNsenseXmlSection,
     pub staticroutes: StaticRoutes,
     pub ca: MaybeString,
-    pub gateways: Option<Gateways>,
+    pub gateways: Option<RawXml>,
     pub cert: Vec<Cert>,
     pub dhcpdv6: DhcpDv6,
     pub virtualip: VirtualIp,
@@ -60,7 +60,6 @@ impl OPNsense {
     }
 }
 
-
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct LoadBalancer {
     pub monitor_type: Vec<MonitorType>,
@@ -415,6 +414,8 @@ pub struct OPNsenseXmlSection {
     pub ipsec: Option<IPsec>,
     #[yaserde(rename = "Interfaces")]
     pub interfaces: Option<ConfigInterfaces>,
+    #[yaserde(rename = "NodeExporter")]
+    pub node_exporter: Option<RawXml>,
     #[yaserde(rename = "Kea")]
     pub kea: Option<RawXml>,
     pub monit: Option<Monit>,
@@ -428,6 +429,7 @@ pub struct OPNsenseXmlSection {
     pub unboundplus: Option<RawXml>,
     #[yaserde(rename = "DHCRelay")]
     pub dhcrelay: Option<RawXml>,
+    pub trust: Option<RawXml>,
     pub wireguard: Option<Wireguard>,
     #[yaserde(rename = "Swanctl")]
     pub swanctl: Swanctl,
@@ -479,6 +481,8 @@ pub struct IDSGeneral {
     #[yaserde(rename = "LogPayload")]
     log_payload: Option<u8>,
     verbosity: MaybeString,
+    #[yaserde(rename = "eveLog")]
+    eve_log: Option<RawXml>,
 }
 
 #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
@@ -498,11 +502,15 @@ pub struct IPsec {
     key_pairs: MaybeString,
     #[yaserde(rename = "preSharedKeys")]
     pre_shared_keys: MaybeString,
+    charon: Option<RawXml>,
 }
 
 #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
 pub struct GeneralIpsec {
     enabled: MaybeString,
+    preferred_oldsa: MaybeString,
+    disablevpnrules: MaybeString,
+    passthrough_networks: MaybeString,
 }
 
 #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
@@ -1214,6 +1222,8 @@ pub struct WireguardServerItem {
     pub gateway: MaybeString,
     pub carp_depend_on: MaybeString,
     pub peers: String,
+    pub endpoint: MaybeString,
+    pub peer_dns: MaybeString,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1320,7 +1330,6 @@ pub struct ConfigOpenVPN {
     pub StaticKeys: MaybeString,
 }
 
-
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 #[yaserde(rename = "HAProxy")]
 pub struct HAProxy {
@@ -1411,6 +1420,8 @@ pub struct Tuning {
     #[yaserde(rename = "maxConnections")]
     pub max_connections: MaybeString,
     pub nbthread: i32,
+    #[yaserde(rename = "resolversPrefer")]
+    pub resolvers_prefer: String,
     #[yaserde(rename = "sslServerVerify")]
     pub ssl_server_verify: String,
     #[yaserde(rename = "maxDHSize")]
@@ -1425,6 +1436,12 @@ pub struct Tuning {
     pub lua_max_mem: i32,
     #[yaserde(rename = "customOptions")]
     pub custom_options: MaybeString,
+    #[yaserde(rename = "ocspUpdateEnabled")]
+    pub ocs_update_enabled: MaybeString,
+    #[yaserde(rename = "ocspUpdateMinDelay")]
+    pub ocs_update_min_delay: MaybeString,
+    #[yaserde(rename = "ocspUpdateMaxDelay")]
+    pub ocs_update_max_delay: MaybeString,
     #[yaserde(rename = "ssl_defaultsEnabled")]
     pub ssl_defaults_enabled: i32,
     #[yaserde(rename = "ssl_bindOptions")]
@@ -1437,6 +1454,19 @@ pub struct Tuning {
     pub ssl_cipher_list: String,
     #[yaserde(rename = "ssl_cipherSuites")]
     pub ssl_cipher_suites: String,
+    #[yaserde(rename = "h2_initialWindowSize")]
+    pub h2_initial_window_size: Option<MaybeString>,
+    #[yaserde(rename = "h2_initialWindowSizeOutgoing")]
+    pub h2_initial_window_size_outgoing: Option<MaybeString>,
+    #[yaserde(rename = "h2_initialWindowSizeIncoming")]
+    pub h2_initial_window_size_incoming: Option<MaybeString>,
+    #[yaserde(rename = "h2_maxConcurrentStreams")]
+    pub h2_max_concurrent_streams: Option<MaybeString>,
+    #[yaserde(rename = "h2_maxConcurrentStreamsOutgoing")]
+    pub h2_max_concurrent_streams_outgoing: Option<MaybeString>,
+    #[yaserde(rename = "h2_maxConcurrentStreamsIncoming")]
+    pub h2_max_concurrent_streams_incoming: Option<MaybeString>,
+
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1684,25 +1714,22 @@ pub struct Backend {
     pub http2_enabled_nontls: u8,
     #[yaserde(rename = "ba_advertised_protocols")]
     pub ba_advertised_protocols: String,
-    #[yaserde(rename = "persistence")]
-    pub persistence: String,
-    #[yaserde(rename = "persistence_cookiemode")]
+    #[yaserde(rename = "forwardFor")]
+    pub forward_for: Option<i32>,
+    #[yaserde(rename = "forwardedHeader")]
+    pub forwarded_header: Option<MaybeString>,
+    #[yaserde(rename = "forwardedHeaderParameters")]
+    pub forwarded_header_parameters: Option<MaybeString>,
+    pub persistence: MaybeString,
     pub persistence_cookiemode: String,
-    #[yaserde(rename = "persistence_cookiename")]
     pub persistence_cookiename: MaybeString,
-    #[yaserde(rename = "persistence_stripquotes")]
     pub persistence_stripquotes: u8,
-    #[yaserde(rename = "stickiness_pattern")]
-    pub stickiness_pattern: String,
+    pub stickiness_pattern: MaybeString,
     #[yaserde(rename = "stickiness_dataTypes")]
     pub stickiness_data_types: MaybeString,
-    #[yaserde(rename = "stickiness_expire")]
     pub stickiness_expire: String,
-    #[yaserde(rename = "stickiness_size")]
     pub stickiness_size: String,
-    #[yaserde(rename = "stickiness_cookiename")]
     pub stickiness_cookiename: MaybeString,
-    #[yaserde(rename = "stickiness_cookielength")]
     pub stickiness_cookielength: MaybeString,
     #[yaserde(rename = "stickiness_connRatePeriod")]
     pub stickiness_conn_rate_period: String,
@@ -1863,12 +1890,6 @@ pub struct StaticRoutes {
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct Ca {}
 
-#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
-pub struct Gateways {
-    #[yaserde(rename = "gateway_item")]
-    pub gateway_item: RawXml
-}
-
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct Cert {
     #[yaserde(attribute)]
@@ -1975,14 +1996,14 @@ pub struct Bridges {
 pub struct Gifs {
     #[yaserde(attribute)]
     pub version: Option<String>,
-    pub gif: MaybeString,
+    pub gif: Option<MaybeString>,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct Gres {
     #[yaserde(attribute)]
     pub version: Option<String>,
-    pub gre: MaybeString,
+    pub gre: Option<MaybeString>,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]