diff --git a/lib/fog/vcloudng/compute.rb b/lib/fog/vcloudng/compute.rb index d858af07e..eff81e434 100644 --- a/lib/fog/vcloudng/compute.rb +++ b/lib/fog/vcloudng/compute.rb @@ -34,7 +34,8 @@ module Fog end class Real - + attr_reader :end_point + include Fog::Vcloudng::Shared::Real include Fog::Vcloudng::Shared::Parser @@ -48,6 +49,7 @@ module Fog @port = options[:port] || Fog::Vcloudng::Compute::Defaults::PORT @scheme = options[:scheme] || Fog::Vcloudng::Compute::Defaults::SCHEME @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @end_point = "#{@scheme}://#{@host}:#{@port}#{@path}/" end def default_vdc_id diff --git a/lib/fog/vcloudng/requests/compute/get_catalog_item.rb b/lib/fog/vcloudng/requests/compute/get_catalog_item.rb index 6bf5e8e06..ee10edf56 100644 --- a/lib/fog/vcloudng/requests/compute/get_catalog_item.rb +++ b/lib/fog/vcloudng/requests/compute/get_catalog_item.rb @@ -31,16 +31,20 @@ module Fog # catalog = vcloud.get_catalog(catalog_uuid) # catalog_item_uuid = catalog.body["CatalogItems"].first["href"].split('/').last # get the first one # - def get_catalog_item(catalog_item_uuid) + def get_catalog_item(catalog_item_id) request( :expects => 200, :headers => { 'Accept' => 'application/*+xml;version=1.5' }, :method => 'GET', :parser => Fog::Parsers::Vcloudng::Compute::GetCatalogItem.new, - :path => "catalogItem/#{catalog_item_uuid}" + :path => "catalogItem/#{catalog_item_id}" ) end - + + def catalog_item_end_point(catalog_item_id = nil) + end_point + ( catalog_item_id ? "catalogItem/#{catalog_item_id}" : "catalogItem" ) + end + end end end diff --git a/lib/fog/vcloudng/requests/compute/get_vdc.rb b/lib/fog/vcloudng/requests/compute/get_vdc.rb index d3fa3b55b..eb4599f21 100644 --- a/lib/fog/vcloudng/requests/compute/get_vdc.rb +++ b/lib/fog/vcloudng/requests/compute/get_vdc.rb @@ -38,6 +38,10 @@ module Fog :path => "vdc/#{vdc_id}" ) end + + def vdc_end_point(vdc_id = nil) + end_point + ( vdc_id ? "vdc/#{vdc_id}" : "vdc" ) + end end