From 9f6abc21b99dfb2d983ed2fa213eedec7d5d8c58 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Wed, 22 Mar 2017 11:23:51 +0100 Subject: [PATCH] F #4913: Add refactored importers code to vcenter routes for Sunstone importing tools --- src/sunstone/routes/vcenter.rb | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/sunstone/routes/vcenter.rb b/src/sunstone/routes/vcenter.rb index 0dbef77d3e..ce9bffcc98 100644 --- a/src/sunstone/routes/vcenter.rb +++ b/src/sunstone/routes/vcenter.rb @@ -89,8 +89,9 @@ end get '/vcenter/templates' do begin - templates = vcenter_client.vm_templates( - $cloud_auth.client(session[:user], session[:active_zone_endpoint])) + dc_folder = VCenterDriver::DatacenterFolder.new(vcenter_client) + templates = dc_folder.get_unimported_templates(vcenter_client) + if templates.nil? msg = "No datacenter found" logger.error("[vCenter] " + msg) @@ -109,8 +110,9 @@ end get '/vcenter/networks' do begin - networks = vcenter_client.vcenter_networks( - $cloud_auth.client(session[:user], session[:active_zone_endpoint])) + dc_folder = VCenterDriver::DatacenterFolder.new(vcenter_client) + networks = dc_folder.get_unimported_networks + if networks.nil? msg = "No datacenter found" logger.error("[vCenter] " + msg) @@ -128,8 +130,14 @@ end get '/vcenter/images/:ds_name' do begin - images = vcenter_client.vcenter_images(params[:ds_name], - $cloud_auth.client(session[:user], session[:active_zone_endpoint])) + one_ds = VCenterDriver::VIHelper.find_by_name(OpenNebula::DatastorePool, + params[:ds_name]) + one_ds_ref = one_ds['TEMPLATE/VCENTER_DS_REF'] + + ds = VCenterDriver::Datastore.new_from_ref(one_ds_ref, vcenter_client) + ds.one_item = one_ds + + images = ds.get_images if images.nil? msg = "No datastore found" @@ -148,8 +156,8 @@ end get '/vcenter/datastores' do begin - datastores = vcenter_client.vcenter_datastores( - $cloud_auth.client(session[:user], session[:active_zone_endpoint])) + dc_folder = VCenterDriver::DatacenterFolder.new(vcenter_client) + datastores = dc_folder.get_unimported_datastores if datastores.nil? msg = "No datacenter found" logger.error("[vCenter] " + msg)