allow for destroyed vms to be displayed in ui. VNM cleanup destroyed status files after 48h

salt/soc/dyanno/hypervisor/hypervisor.yaml

@@ -4,6 +4,8 @@ hypervisor:
       title: defaultHost
       description: "Hypervisor Configuration"
       syntax: json
+      file: true
+      global: true
       uiElements:
       - field: hostname
         label: "Hostname"
@@ -62,21 +64,16 @@ hypervisor:
         forcedType: int
       - field: disk
         label: "Disk(s) for passthrough. Line-delimited list. Free: FREE | Total: TOTAL"
-        required: true
         readonly: true
         forcedType: '[]int'
         multiline: true
       - field: copper
         label: "Copper port(s) for passthrough. Line-delimited list. Free: FREE | Total: TOTAL"
-        required: true
         readonly: true
         forcedType: '[]int'
         multiline: true
       - field: sfp
         label: "SFP port(s) for passthrough. Line-delimited list. Free: FREE | Total: TOTAL"
-        required: true
         readonly: true
         forcedType: '[]int'
         multiline: true
-      file: true
-      global: true

salt/soc/dyanno/hypervisor/map.jinja

@@ -1 +1,14 @@
 {% set HYPERVISORS = salt['pillar.get']('hypervisor:nodes', {}) %}
