diff --git a/lib/vcloud-rest/connection.rb b/lib/vcloud-rest/connection.rb index fa1b725..c09d360 100644 --- a/lib/vcloud-rest/connection.rb +++ b/lib/vcloud-rest/connection.rb @@ -142,6 +142,7 @@ def send_request(params, payload=nil, content_type=nil) handled_request(req_params) do request = RestClient::Request.new(req_params) + @logger.debug "Request #{request.inspect}" response = request.execute if ![200, 201, 202, 204].include?(response.code) diff --git a/lib/vcloud-rest/vcloud/vapp.rb b/lib/vcloud-rest/vcloud/vapp.rb index 2d204f5..55dad91 100644 --- a/lib/vcloud-rest/vcloud/vapp.rb +++ b/lib/vcloud-rest/vcloud/vapp.rb @@ -204,7 +204,7 @@ def poweron_vapp(vAppId) # - vapp_name: name of the target vapp # - vapp_description: description of the target vapp # - vapp_templateid: ID of the vapp template - def create_vapp_from_template(vdc, vapp_name, vapp_description, vapp_templateid, poweron=false) + def create_vapp_from_template(vdc, vapp_name, vapp_description, vapp_templateid, poweron=false,network_config={}) builder = Nokogiri::XML::Builder.new do |xml| xml.InstantiateVAppTemplateParams( "xmlns" => "http://www.vmware.com/vcloud/v1.5", @@ -214,6 +214,21 @@ def create_vapp_from_template(vdc, vapp_name, vapp_description, vapp_templateid, "deploy" => "true", "powerOn" => poweron) { xml.Description vapp_description + if network_config[:name] + xml.InstantiationParams do + xml.NetworkConfigSection do + xml['ovf'].Info 'Configuration parameters for logical networks' + xml.NetworkConfig('networkName' => network_config[:name]) do + if network_config[:parent_network] + xml.Configuration do + xml.ParentNetwork('href' => "#{@api_url}/network/#{network_config[:parent_network]}") + xml.FenceMode network_config[:fence_mode] + end + end + end + end + end + end xml.Source("href" => "#{@api_url}/vAppTemplate/#{vapp_templateid}") } end diff --git a/lib/vcloud-rest/version.rb b/lib/vcloud-rest/version.rb index 37d045e..721065c 100644 --- a/lib/vcloud-rest/version.rb +++ b/lib/vcloud-rest/version.rb @@ -1,3 +1,3 @@ module VCloudClient - VERSION = "1.4.0" + VERSION = "1.5" end