Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9FE4F800 for ; Fri, 5 Apr 2013 22:05:53 +0000 (UTC) Received: (qmail 37049 invoked by uid 500); 5 Apr 2013 22:05:53 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 37028 invoked by uid 500); 5 Apr 2013 22:05:53 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 37021 invoked by uid 99); 5 Apr 2013 22:05:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2013 22:05:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D6371EDDC; Fri, 5 Apr 2013 22:05:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkoper@apache.org To: commits@deltacloud.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: FGCP: use url_for helpers for Rabbit subcollections Date: Fri, 5 Apr 2013 22:05:53 +0000 (UTC) Updated Branches: refs/heads/master d387f0c25 -> 0c7f632f1 FGCP: use url_for helpers for Rabbit subcollections Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/0c7f632f Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/0c7f632f Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/0c7f632f Branch: refs/heads/master Commit: 0c7f632f17db7947662fc82eac798cb000ed1004 Parents: d387f0c Author: Dies Koper Authored: Fri Apr 5 14:30:11 2013 +1100 Committer: Dies Koper Committed: Sat Apr 6 09:05:40 2013 +1100 ---------------------------------------------------------------------- .../drivers/fgcp/fgcp_driver_cimi_methods.rb | 20 +++++++------- 1 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0c7f632f/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb index 1bde935..d0ae1ea 100644 --- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb @@ -40,10 +40,10 @@ module Deltacloud::Drivers::Fgcp :id => vsys_id, :name => vsys['vsysName'][0], :description => vsys_description_el ? vsys_description_el[0] : nil, - :machines => { :href => context.system_url("#{vsys_id}/machines") }, - :volumes => { :href => context.system_url("#{vsys_id}/volumes") }, - :networks => { :href => context.system_url("#{vsys_id}/networks") }, - :addresses => { :href => context.system_url("#{vsys_id}/addresses") }, + :machines => { :href => context.system_machines_url(vsys_id) }, + :volumes => { :href => context.system_volumes_url(vsys_id) }, + :networks => { :href => context.system_networks_url(vsys_id) }, + :addresses => { :href => context.system_addresses_url(vsys_id) }, :operations => [] ) end @@ -143,7 +143,7 @@ module Deltacloud::Drivers::Fgcp machines = xml[0]['vserver'].collect do |vserver| vserver_id = vserver['vserverId'][0] CIMI::Model::SystemMachine.new( - :id => context.system_url("#{vsys_id}/machines/#{vserver_id}"), + :id => context.system_machine_url(:id => vsys_id, :ent_id => vserver_id), :name => vserver['vserverName'][0], :machine => { :href => context.machine_url(vserver_id)} ) unless opts[:id] and opts[:id] != vserver_id @@ -164,7 +164,7 @@ module Deltacloud::Drivers::Fgcp volumes = xml[0]['vdisk'].collect do |vdisk| vdisk_id = vdisk['vdiskId'][0] CIMI::Model::SystemVolume.new( - :id => context.system_url("#{vsys_id}/volumes/#{vdisk_id}"), + :id => context.system_volume_url(:id => vsys_id, :ent_id => vdisk_id), :name => vdisk['vdiskName'][0], :volume => { :href => context.volume_url(vdisk_id)} ) unless opts[:id] and opts[:id] != vdisk_id @@ -186,7 +186,7 @@ module Deltacloud::Drivers::Fgcp network_id = vnet['networkId'][0] network_id =~ /.*-(\w)$/ CIMI::Model::SystemNetwork.new( - :id => context.system_url("#{vsys_id}/networks/#{network_id}"), + :id => context.system_network_url(:id => vsys_id, :ent_id => network_id), :name => "#{$1} for system #{vsys['vsysName'][0]}", :network => { :href => context.network_url(network_id)} ) unless opts[:id] and opts[:id] != network_id @@ -208,7 +208,7 @@ module Deltacloud::Drivers::Fgcp addresses = xml[0]['publicip'].collect do |ip| address = ip['address'][0] CIMI::Model::SystemAddress.new( - :id => context.system_url("#{vsys_id}/addresses/#{address}"), + :id => context.system_address_url(:id => vsys_id, :ent_id => address), :name => "Public IP address allocated to system #{ip['vsysId'][0]}", :address => { :href => context.address_url(address)} ) unless opts[:id] and opts[:id] != address @@ -225,10 +225,10 @@ module Deltacloud::Drivers::Fgcp #if :expand not specified, list of hrefs only, else ?? vsys = client.get_vsys_configuration(vsys_id)['vsys'][0] - group_id = "#{vsys_id}-N" + group_id = "#{vsys_id}-INTRA" groups = [] groups << CIMI::Model::SystemForwardingGroup.new( - :id => context.system_url("#{vsys_id}/forwarding_groups/#{group_id}"), + :id => context.system_forwarding_group_url(:id => vsys_id, :ent_id => group_id), :name => "Routing group of system #{vsys['vsysName'][0]}", :forwarding_group => { :href => context.forwarding_group_url(group_id)} ) unless vsys['vnets'][0]['vnet'].size <= 1 or (opts[:id] and opts[:id] != group_id)