Revision d42f3d33

View differences:

include/PoolObjectSQL.h
276 276
    }
277 277

  
278 278
    /**
279
     *  Replace template for this object
279
     *  Replace template for this object. Object should be updated
280
     *  after calling this method
280 281
     *    @param tmpl string representation of the template
281 282
     */
282 283
    int replace_template(const string& tmpl_str, string& error);
src/rm/RequestManager.cc
24 24
#include "RequestManagerDelete.h"
25 25
#include "RequestManagerPublish.h"
26 26
#include "RequestManagerAllocate.h"
27
#include "RequestManagerUpdateTemplate.h"
27 28

  
28 29
#include "RequestManagerVirtualNetwork.h"
29 30
#include "RequestManagerVirtualMachine.h"
......
237 238
    xmlrpc_c::methodPtr vn_addleases(new VirtualNetworkAddLeases());
238 239
    xmlrpc_c::methodPtr vn_rmleases(new VirtualNetworkRemoveLeases());
239 240

  
241
    // Update Template Methods
242
    xmlrpc_c::methodPtr image_update(new ImageUpdateTemplate());
243
    xmlrpc_c::methodPtr template_update(new TemplateUpdateTemplate());
244
    xmlrpc_c::methodPtr host_update(new HostUpdateTemplate());
245

  
240 246
    // Allocate Methods
241 247
    xmlrpc_c::methodPtr vm_allocate(new VirtualMachineAllocate());
242 248
    xmlrpc_c::methodPtr image_allocate(new ImageAllocate());
......
290 296
        RequestManager::GenericChown(this,VM));
291 297

  
292 298

  
293
    xmlrpc_c::methodPtr template_update(new
294
        RequestManager::TemplateUpdate(tpool, upool));
295

  
296
    xmlrpc_c::methodPtr template_rm_attribute(new
297
        RequestManager::TemplateRemoveAttribute(tpool, upool));
298

  
299 299
    xmlrpc_c::methodPtr template_chown(new
300 300
        RequestManager::GenericChown(this,TEMPLATE));
301 301

  
302
        
303
        
304 302

  
305 303
    xmlrpc_c::methodPtr host_enable(new 
306 304
        RequestManager::HostEnable(hpool,upool));
307 305

  
308 306

  
309

  
310

  
311 307
    xmlrpc_c::methodPtr cluster_add(new 
312 308
        RequestManager::ClusterAdd(hpool,upool,cpool));
313 309

  
......
315 311
        RequestManager::ClusterRemove(hpool,upool,cpool));
316 312

  
317 313

  
318

  
319

  
320
        
321
        
322

  
323

  
324

  
325 314
    xmlrpc_c::methodPtr vn_chown(new
326 315
        RequestManager::GenericChown(this,NET));
327 316

  
328 317

  
329

  
330

  
331 318
    xmlrpc_c::methodPtr user_change_password(new
332 319
        RequestManager::UserChangePassword(upool));
333 320

  
334 321
    xmlrpc_c::methodPtr user_chown(new
335 322
        RequestManager::GenericChown(this,USER));
336 323
        
337
        
338
        
339
        
340
    xmlrpc_c::methodPtr image_update(new    
341
        RequestManager::ImageUpdate(ipool, upool));
342
    
343
    xmlrpc_c::methodPtr image_rm_attribute(new    
344
        RequestManager::ImageRemoveAttribute(ipool, upool));
345
        
346 324
    xmlrpc_c::methodPtr image_persistent(new    
347 325
        RequestManager::ImagePersistent(ipool, upool));
348 326
        
......
368 346

  
369 347
    /* VM Template related methods*/
370 348
/*
371
    RequestManagerRegistry.addMethod("one.template.update", template_update);
372
    RequestManagerRegistry.addMethod("one.template.rmattr", template_rm_attribute);
373 349
    RequestManagerRegistry.addMethod("one.template.chown", template_chown);
374 350
*/
351

  
352
    RequestManagerRegistry.addMethod("one.template.update", template_update);
375 353
    RequestManagerRegistry.addMethod("one.template.instantiate",template_instantiate);
376 354
    RequestManagerRegistry.addMethod("one.template.allocate",template_allocate);
377 355
    RequestManagerRegistry.addMethod("one.template.publish", template_publish);
......
384 362
/*     
385 363
    RequestManagerRegistry.addMethod("one.host.enable", host_enable);
386 364
*/    
365
    RequestManagerRegistry.addMethod("one.host.update", host_update);
387 366
    RequestManagerRegistry.addMethod("one.host.allocate", host_allocate);   
388 367
    RequestManagerRegistry.addMethod("one.host.delete", host_delete);
389 368
    RequestManagerRegistry.addMethod("one.host.info", host_info);
......
435 414
    
436 415
    /* Image related methods*/
437 416
/*    
438
    RequestManagerRegistry.addMethod("one.image.update", image_update);     
439
    RequestManagerRegistry.addMethod("one.image.rmattr", image_rm_attribute);
440 417
    RequestManagerRegistry.addMethod("one.image.persistent", image_persistent);
441 418
    RequestManagerRegistry.addMethod("one.image.enable", image_enable);    
442 419
    RequestManagerRegistry.addMethod("one.image.chown", image_chown);
443 420

  
444 421
*/  
422
    RequestManagerRegistry.addMethod("one.image.update", image_update);     
445 423
    RequestManagerRegistry.addMethod("one.image.allocate", image_allocate);
446 424
    RequestManagerRegistry.addMethod("one.image.publish", image_publish);
447 425
    RequestManagerRegistry.addMethod("one.image.delete", image_delete);
src/rm/SConstruct
33 33
    'RequestManagerVirtualNetwork.cc',
34 34
    'RequestManagerVirtualMachine.cc',
35 35
    'RequestManagerVMTemplate.cc',
36
    'RequestManagerUpdateTemplate.cc',
36 37

  
37 38
#    'RequestManagerAction.cc',
38 39
#    'RequestManagerAllocate.cc',

Also available in: Unified diff