search for: storage_pool_id

...ume_controller.rb index b89513a..fb6bc9c 100644 --- a/src/app/controllers/storage_volume_controller.rb +++ b/src/app/controllers/storage_volume_controller.rb @@ -21,7 +21,11 @@ class StorageVolumeController < ApplicationController include StorageVolumeService def new - svc_new(params[:storage_pool_id], params[:source_volume_id]) + if params[:storage_pool_id] + svc_new(params[:storage_pool_id]) + else + svc_new_lv(params[:source_volume_id]) + end @return_to_workflow = params[:return_to_workflow] || false render :layout => 'popup' end diff --git a/src/ap...

...8 deletions(-) diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index c0a56b8..7de725d 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -608,7 +608,7 @@ class TaskOmatic storage_volume.size = volume.capacity / 1024 storage_volume.storage_pool_id = db_pool.id storage_volume.write_attribute(storage_volume.volume_name, volume.name) - storage_volume.key = volume.key + storage_volume.key = volume.get_attr('key') storage_volume.lv_owner_perms = owner storage_volume.lv_group_perms = group storage_volume.lv_mode_p...

...to find volume #{volume_name} attached to pool #{pool.name}." unless volume @logger.debug "Verified volume of pool #{volume.path}" @@ -591,7 +591,7 @@ class TaskOmatic storage_volume.path = volume.path storage_volume.size = volume.capacity / 1024 storage_volume.storage_pool_id = db_pool.id - storage_volume.write_attribute(storage_volume.volume_name, volume.name) + storage_volume.write_attribute(storage_volume.volume_name, volume.key) storage_volume.lv_owner_perms = owner storage_volume.lv_group_perms = group storage_volume.lv_mode_perms = mode @@ -64...

I've rebased the patch series to the current next branch and am sending them again.

.../storage_controller.rb b/src/app/controllers/storage_controller.rb index dac2a6b..9a91288 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -135,10 +135,10 @@ class StorageController < ApplicationController begin svc_destroy(storage_pool_id) successes << @storage_pool - rescue PermissionError => perm_error - failures[@storage_pool] = perm_error.message + # PermissionError expected rescue Exception => ex - failures[@storage_pool] = ex.message + failures[@storage_pool.nil? ? sto...

...pools = conn.list_defined_storage_pools - all_pools.concat(conn.list_storage_pools) - return all_pools -end - -def get_libvirt_lvm_pool_from_volume(db_volume) - phys_volume = StorageVolume.find(:first, :conditions => - [ "lvm_pool_id = ?", db_volume.storage_pool_id]) - - return LibvirtPool.factory(phys_volume.storage_pool) -end - -class LibvirtPool - def initialize(type, name = nil) - @remote_pool = nil - @build_on_start = true - @remote_pool_defined = false - @remote_pool_started = false - - if name == nil - @name = type + "-"...

...services/hardware_pool_service.rb b/src/app/services/hardware_pool_service.rb index 28040f3..8b53515 100644 --- a/src/app/services/hardware_pool_service.rb +++ b/src/app/services/hardware_pool_service.rb @@ -90,7 +90,6 @@ module HardwarePoolService svc_move_items_internal(pool_id, StoragePool, storage_pool_ids, target_pool_id) end def svc_move_items_internal(pool_id, item_class, resource_ids, target_pool_id) - # from before_filter target_pool = Pool.find(target_pool_id) authorized!(Privilege::MODIFY,target_pool) lookup(pool_id, Privilege::MODIFY) diff --git a/src/app/services/poo...