mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
F #4913: vi_client gets credentials from datastore, VCENTER_ONE_HOST_ID is no longer used
This commit is contained in:
1 parent
b2d9f347dd
commit
7b801cddbc
5 files changed
+25
-15
No files matched your search
@@ -36,13 +36,13 @@ drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA')
|
||||
|
||||
target_ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"]
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
##host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one"
|
||||
src_path = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/PATH"]
|
||||
src_img_id = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/CLONING_ID"]
|
||||
|
||||
check_valid src_img_id, "cloning id"
|
||||
check_valid host_id, "vcenter cluster"
|
||||
##check_valid host_id, "vcenter cluster"
|
||||
check_valid src_path, "image path"
|
||||
check_valid target_ds_ref, "target ds ref"
|
||||
|
||||
@@ -56,8 +56,9 @@ source_ds_ref = source_ds['TEMPLATE/VCENTER_DS_REF']
|
||||
target_path = "#{ds_image_dir}/#{id}/one-#{id}.vmdk"
|
||||
|
||||
begin
|
||||
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
##vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
|
||||
vi_client = VCenterDriver::VIClient.new_from_datastore(source_ds_id)
|
||||
|
||||
ds = VCenterDriver::Datastore.new_from_ref(source_ds_ref, vi_client)
|
||||
|
||||
|
||||
@@ -39,8 +39,9 @@ id = ARGV[1]
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA')
|
||||
|
||||
ds_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/ID"]
|
||||
ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"]
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
##host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one"
|
||||
img_id = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/ID"]
|
||||
adapter_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/VCENTER_ADAPTER_TYPE"] ||
|
||||
@@ -51,7 +52,7 @@ size = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/SIZE"]
|
||||
fs_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE"]
|
||||
|
||||
check_valid img_id, "img_id"
|
||||
check_valid host_id, "vcenter_cluster"
|
||||
##check_valid host_id, "vcenter_cluster"
|
||||
check_valid adapter_type, "adapter_type"
|
||||
check_valid disk_type, "disk_type"
|
||||
check_valid size, "size"
|
||||
@@ -67,7 +68,8 @@ if fs_type == "save_as"
|
||||
end
|
||||
|
||||
begin
|
||||
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
##vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
vi_client = VCenterDriver::VIClient.new_from_datastore(ds_id)
|
||||
|
||||
ds = VCenterDriver::Datastore.new_from_ref(ds_ref, vi_client)
|
||||
|
||||
|
||||
@@ -39,17 +39,20 @@ id = ARGV[1]
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA')
|
||||
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
##host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/ID"]
|
||||
ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"]
|
||||
check_valid ds_ref, "ds_ref"
|
||||
|
||||
if host_id.nil? || ds_ref.nil?
|
||||
##if host_id.nil? || ds_ref.nil?
|
||||
if ds_id.nil? || ds_ref.nil?
|
||||
STDERR.puts "Not enough information to monitor the image."
|
||||
exit -1
|
||||
end
|
||||
|
||||
begin
|
||||
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
##vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
vi_client = VCenterDriver::VIClient.new_from_datastore(ds_id)
|
||||
|
||||
storage = VCenterDriver::Storage.new_from_ref(ds_ref, vi_client)
|
||||
puts storage.monitor
|
||||
|
||||
@@ -40,12 +40,13 @@ drv_action =OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA')
|
||||
|
||||
ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"]
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/ID"]
|
||||
##host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
img_src = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/SOURCE"]
|
||||
imported = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/VCENTER_IMPORTED"]
|
||||
|
||||
check_valid ds_ref, "ds_ref"
|
||||
check_valid host_id, "vcenter_cluster"
|
||||
##check_valid host_id, "vcenter_cluster"
|
||||
check_valid img_src, "img_src"
|
||||
|
||||
CDROM = "1"
|
||||
@@ -53,7 +54,8 @@ CDROM = "1"
|
||||
begin
|
||||
#TODO should imported disks be deleted?
|
||||
if imported.nil? || imported.empty?
|
||||
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
##vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
vi_client = VCenterDriver::VIClient.new_from_datastore(ds_id)
|
||||
|
||||
ds = VCenterDriver::Datastore.new_from_ref(ds_ref, vi_client)
|
||||
|
||||
|
||||
@@ -40,16 +40,18 @@ drv_action =OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA')
|
||||
|
||||
ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"]
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/ID"]
|
||||
#host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
img_path = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/PATH"]
|
||||
|
||||
check_valid ds_ref, "ds_ref"
|
||||
check_valid host_id, "vcenter_cluster"
|
||||
#check_valid host_id, "vcenter_cluster"
|
||||
check_valid img_path, "img_path"
|
||||
|
||||
if img_path.start_with? "vcenter://"
|
||||
begin
|
||||
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
##vi_client = VCenterDriver::VIClient.new_from_host(host_id)
|
||||
vi_client = VCenterDriver::VIClient.new_from_datastore(ds_id)
|
||||
|
||||
ds = VCenterDriver::Datastore.new_from_ref(ds_ref, vi_client)
|
||||
|
||||
|
||||
Reference in new issue
Block a user