+
+{# Define the list of process steps in order (case-sensitive) #}
+{% set PROCESS_STEPS = [
+    'Processing',
+    'IP Configuration',
+    'Starting Create',
+    'Executing Deploy Script',
+    'Initialize Minion Pillars',
+    'Created Instance',
+    'Hardware Configuration',
+    'Highstate Triggered',
+    'Destroyed Instance'
+] %}

salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja

@@ -13,6 +13,7 @@
 
 {%- import_yaml 'soc/dyanno/hypervisor/hypervisor.yaml' as ANNOTATION -%}
 {%- from 'hypervisor/map.jinja' import HYPERVISORS -%}
+{%- from 'soc/dyanno/hypervisor/map.jinja' import PROCESS_STEPS -%}
 
 {%- set TEMPLATE = ANNOTATION.hypervisor.hosts.pop('defaultHost') -%}
 
@@ -20,23 +21,53 @@
 # Hypervisor Configuration: {{ description }}
 
 ## Resource Summary
-| Resource    | Available | Total     |
-|-------------|-----------|-----------|
-| CPU Cores   | {{ cpu_free }}        | {{ cpu_total }}       |
-| Memory (GB) | {{ mem_free }}        | {{ mem_total }}       |
-| Disk        | {{ disk_free | replace('\n', ',') if disk_free else 'None' }}     | {{ disk_total | replace('\n', ',') }}   |
-| Copper      | {{ copper_free | replace('\n', ',') if copper_free else 'None' }} | {{ copper_total | replace('\n', ',') }} |
-| SFP         | {{ sfp_free | replace('\n', ',') if sfp_free else 'None' }}       | {{ sfp_total | replace('\n', ',') }}    |
+|           | CPU Cores | Memory (GB) | Disk        | Copper      | SFP         |
+|-----------|-----------|-------------|-------------|-------------|-------------|
+| Available | {{ cpu_free }}      | {{ mem_free }}        | {{ disk_free | replace('\n', ',') if disk_free else 'None' }} | {{ copper_free | replace('\n', ',') if copper_free else 'None' }} | {{ sfp_free | replace('\n', ',') if sfp_free else 'None' }} |
+| Total     | {{ cpu_total }}      | {{ mem_total }}        | {{ disk_total | replace('\n', ',') }} | {{ copper_total | replace('\n', ',') }} | {{ sfp_total | replace('\n', ',') }} |
 
 {%- if vm_list %}
 ## Virtual Machines
+VMs can have the following status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. The "Last Updated" timestamp shows when the VM status was last changed. After reaching "Highstate Triggered" status, additional highstate runs will not update the timestamp. Only changing to "Destroyed Instance" status will update the timestamp again.
+
 | Name               | Status             | CPU Cores | Memory (GB)| Disk | Copper | SFP  | Last Updated        |
 |--------------------|--------------------|-----------|------------|------|--------|------|---------------------|
 {%- for hostname, vm_data in vm_list.items() %}
-| {{ hostname }}_{{ vm_data.get('config', {}).get('role', 'unknown') }} | {{ vm_data.get('status', {}).get('status', 'Unknown') }} | {{ vm_data.get('config', {}).get('cpu', 'N/A') }} | {{ vm_data.get('config', {}).get('memory', 'N/A') }} | {{ vm_data.get('config', {}).get('disk', '-') | replace('\n', ',') if vm_data.get('config', {}).get('disk') else '-' }} | {{ vm_data.get('config', {}).get('copper', '-') | replace('\n', ',') if vm_data.get('config', {}).get('copper') else '-' }} | {{ vm_data.get('config', {}).get('sfp', '-') | replace('\n', ',') if vm_data.get('config', {}).get('sfp') else '-' }} | {{ vm_data.get('status', {}).get('timestamp', 'Never') | replace('T', ' ') | regex_replace('\\.[0-9]+', '') }} |
+{%- set vm_status = vm_data.get('status', {}).get('status', 'Unknown') %}
+{%- set is_destroyed = vm_status == 'Destroyed Instance' %}
+{%- set vm_role = vm_data.get('config', {}).get('role', 'unknown') %}
+{%- set name = hostname ~ (('_' ~ vm_role) if not is_destroyed and vm_role != 'unknown' else '') %}
+| {{ name }} | {{ vm_status }} |
+{%- if is_destroyed -%}
+-
+{%- else -%}
+{{ vm_data.get('config', {}).get('cpu', 'N/A') }}
+{%- endif %} |
+{%- if is_destroyed -%}
+-
+{%- else -%}
+{{ vm_data.get('config', {}).get('memory', 'N/A') }}
+{%- endif %} |
+{%- if is_destroyed -%}
+-
+{%- else -%}
+{{ vm_data.get('config', {}).get('disk', '-') | replace('\n', ',') if vm_data.get('config', {}).get('disk') else '-' }}
+{%- endif %} |
+{%- if is_destroyed -%}
+-
+{%- else -%}
+{{ vm_data.get('config', {}).get('copper', '-') | replace('\n', ',') if vm_data.get('config', {}).get('copper') else '-' }}
+{%- endif %} |
+{%- if is_destroyed -%}
+-
+{%- else -%}
+{{ vm_data.get('config', {}).get('sfp', '-') | replace('\n', ',') if vm_data.get('config', {}).get('sfp') else '-' }}
+{%- endif %} | {{ vm_data.get('status', {}).get('timestamp', 'Never') | replace('T', ' ') | regex_replace('\\.[0-9]+', '') }} |
 {%- endfor %}
 {%- else %}
 ## Virtual Machines
+VMs can have the following status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. The "Last Updated" timestamp shows when the VM status was last changed. After reaching "Highstate Triggered" status, additional highstate runs will not update the timestamp. Only changing to "Destroyed Instance" status will update the timestamp again.
+
 No Virtual Machines Found
 {%- endif %}
 {%- endmacro -%}
@@ -66,9 +97,12 @@ No Virtual Machines Found
 {%-     set used_memory = 0 -%}
 {%-     set ns = namespace(used_cpu=0, used_memory=0) -%}
 {%-     for hostname, vm_data in vms.items() -%}
-{%-       set vm_config = vm_data.config -%}
-{%-       set ns.used_cpu = ns.used_cpu + vm_config.cpu | int -%}
-{%-       set ns.used_memory = ns.used_memory + vm_config.memory | int -%}
+{%-       set vm_status = vm_data.get('status', {}).get('status', '') -%}
+{%-       if vm_status != 'Destroyed Instance' -%}
+{%-         set vm_config = vm_data.config -%}
+{%-         set ns.used_cpu = ns.used_cpu + vm_config.get('cpu', 0) | int -%}
+{%-         set ns.used_memory = ns.used_memory + vm_config.get('memory', 0) | int -%}
+{%-       endif -%}
 {%-     endfor -%}
 
 {# Calculate available resources #}
@@ -80,10 +114,13 @@ No Virtual Machines Found
 {%-     set used_copper = [] -%}
 {%-     set used_sfp = [] -%}
 {%-     for hostname, vm in vms.items() -%}
-{%-       set config = vm.get('config', {}) -%}
-{%-       do used_disk.extend((config.get('disk', '') | string).split('\n') | map('trim') | list) -%}
-{%-       do used_copper.extend((config.get('copper', '') | string).split('\n') | map('trim') | list) -%}
-{%-       do used_sfp.extend((config.get('sfp', '') | string).split('\n') | map('trim') | list) -%}
+{%-       set vm_status = vm.get('status', {}).get('status', '') -%}
+{%-       if vm_status != 'Destroyed Instance' -%}
+{%-         set config = vm.get('config', {}) -%}
+{%-         do used_disk.extend((config.get('disk', '') | string).split('\n') | map('trim') | list) -%}
+{%-         do used_copper.extend((config.get('copper', '') | string).split('\n') | map('trim') | list) -%}
+{%-         do used_sfp.extend((config.get('sfp', '') | string).split('\n') | map('trim') | list) -%}
+{%-       endif -%}
 {%-     endfor -%}
 
 {# Get available PCI indices #}

salt/soc/dyanno/hypervisor/write_status.sls

@@ -11,6 +11,9 @@
 
 {% if 'hvn' in salt['pillar.get']('features', []) %}
 
+{# Import the process steps from map.jinja #}
+{% from 'soc/dyanno/hypervisor/map.jinja' import PROCESS_STEPS %}
+
 {% do salt.log.info('soc/dyanno/hypervisor/write_status: Running') %}
 {% set vm_name = pillar.get('vm_name') %}
 {% set hypervisor = pillar.get('hypervisor') %}
@@ -21,19 +24,7 @@
 {% set status_dir = base_path ~ '/' ~ hypervisor %}
 {% set status_file = status_dir ~ '/' ~ vm_name ~ '.status' %}
 
-# Define the list of process steps in order (case-sensitive)
-{% set process_steps = [
-    'Processing',
-    'IP Configuration',
-    'Starting Create',
-    'Executing Deploy Script',
-    'Initialize Minion Pillars',
-    'Created Instance',
-    'Hardware Configuration',
-    'Highstate Triggered',
-    'Destroyed Instance'
-] %}
-{% set new_index = process_steps.index(status_data.get('status')) %}
+{% set new_index = PROCESS_STEPS.index(status_data.get('status')) %}
 {% do salt.log.debug('soc/dyanno/hypervisor/write_status: new_index: ' ~ new_index|string) %}
 
 # Function to read and parse current JSON status file
@@ -46,8 +37,8 @@
 {%   import_json rel_path_status_file as current_status %}
 {%   do salt.log.debug('soc/dyanno/hypervisor/write_status: current status: ' ~ current_status) %}
 {%   do salt.log.debug('soc/dyanno/hypervisor/write_status: current status: ' ~ current_status.get('status')) %}
-{%   if current_status.get('status') in process_steps %}
-{%     set current_index = process_steps.index(current_status.get('status')) %}
+{%   if current_status.get('status') in PROCESS_STEPS %}
+{%     set current_index = PROCESS_STEPS.index(current_status.get('status')) %}
 {%     do salt.log.debug('soc/dyanno/hypervisor/write_status: current_index: ' ~ current_index|string) %}
 {%-    set return_value = current_index -%}
 {%   else %}
@@ -74,7 +65,7 @@ ensure_status_dir:
 {# Some of the status updates trigger within a second of each other can can cause, for example, IP Configuration orchestration to process before the Processing #}
 {# This check has been put in place to ensure a status sooner in the process can't overwrite this file if a status later in the process wrote to it first. #}
 {# The final step is Destroyed, so we allow Processing to overwrite that incase someone creates a new VM with same name that was previously destroyed. #}
-{% if new_index > current_index or (current_index == process_steps | length - 1 and new_index == 0) %}
+{% if new_index > current_index or (current_index == PROCESS_STEPS | length - 1 and new_index == 0) %}
 write_status_file:
   file.serialize:
     - name: {{ status_file }}
@@ -88,7 +79,7 @@ write_status_file:
       - file: ensure_status_dir
 {% else %}
 
-{%   do salt.log.debug('soc/dyanno/hypervisor/write_status: File not written. ' ~ process_steps[new_index] ~ ' cannot overwrite ' ~ process_steps[current_index] ~ '.' ) %}
+{%   do salt.log.debug('soc/dyanno/hypervisor/write_status: File not written. ' ~ PROCESS_STEPS[new_index] ~ ' cannot overwrite ' ~ PROCESS_STEPS[current_index] ~ '.' ) %}
 
 {% endif %}