You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by dk...@apache.org on 2013/04/08 14:05:24 UTC
[1/2] git commit: cimi: fix typo in previous commit: vol.name instead
of volume.name
Updated Branches:
refs/heads/master 678f9e2d2 -> 6e8de4bc6
cimi: fix typo in previous commit: vol.name instead of volume.name
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/5822d2a2
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/5822d2a2
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/5822d2a2
Branch: refs/heads/master
Commit: 5822d2a21d2a266f7b98cad734ec654a202df7aa
Parents: 678f9e2
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Mon Apr 8 22:01:07 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Mon Apr 8 22:04:39 2013 +1000
----------------------------------------------------------------------
server/lib/cimi/service/machine_volume.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5822d2a2/server/lib/cimi/service/machine_volume.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/machine_volume.rb b/server/lib/cimi/service/machine_volume.rb
index 35397df..055dd8a 100644
--- a/server/lib/cimi/service/machine_volume.rb
+++ b/server/lib/cimi/service/machine_volume.rb
@@ -22,7 +22,7 @@ class CIMI::Service::MachineVolume < CIMI::Service::Base
id = context.machine_url(instance_id)+"/volumes/#{vol.id}"
attached << self.new(context, :values => {
:id => id,
- :name => volume.name || vol.id,
+ :name => vol.name || vol.id,
:description => "MachineVolume #{vol.id} for Machine #{instance_id}",
:created => vol.created.nil? ? nil : Time.parse(vol.created).xmlschema,
:initial_location => vol.device,
@@ -37,7 +37,7 @@ class CIMI::Service::MachineVolume < CIMI::Service::Base
raise CIMI::Model::NotFound unless vol.instance_id == instance_id
self.new(context, :values => {
:id => id,
- :name => volume.name || vol.id,
+ :name => vol.name || vol.id,
:description => "MachineVolume #{vol.id} for Machine #{instance_id}",
:created => vol.created.nil? ? nil : Time.parse(vol.created).xmlschema,
:initial_location => vol.device,
[2/2] git commit: CIMI: make destroy_system(credentials,
id) method's signature consistent with destroy_instance's so that
operation works on mock
Posted by dk...@apache.org.
CIMI: make destroy_system(credentials, id) method's signature consistent with
destroy_instance's so that operation works on mock
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/6e8de4bc
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/6e8de4bc
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/6e8de4bc
Branch: refs/heads/master
Commit: 6e8de4bc6a8326c43c6fc7e4775f5a08a9f82f31
Parents: 5822d2a
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Sat Apr 6 03:40:34 2013 +1100
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Mon Apr 8 22:05:07 2013 +1000
----------------------------------------------------------------------
server/lib/cimi/service/system.rb | 2 +-
.../drivers/fgcp/fgcp_driver_cimi_methods.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/6e8de4bc/server/lib/cimi/service/system.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/system.rb b/server/lib/cimi/service/system.rb
index bb28e82..daad428 100644
--- a/server/lib/cimi/service/system.rb
+++ b/server/lib/cimi/service/system.rb
@@ -38,7 +38,7 @@ class CIMI::Service::System < CIMI::Service::Base
end
def self.delete!(id, context)
- context.driver.destroy_system(context.credentials, {:id=>id})
+ context.driver.destroy_system(context.credentials, id)
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/6e8de4bc/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 9735c62..a8d907e 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
@@ -92,8 +92,8 @@ module Deltacloud::Drivers::Fgcp
end
end
- def destroy_system(credentials, opts={})
- delete_firewall(credentials, {:id=>"#{opts[:id]}-S-0001"})
+ def destroy_system(credentials, id)
+ delete_firewall(credentials, :id => "#{id}-S-0001")
end
def start_system(credentials, opts={})