shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

F #1896: Solve getting host id from pool instead of drv_action (#3094)

Browse Source 
* F #1896: Get host id from drv_action on shutdown

Signed-off-by: Sergio Vega <svega@opennebula.systems>

* F #1896: Get host id from drv_action on every supported action

Signed-off-by: Sergio Vega <svega@opennebula.systems>
This commit is contained in:
sergiojvg 2019-03-22 05:37:21 -06:00 committed by Tino Vázquez
parent 63c5bd8875
commit f7af94ea39
7 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vmm_mad/remotes/vcenter/attach_disk
View File

@ -36,10 +36,9 @@ drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
'VMM_DRIVER_ACTION_DATA')
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
vc_cluster_name = drv_action['/VMM_DRIVER_ACTION_DATA/HOST']
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool,
vc_cluster_name)
host_id = host['ID']
begin
vi_client = VCenterDriver::VIClient.new_from_host(host_id)

4
src/vmm_mad/remotes/vcenter/attach_nic
View File

@ -35,9 +35,7 @@ vc_cluster_name = ARGV[-1]
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA')
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool,
vc_cluster_name)
host_id = host['ID']
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
begin
vi_client = VCenterDriver::VIClient.new_from_host(host_id)

5
src/vmm_mad/remotes/vcenter/cancel
View File

@ -36,13 +36,12 @@ vm_id = ARGV[-2]
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA')
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
lcm_state = drv_action['/VMM_DRIVER_ACTION_DATA/VM/LCM_STATE']
check_valid(lcm_state, 'lcm_state')
lcm_state_str = OpenNebula::VirtualMachine::LCM_STATE[lcm_state.to_i]
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool, host)
host_id = host['ID']
begin
vi_client = VCenterDriver::VIClient.new_from_host(host_id)

4
src/vmm_mad/remotes/vcenter/detach_disk
View File

@ -35,9 +35,7 @@ vc_cluster_name = ARGV[-1]
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA')
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool,
vc_cluster_name)
host_id = host['ID']
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
begin
vi_client = VCenterDriver::VIClient.new_from_host(host_id)

4
src/vmm_mad/remotes/vcenter/detach_nic
View File

@ -35,9 +35,7 @@ vc_cluster_name = ARGV[3]
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA')
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool,
vc_cluster_name)
host_id = host['ID']
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
begin
vi_client = VCenterDriver::VIClient.new_from_host(host_id)

5
src/vmm_mad/remotes/vcenter/shutdown
View File

@ -33,14 +33,13 @@ vm_ref = ARGV[0]
vc_cluster_name = ARGV[1]
vm_id = ARGV[2]
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool, vc_cluster_name)
host_id = host['ID']
drv_action_enc = STDIN.read.delete("\n")
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
'VMM_DRIVER_ACTION_DATA')
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
lcm_state = drv_action['/VMM_DRIVER_ACTION_DATA/VM/LCM_STATE']
check_valid(lcm_state, 'lcm_state')
lcm_state_str = OpenNebula::VirtualMachine::LCM_STATE[lcm_state.to_i]

3
src/vmm_mad/remotes/vcenter/snapshot_create
View File

@ -36,8 +36,7 @@ vc_cluster_name = ARGV[3]
drv_action = OpenNebula::XMLElement.new
drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA')
host = VCenterDriver::VIHelper.find_by_name(OpenNebula::HostPool, vc_cluster_name)
host_id = host['ID']
host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID']
snap_name = drv_action["VM/TEMPLATE/SNAPSHOT[ACTIVE='YES']/NAME"]