From 3ed22fd1ae49c7f1aa979697d74c69384a8c05a9 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Thu, 6 Feb 2020 03:20:59 -0500 Subject: [PATCH] Fixes #4093: Add decommissioning for vms --- docs/release-notes/version-2.7.md | 1 + netbox/virtualization/choices.py | 3 +++ netbox/virtualization/models.py | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index 375174757..56b519f6f 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -37,6 +37,7 @@ * [#3313](https://github.com/netbox-community/netbox/issues/3313) - Toggle config context display between JSON and YAML * [#3886](https://github.com/netbox-community/netbox/issues/3886) - Enable assigning config contexts by cluster and cluster group * [#4051](https://github.com/netbox-community/netbox/issues/4051) - Disable the `makemigrations` management command +* [#4093](https://github.com/netbox-community/netbox/issues/4093) - Add decommissioning status for VMs ## Bug Fixes diff --git a/netbox/virtualization/choices.py b/netbox/virtualization/choices.py index 3c4a17c7b..ad8d12554 100644 --- a/netbox/virtualization/choices.py +++ b/netbox/virtualization/choices.py @@ -11,17 +11,20 @@ class VirtualMachineStatusChoices(ChoiceSet): STATUS_ACTIVE = 'active' STATUS_OFFLINE = 'offline' STATUS_STAGED = 'staged' + STATUS_DECOMMISSIONING = 'decommissioning' CHOICES = ( (STATUS_ACTIVE, 'Active'), (STATUS_OFFLINE, 'Offline'), (STATUS_STAGED, 'Staged'), + (STATUS_DECOMMISSIONING, 'Decommissioning'), ) LEGACY_MAP = { STATUS_OFFLINE: 0, STATUS_ACTIVE: 1, STATUS_STAGED: 3, + STATUS_DECOMMISSIONING: 4, } diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index 3ec5ccf8e..99866359a 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -267,9 +267,10 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): ] STATUS_CLASS_MAP = { - 'active': 'success', - 'offline': 'warning', - 'staged': 'primary', + VirtualMachineStatusChoices.STATUS_ACTIVE: 'success', + VirtualMachineStatusChoices.STATUS_OFFLINE: 'warning', + VirtualMachineStatusChoices.STATUS_STAGED: 'primary', + VirtualMachineStatusChoices.STATUS_DECOMMISSIONING: 'warning', } class Meta: