* Added a check to anvil-delete-server to remove the XML definition file.

* Added checks to anvil-provision-server to see if an existing server name is flagged as DELETED, instead of outright rejecting a given server name.

Signed-off-by: Digimer <digimer@alteeve.ca>

tools/test.pl

@@ -26,44 +26,38 @@ $anvil->Get->switches;
 $anvil->Database->connect({debug => 3});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0132"});
 
-my $key_string = 'scan_drbd_message_0007,!!resource_name!srv00-sql1!!,!!resource_state!#!string!scan_drbd_unit_0004!#!!,!!resource_xml!<resource name="srv00-sql1" conf-file-line="/etc/drbd.d/srv00-sql1.res:2">] from key string: [scan_drbd_message_0007,!!resource_name!srv00-sql1!!,!!resource_state!#!string!scan_drbd_unit_0004!#!!,!!resource_xml!<resource name="srv00-sql1" conf-file-line="/etc/drbd.d/srv00-sql1.res:2">
-        <host name="mk-a02n01">
-            <volume vnr="0">
-                <device minor="0">/dev/drbd_srv00-sql1_0</device>
-                <disk>/dev/mk-a02n01_ssd0/srv00-sql1_0</disk>
-                <meta-disk>internal</meta-disk>
-            </volume>
-            <address family="(null)" port="(null)">(null)</address>
-        </host>
-        <host name="mk-a02n02">
-            <volume vnr="0">
-                <device minor="0">/dev/drbd_srv00-sql1_0</device>
-                <disk>/dev/mk-a02n02_ssd0/srv00-sql1_0</disk>
-                <meta-disk>internal</meta-disk>
-            </volume>
-            <address family="(null)" port="(null)">(null)</address>
-        </host>
-        <connection>
-            <host name="mk-a02n01"><address family="ipv4" port="7788">10.101.12.1</address></host>
-            <host name="mk-a02n02"><address family="ipv4" port="7788">10.101.12.2</address></host>
-            <section name="net">
-                <option name="protocol" value="C"/>
-                <option name="fencing" value="resource-and-stonith"/>
-            </section>
-            <section name="disk">
-                <option name="c-max-rate" value="500M"/>
-            </section>
-        </connection>
-    </resource>!!';
-my $out_string = $anvil->Words->parse_banged_string({
+my $key_string = 'message_0190
+job_0185
+job_0186,!!minor!5!!,!!port!7803!!
+job_0188,!!job_uuid!12eeded2-c5bb-4295-8c8e-665bd9c9b83a!!,!!peer_name!mk-a02n01.digimer.ca!!
+job_0189,!!lv_path!/dev/mk-a02n02_ssd0/srv02-lab02_0!!
+job_0218
+job_0190,!!resource!srv02-lab02!!
+job_0191,!!resource!srv02-lab02!!
+job_0192
+job_0195
+job_0203,!!resource!srv02-lab02!!
+job_0199,!!shell_call!/usr/bin/virt-install --connect qemu:///system \
+--name srv02-lab02 \
+ --os-variant win2k19  \
+ --memory 8192 \
+ --events on_poweroff=destroy,on_reboot=restart \
+ --vcpus 6,sockets=1,cores=6 \
+ --cpu host \
+ --network bridge=ifn1_bridge1,model=virtio \
+ --graphics spice \
+ --sound ich9 \
+ --clock offset=localtime \
+ --boot menu=on \
+ --disk path=/dev/drbd/by-res/srv02-lab02/0,target.bus=virtio,driver.io=threads,cache=writeback,driver.discard=unmap,boot.order=1 \
+ --disk path=/mnt/shared/files/Windows_Server_2019_eval.iso,device=cdrom,shareable=on,boot.order=2 \
+ --disk path=/mnt/shared/files/virtio-win-0.1.185.iso,device=cdrom,shareable=on,boot.order=3 --force \
+ --noautoconsole --wait -1 > /var/log/anvil-server_srv02-lab02.log
+!!
+job_0200';
+my ($free_minor, $free_port) = $anvil->Words->parse_banged_string({
 	debug      => 2, 
 	key_string => $key_string, 
 });
 
-print "Got:
-====
-".$out_string."
-====
-";
-
 $anvil->nice_exit({exit_code => 0});