proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-10-05 23:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

subscription: recognize 'Suspended' status

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-10-20 09:41:04 +02:00
parent 208d4ffac6
commit bb7519af3b
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
proxmox-subscription/src/check.rs
View File

@ -55,6 +55,7 @@ fn parse_status(value: &str) -> SubscriptionStatus {
"notfound" => SubscriptionStatus::NotFound, "notfound" => SubscriptionStatus::NotFound,
"invalid" => SubscriptionStatus::Invalid, "invalid" => SubscriptionStatus::Invalid,
"expired" => SubscriptionStatus::Expired, "expired" => SubscriptionStatus::Expired,
"suspended" => SubscriptionStatus::Suspended,
_ => SubscriptionStatus::Invalid, _ => SubscriptionStatus::Invalid,
} }
} }
@ -149,7 +150,7 @@ fn test_parse_register_response() -> Result<(), Error> {
info, info,
SubscriptionInfo { SubscriptionInfo {
key: Some(key), key: Some(key),
serverid: Some(server_id), serverid: Some(server_id.clone()),
status: SubscriptionStatus::Active, status: SubscriptionStatus::Active,
checktime: Some(checktime), checktime: Some(checktime),
url: Some("https://www.proxmox.com/en/proxmox-backup-server/pricing".into()), url: Some("https://www.proxmox.com/en/proxmox-backup-server/pricing".into()),
@ -160,6 +161,49 @@ fn test_parse_register_response() -> Result<(), Error> {
signature: None, signature: None,
} }
); );
let response = r#"
<status>Suspended</status>
<companyname>Test 12345</companyname>
<serviceid>65977</serviceid>
<productid>11</productid>
<productname>Proxmox VE Test Subscription -1 year</productname>
<regdate>2022-09-20 00:00:00</regdate>
<nextduedate>2022-09-20</nextduedate>
<billingcycle>Annually</billingcycle>
<validdomain>proxmox.com,www.proxmox.com</validdomain>
<validdirectory>830000000123456789ABCDEF00000042</validdirectory>
<customfields>Notes=Test Key!</customfields>
<addons></addons>
<md5hash>969f4df84fe157ee4f5a2f71950ad154</md5hash>
"#;
let key = "pvet-123456789a".to_string();
let info = parse_register_response(
response,
key.to_owned(),
server_id.to_owned(),
checktime,
salt,
"https://www.proxmox.com/en/proxmox-ve/pricing".to_string(),
)?;
assert_eq!(
info,
SubscriptionInfo {
key: Some(key),
serverid: Some(server_id),
status: SubscriptionStatus::Suspended,
checktime: Some(checktime),
url: Some("https://www.proxmox.com/en/proxmox-ve/pricing".into()),
message: None,
nextduedate: Some("2022-09-20".into()),
regdate: Some("2022-09-20 00:00:00".into()),
productname: Some("Proxmox VE Test Subscription -1 year".into()),
signature: None,
}
);
Ok(()) Ok(())
} }

4
proxmox-subscription/src/subscription_info.rs
View File

@ -40,6 +40,9 @@ pub enum SubscriptionStatus {
/// subscription set but expired for this server /// subscription set but expired for this server
#[serde(alias = "Expired")] #[serde(alias = "Expired")]
Expired, Expired,
/// subscription got (recently) suspended
#[serde(alias = "Suspended")]
Suspended,
} }
impl Default for SubscriptionStatus { impl Default for SubscriptionStatus {
fn default() -> Self { fn default() -> Self {
@ -54,6 +57,7 @@ impl std::fmt::Display for SubscriptionStatus {
SubscriptionStatus::Active => write!(f, "active"), SubscriptionStatus::Active => write!(f, "active"),
SubscriptionStatus::Invalid => write!(f, "invalid"), SubscriptionStatus::Invalid => write!(f, "invalid"),
SubscriptionStatus::Expired => write!(f, "expired"), SubscriptionStatus::Expired => write!(f, "expired"),
SubscriptionStatus::Suspended => write!(f, "suspended"),
} }
} }
} }