NationTech/harmony
6
0
Fork 1
Code Issues 33 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

fix(config): specify attribute argument in yaserde macros

Browse Source 
Update yaserde macro usage to explicitly specify the `attribute` argument for consistency and compatibility with newer versions of the yaserde crate. This change ensures that all fields annotated with `#[yaserde]` correctly define attributes, aligning with the recommended usage in the latest yaserde documentation.
This commit is contained in:
Jean-Gabriel Gill-Couture 2025-01-12 14:06:30 -05:00
parent 1665198e66
commit cad63ecf20
2 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
harmony-rs/opnsense-config-xml/src/data/haproxy.rs
View File

@ -7,8 +7,10 @@ use yaserde::{YaDeserialize as YaDeserializeTrait, YaSerialize as YaSerializeTra
use yaserde_derive::{YaDeserialize, YaSerialize}; use yaserde_derive::{YaDeserialize, YaSerialize};
impl YaDeserializeTrait for HAProxyId { impl YaDeserializeTrait for HAProxyId {
fn deserialize<R: std::io::Read>(reader: &mut yaserde::de::Deserializer<R>) -> Result<Self, String> { fn deserialize<R: std::io::Read>(
let field_name = match reader.peek()? { reader: &mut yaserde::de::Deserializer<R>,
) -> Result<Self, String> {
let _field_name = match reader.peek()? {
ReadEvent::StartElement { ReadEvent::StartElement {
name, attributes, .. name, attributes, ..
} => { } => {
@ -26,7 +28,7 @@ impl YaDeserializeTrait for HAProxyId {
let content = match reader.peek()? { let content = match reader.peek()? {
ReadEvent::Characters(content) => content.clone(), ReadEvent::Characters(content) => content.clone(),
ReadEvent::EndElement { name } => String::new(), ReadEvent::EndElement { name: _ } => String::new(),
_ => return Err(String::from("Unsupporte ReadEvent type")), _ => return Err(String::from("Unsupporte ReadEvent type")),
}; };
@ -89,7 +91,7 @@ impl Default for HAProxyId {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
#[yaserde(rename = "HAProxy")] #[yaserde(rename = "HAProxy")]
pub struct HAProxy { pub struct HAProxy {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub general: HaProxyGeneral, pub general: HaProxyGeneral,
pub frontends: HAProxyFrontends, pub frontends: HAProxyFrontends,
@ -298,7 +300,7 @@ pub struct HAProxyFrontends {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Frontend { pub struct Frontend {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub id: HAProxyId, pub id: HAProxyId,
pub enabled: i32, pub enabled: i32,
@ -417,7 +419,7 @@ pub struct HAProxyBackends {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct HAProxyBackend { pub struct HAProxyBackend {
#[yaserde(attribute, rename = "uuid")] #[yaserde(attribute = true, rename = "uuid")]
pub uuid: String, pub uuid: String,
#[yaserde(rename = "id")] #[yaserde(rename = "id")]
pub id: HAProxyId, pub id: HAProxyId,
@ -536,7 +538,7 @@ pub struct HAProxyServers {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct HAProxyServer { pub struct HAProxyServer {
#[yaserde(attribute, rename = "uuid")] #[yaserde(attribute = true, rename = "uuid")]
pub uuid: String, pub uuid: String,
pub id: HAProxyId, pub id: HAProxyId,
pub enabled: u8, pub enabled: u8,
@ -590,7 +592,7 @@ pub struct HAProxyHealthChecks {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct HAProxyHealthCheck { pub struct HAProxyHealthCheck {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub name: String, pub name: String,
pub description: MaybeString, pub description: MaybeString,

98
harmony-rs/opnsense-config-xml/src/data/opnsense.rs
View File

@ -115,7 +115,7 @@ pub struct Filters {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Rule { pub struct Rule {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: Option<String>, pub uuid: Option<String>,
#[yaserde(rename = "associated-rule-id")] #[yaserde(rename = "associated-rule-id")]
pub associated_rule_id: Option<MaybeString>, pub associated_rule_id: Option<MaybeString>,
@ -252,7 +252,7 @@ pub struct Ssh {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Firmware { pub struct Firmware {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub mirror: MaybeString, pub mirror: MaybeString,
pub flavour: MaybeString, pub flavour: MaybeString,
@ -401,7 +401,7 @@ pub struct Created {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Filter { pub struct Filter {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
rules: Option<MaybeString>, rules: Option<MaybeString>,
snatrules: Option<MaybeString>, snatrules: Option<MaybeString>,
@ -463,7 +463,7 @@ pub struct Tftp {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct TftpGeneral { pub struct TftpGeneral {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub enabled: u8, pub enabled: u8,
pub listen: String, pub listen: String,
@ -472,7 +472,7 @@ pub struct TftpGeneral {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
#[yaserde(rename = "IDS")] #[yaserde(rename = "IDS")]
pub struct IDS { pub struct IDS {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub rules: MaybeString, pub rules: MaybeString,
pub policies: MaybeString, pub policies: MaybeString,
@ -521,7 +521,7 @@ pub struct Detect {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct IPsec { pub struct IPsec {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
general: GeneralIpsec, general: GeneralIpsec,
#[yaserde(rename = "keyPairs")] #[yaserde(rename = "keyPairs")]
@ -549,26 +549,26 @@ pub struct ConfigInterfaces {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Neighbors { pub struct Neighbors {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
} }
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Vxlan { pub struct Vxlan {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
} }
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Loopback { pub struct Loopback {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
} }
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
#[yaserde(rename = "monit")] #[yaserde(rename = "monit")]
pub struct Monit { pub struct Monit {
#[yaserde(attribute)] #[yaserde(attribute = true)]
version: String, version: String,
general: GeneralMonit, general: GeneralMonit,
alert: Option<Alert>, alert: Option<Alert>,
@ -614,7 +614,7 @@ pub struct GeneralMonit {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Alert { pub struct Alert {
#[yaserde(attribute)] #[yaserde(attribute = true)]
uuid: String, uuid: String,
enabled: u8, enabled: u8,
recipient: String, recipient: String,
@ -627,7 +627,7 @@ pub struct Alert {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Service { pub struct Service {
#[yaserde(attribute)] #[yaserde(attribute = true)]
uuid: String, uuid: String,
enabled: u8, enabled: u8,
name: String, name: String,
@ -651,7 +651,7 @@ pub struct Service {
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
pub struct Test { pub struct Test {
#[yaserde(attribute)] #[yaserde(attribute = true)]
uuid: String, uuid: String,
name: String, name: String,
#[yaserde(rename = "type")] #[yaserde(rename = "type")]
@ -663,7 +663,7 @@ pub struct Test {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct CaptivePortal { pub struct CaptivePortal {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "zones")] #[yaserde(rename = "zones")]
pub zones: Option<Zones>, pub zones: Option<Zones>,
@ -673,7 +673,7 @@ pub struct CaptivePortal {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Cron { pub struct Cron {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "jobs")] #[yaserde(rename = "jobs")]
pub jobs: Option<Jobs>, pub jobs: Option<Jobs>,
@ -681,7 +681,7 @@ pub struct Cron {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Netflow { pub struct Netflow {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "capture")] #[yaserde(rename = "capture")]
pub capture: Option<Capture>, pub capture: Option<Capture>,
@ -720,7 +720,7 @@ pub struct Zones {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Zone { pub struct Zone {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: MaybeString, pub uuid: MaybeString,
#[yaserde(rename = "name")] #[yaserde(rename = "name")]
pub name: MaybeString, pub name: MaybeString,
@ -736,7 +736,7 @@ pub struct Templates {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Template { pub struct Template {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: MaybeString, pub uuid: MaybeString,
#[yaserde(rename = "name")] #[yaserde(rename = "name")]
pub name: MaybeString, pub name: MaybeString,
@ -752,7 +752,7 @@ pub struct Jobs {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Job { pub struct Job {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: MaybeString, pub uuid: MaybeString,
#[yaserde(rename = "name")] #[yaserde(rename = "name")]
pub name: MaybeString, pub name: MaybeString,
@ -768,7 +768,7 @@ pub struct Targets {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Target { pub struct Target {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: MaybeString, pub uuid: MaybeString,
#[yaserde(rename = "name")] #[yaserde(rename = "name")]
pub name: MaybeString, pub name: MaybeString,
@ -789,7 +789,7 @@ pub struct Firewall {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct LvTemplate { pub struct LvTemplate {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "templates")] #[yaserde(rename = "templates")]
pub templates: Option<Templates>, pub templates: Option<Templates>,
@ -797,7 +797,7 @@ pub struct LvTemplate {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Category { pub struct Category {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "categories")] #[yaserde(rename = "categories")]
pub categories: Option<Categories>, pub categories: Option<Categories>,
@ -811,7 +811,7 @@ pub struct Categories {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct CategoryItem { pub struct CategoryItem {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
#[yaserde(rename = "name")] #[yaserde(rename = "name")]
pub name: MaybeString, pub name: MaybeString,
@ -823,7 +823,7 @@ pub struct CategoryItem {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Alias { pub struct Alias {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "geoip")] #[yaserde(rename = "geoip")]
pub geoip: Option<GeoIP>, pub geoip: Option<GeoIP>,
@ -845,7 +845,7 @@ pub struct Aliases {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct AliasItem { pub struct AliasItem {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub enabled: String, pub enabled: String,
pub name: String, pub name: String,
@ -862,7 +862,7 @@ pub struct AliasItem {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct OpenVPNExport { pub struct OpenVPNExport {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub servers: Option<Servers>, pub servers: Option<Servers>,
} }
@ -873,7 +873,7 @@ pub struct Servers {}
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
#[yaserde(rename = "proxy")] #[yaserde(rename = "proxy")]
pub struct Proxy { pub struct Proxy {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub general: ConfigGeneral, pub general: ConfigGeneral,
pub forward: Forward, pub forward: Forward,
@ -1069,7 +1069,7 @@ pub struct ErrorPages {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct ConfigSyslog { pub struct ConfigSyslog {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub general: SyslogGeneral, pub general: SyslogGeneral,
pub destinations: MaybeString, pub destinations: MaybeString,
@ -1085,7 +1085,7 @@ pub struct SyslogGeneral {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct UnboundPlus { pub struct UnboundPlus {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub general: UnboundGeneral, pub general: UnboundGeneral,
pub advanced: Advanced, pub advanced: Advanced,
@ -1196,7 +1196,7 @@ pub struct Hosts {
#[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Host { pub struct Host {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub enabled: i8, pub enabled: i8,
pub hostname: String, pub hostname: String,
@ -1233,14 +1233,14 @@ pub struct Wireguard {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct WireguardGeneral { pub struct WireguardGeneral {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub enabled: i32, pub enabled: i32,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct WireguardServer { pub struct WireguardServer {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub servers: WireguardServerList, pub servers: WireguardServerList,
} }
@ -1252,7 +1252,7 @@ pub struct WireguardServerList {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct WireguardServerItem { pub struct WireguardServerItem {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub enabled: i32, pub enabled: i32,
pub name: String, pub name: String,
@ -1273,7 +1273,7 @@ pub struct WireguardServerItem {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct WireguardClient { pub struct WireguardClient {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub clients: WireguardClientList, pub clients: WireguardClientList,
} }
@ -1285,7 +1285,7 @@ pub struct WireguardClientList {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct WireguardClientItem { pub struct WireguardClientItem {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub enabled: i32, pub enabled: i32,
pub name: String, pub name: String,
@ -1299,7 +1299,7 @@ pub struct WireguardClientItem {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Swanctl { pub struct Swanctl {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "Connections")] #[yaserde(rename = "Connections")]
pub connections: MaybeString, pub connections: MaybeString,
@ -1317,7 +1317,7 @@ pub struct Swanctl {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
#[yaserde(rename = "DynDNS")] #[yaserde(rename = "DynDNS")]
pub struct DynDNS { pub struct DynDNS {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub general: DynDNSGeneral, pub general: DynDNSGeneral,
pub accounts: Accounts, pub accounts: Accounts,
@ -1340,7 +1340,7 @@ pub struct Accounts {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Account { pub struct Account {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: String, pub uuid: String,
pub enabled: i32, pub enabled: i32,
pub service: String, pub service: String,
@ -1365,7 +1365,7 @@ pub struct Account {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct ConfigOpenVPN { pub struct ConfigOpenVPN {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "Overwrites")] #[yaserde(rename = "Overwrites")]
pub Overwrites: MaybeString, pub Overwrites: MaybeString,
@ -1377,7 +1377,7 @@ pub struct ConfigOpenVPN {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct StaticRoutes { pub struct StaticRoutes {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "route")] #[yaserde(rename = "route")]
pub route: Option<MaybeString>, pub route: Option<MaybeString>,
@ -1388,7 +1388,7 @@ pub struct Ca {}
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Cert { pub struct Cert {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: Option<String>, pub uuid: Option<String>,
pub refid: String, pub refid: String,
pub descr: String, pub descr: String,
@ -1403,7 +1403,7 @@ pub struct DhcpDv6 {} // Empty struct for <dhcpdv6/>
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct VirtualIp { pub struct VirtualIp {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "vip")] #[yaserde(rename = "vip")]
pub vip: Vip, pub vip: Vip,
@ -1411,7 +1411,7 @@ pub struct VirtualIp {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Vip { pub struct Vip {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub uuid: Option<String>, pub uuid: Option<String>,
pub interface: Option<MaybeString>, pub interface: Option<MaybeString>,
pub mode: Option<MaybeString>, pub mode: Option<MaybeString>,
@ -1478,7 +1478,7 @@ pub struct Dyndns {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Vlans { pub struct Vlans {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub vlan: MaybeString, pub vlan: MaybeString,
} }
@ -1490,21 +1490,21 @@ pub struct Bridges {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Gifs { pub struct Gifs {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: Option<String>, pub version: Option<String>,
pub gif: Option<MaybeString>, pub gif: Option<MaybeString>,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Gres { pub struct Gres {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: Option<String>, pub version: Option<String>,
pub gre: Option<MaybeString>, pub gre: Option<MaybeString>,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Laggs { pub struct Laggs {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
pub lagg: Option<MaybeString>, pub lagg: Option<MaybeString>,
} }
@ -1516,7 +1516,7 @@ pub struct Wireless {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Hasync { pub struct Hasync {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: Option<String>, pub version: Option<String>,
pub synchronizealiases: Option<MaybeString>, pub synchronizealiases: Option<MaybeString>,
pub synchronizeauthservers: Option<MaybeString>, pub synchronizeauthservers: Option<MaybeString>,
@ -1564,6 +1564,6 @@ pub struct Hasync {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Ifgroups { pub struct Ifgroups {
#[yaserde(attribute)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
} }