From 40574aae1736afb07cd0b260d218619e1354cfe7 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 16 Nov 2015 18:50:41 +0100 Subject: [PATCH] Feature #4152: Use SoftLAyer VM FQDN for import name (cherry picked from commit d6c206c9cb05749d97a457ca47f0c0319a00926c) --- src/cli/onehost | 2 +- src/vmm_mad/remotes/sl/sl_driver.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/onehost b/src/cli/onehost index 1c886e1be4..a1013d5c26 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -244,7 +244,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Import VM to OpenNebula EOT - command :importvm, importvm_desc, :hostid, :name do + command :importvm, importvm_desc, :hostid, :import_id do helper.perform_action(args[0], options, "imported") do |o| rc = o.info next rc if OpenNebula.is_error?(rc) diff --git a/src/vmm_mad/remotes/sl/sl_driver.rb b/src/vmm_mad/remotes/sl/sl_driver.rb index dcbb31f91b..9b1cac1ed0 100644 --- a/src/vmm_mad/remotes/sl/sl_driver.rb +++ b/src/vmm_mad/remotes/sl/sl_driver.rb @@ -584,7 +584,7 @@ private mem = mem.to_i / 1024 # Memory for templates expressed in MB cpu = cpu.to_f / 100 # CPU expressed in units - str = "NAME = \"Instance from #{i['id']}\"\n"\ + str = "NAME = \"#{i['fullyQualifiedDomainName']}\"\n"\ "CPU = \"#{cpu}\"\n"\ "vCPU = \"#{cpu.ceil}\"\n"\ "MEMORY = \"#{mem}\"\n"\