From: Jiří Filipovič <fila@ics.muni.cz>
Date: Fri, 31 Aug 2012 09:27:28 +0000 (+0000)
Subject: - VM image is optional parameter of VMCreate
X-Git-Tag: glite-lb-client_R_5_2_4_1~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a969c60465dd078a33a1590455b19a40821900c1;p=jra1mw.git

- VM image is optional parameter of VMCreate
- added extra event VMCreate
---

diff --git a/org.glite.lb.state-machine/src/process_event_virtual_machine.c b/org.glite.lb.state-machine/src/process_event_virtual_machine.c
index ab41771..27beb0c 100644
--- a/org.glite.lb.state-machine/src/process_event_virtual_machine.c
+++ b/org.glite.lb.state-machine/src/process_event_virtual_machine.c
@@ -85,6 +85,11 @@ int processEvent_VirtualMachine(intJobStat *js, edg_wll_Event *e, int ev_seq, in
 				//XXX transfer to prolog/boot state?
 			}
 			break;
+		case EDG_WLL_EVENT_VMIMAGE:
+			if (USABLE_DATA(res)) {
+				rep_cond(js->pub.vm_image, e->vMCreate.image);
+			}
+			break;
 		case EDG_WLL_EVENT_VMRUNNING:
 			if (USABLE(res)) {
 				switch( e->vMRunning.vm_source){
diff --git a/org.glite.lb.types/events.T b/org.glite.lb.types/events.T
index b9cc256..67073e4 100644
--- a/org.glite.lb.types/events.T
+++ b/org.glite.lb.types/events.T
@@ -545,17 +545,21 @@
 @flesh VirtualMachine
 
 @type VMCreate			create (register) virtual machine
-	string image            machine image
 	string require          machine requirements
 	string id		machine id
 	string name		machine name
 	string owner		machine owner
 	string hostname         hostname of VM
 	string manager		VM manager
+	string image            machine image
+	_optional_
 
 @type VMHost
 	string hostname		hostname of physical machine of VM
 
+@type VMImage
+	string image		machine image
+
 @type VMRunning			VM is running
 	int 	vm_source
 	_code_  CM		cloud manager