From 38dc16ee27acbc73ecbc2f0143d4a180f5649b29 Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Thu, 25 Oct 2018 23:27:09 +0100
Subject: [PATCH] affinity groups

---
 lib/helpers/ovirt.rb          | 5 ++---
 lib/helpers/ovirt_affinity.py | 2 +-
 secgen.rb                     | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/helpers/ovirt.rb b/lib/helpers/ovirt.rb
index d195c53d5..30e064683 100644
--- a/lib/helpers/ovirt.rb
+++ b/lib/helpers/ovirt.rb
@@ -184,14 +184,13 @@ class OVirtFunctions
     vnic_profiles_service.list.shuffle.each do |vnic_profile|
 
       if vnic_profile.name =~ /#{network_name}/
-        puts vnic_profile.name
-        puts vnic_profile.network.id
+        Print.info "Found: #{vnic_profile.name} (#{vnic_profile.network.id})"
         network_profile = vnic_profile
         network_network = vnic_profile.network
 
         vnic_profiles_service.list.each do |vnic_snoop_profile|
             if vnic_snoop_profile.name =~ /snoop/ && vnic_snoop_profile.network.id == network_network.id
-              puts vnic_snoop_profile.name
+              Print.info "Found: #{vnic_snoop_profile.name} (#{vnic_snoop_profile.network.id})"
               snoop_profile = vnic_snoop_profile
             end
         end
diff --git a/lib/helpers/ovirt_affinity.py b/lib/helpers/ovirt_affinity.py
index 3a52029c7..60c24238c 100644
--- a/lib/helpers/ovirt_affinity.py
+++ b/lib/helpers/ovirt_affinity.py
@@ -62,8 +62,8 @@ vms = vms_service.list(search='name=' + args.vm_name_search)
 affinitygroups = cluster_affinitygroups_service.list()
 
 for affinitygroup in affinitygroups:
-    print ("Affinity_Group: %s Affinity_Group ID: %s Description: %s Comment: %s"%(affinitygroup.name,affinitygroup.id,affinitygroup.description,affinitygroup.comment))
     if affinitygroup.name == args.affinitygroup:
+        print ("Affinity_Group: %s Affinity_Group ID: %s Description: %s Comment: %s"%(affinitygroup.name,affinitygroup.id,affinitygroup.description,affinitygroup.comment))
         group_service = cluster_affinitygroups_service.group_service(affinitygroup.id)
         group_vms_service = group_service.vms_service()
         for vm in vms:
diff --git a/secgen.rb b/secgen.rb
index 362548979..4f68c7259 100644
--- a/secgen.rb
+++ b/secgen.rb
@@ -188,6 +188,8 @@ def build_vms(project_dir, options)
   end
 end
 
+# actions on the VMs after vagrant has built them
+# this includes networking and snapshots
 def ovirt_post_build(options, scenario, project_dir)
   Print.std 'Taking oVirt post-build actions...'
   if options[:ovirtnetwork]
@@ -200,6 +202,7 @@ def ovirt_post_build(options, scenario, project_dir)
   end
   if options[:snapshot]
     Print.info 'Creating a snapshot of VM(s)'
+    sleep(20) # give oVirt/Virtualbox a chance to save any VM config changes before creating the snapshot
     if OVirtFunctions::provider_ovirt?(options)
       OVirtFunctions::create_snapshot(options, scenario, get_vm_names(scenario))
     else