From ca56fc709a7a7ada213e9e20947825411174c625 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Thu, 6 Feb 2020 03:20:59 -0500 Subject: [PATCH 1/3] 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: From bc7f5fb33a8c22dcca7ecc00abd724bd81b4cdc8 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Tue, 11 Feb 2020 00:26:09 -0500 Subject: [PATCH 2/3] Modify offline status color for vm --- docs/release-notes/version-2.7.md | 2 +- netbox/virtualization/choices.py | 1 - netbox/virtualization/models.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index 56b519f6f..89cb15a4f 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -9,6 +9,7 @@ * [#4113](https://github.com/netbox-community/netbox/issues/4113) - Add bulk edit functionality for device type components * [#4116](https://github.com/netbox-community/netbox/issues/4116) - Enable bulk edit and delete functions for device component list views * [#4129](https://github.com/netbox-community/netbox/issues/4129) - Add buttons to delete individual device type components +* [#4093](https://github.com/netbox-community/netbox/issues/4093) - Add decommissioning status for VMs ## Bug Fixes @@ -37,7 +38,6 @@ * [#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 ad8d12554..85eeda369 100644 --- a/netbox/virtualization/choices.py +++ b/netbox/virtualization/choices.py @@ -24,7 +24,6 @@ class VirtualMachineStatusChoices(ChoiceSet): 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 99866359a..9508cd1f8 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -268,7 +268,7 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): STATUS_CLASS_MAP = { VirtualMachineStatusChoices.STATUS_ACTIVE: 'success', - VirtualMachineStatusChoices.STATUS_OFFLINE: 'warning', + VirtualMachineStatusChoices.STATUS_OFFLINE: 'danger', VirtualMachineStatusChoices.STATUS_STAGED: 'primary', VirtualMachineStatusChoices.STATUS_DECOMMISSIONING: 'warning', } From 335343642b0e24b561a74412e6ac4bccffcd9228 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Wed, 12 Feb 2020 22:43:40 -0500 Subject: [PATCH 3/3] additional status choices for vms --- docs/release-notes/version-2.7.md | 2 +- netbox/virtualization/choices.py | 8 ++++++-- netbox/virtualization/models.py | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index 89cb15a4f..3e2bf8f1b 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -5,11 +5,11 @@ * [#3766](https://github.com/netbox-community/netbox/issues/3766) - Allow custom script authors to specify the form widget for each variable * [#3799](https://github.com/netbox-community/netbox/issues/3799) - Greatly improve performance when ordering device components * [#3986](https://github.com/netbox-community/netbox/issues/3986) - Include position numbers in SVG image when rendering rack elevation +* [#4093](https://github.com/netbox-community/netbox/issues/4093) - Add multiple status choices for VMs * [#4100](https://github.com/netbox-community/netbox/issues/4100) - Add device filter to component list views * [#4113](https://github.com/netbox-community/netbox/issues/4113) - Add bulk edit functionality for device type components * [#4116](https://github.com/netbox-community/netbox/issues/4116) - Enable bulk edit and delete functions for device component list views * [#4129](https://github.com/netbox-community/netbox/issues/4129) - Add buttons to delete individual device type components -* [#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 85eeda369..1dae88e1d 100644 --- a/netbox/virtualization/choices.py +++ b/netbox/virtualization/choices.py @@ -8,15 +8,19 @@ from utilities.choices import ChoiceSet class VirtualMachineStatusChoices(ChoiceSet): - STATUS_ACTIVE = 'active' STATUS_OFFLINE = 'offline' + STATUS_ACTIVE = 'active' + STATUS_PLANNED = 'planned' STATUS_STAGED = 'staged' + STATUS_FAILED = 'failed' STATUS_DECOMMISSIONING = 'decommissioning' CHOICES = ( - (STATUS_ACTIVE, 'Active'), (STATUS_OFFLINE, 'Offline'), + (STATUS_ACTIVE, 'Active'), + (STATUS_PLANNED, 'Planned'), (STATUS_STAGED, 'Staged'), + (STATUS_FAILED, 'Failed'), (STATUS_DECOMMISSIONING, 'Decommissioning'), ) diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index 9508cd1f8..13b181137 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -267,9 +267,11 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): ] STATUS_CLASS_MAP = { + VirtualMachineStatusChoices.STATUS_OFFLINE: 'warning', VirtualMachineStatusChoices.STATUS_ACTIVE: 'success', - VirtualMachineStatusChoices.STATUS_OFFLINE: 'danger', + VirtualMachineStatusChoices.STATUS_PLANNED: 'info', VirtualMachineStatusChoices.STATUS_STAGED: 'primary', + VirtualMachineStatusChoices.STATUS_FAILED: 'danger', VirtualMachineStatusChoices.STATUS_DECOMMISSIONING: 'warning', }