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/23 22:24:33 UTC
[1/2] git commit: FGCP: don't escape template id passed in by client
Updated Branches:
refs/heads/master 5dae95019 -> 9917b22a6
FGCP: don't escape template id passed in by client
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/8b777940
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/8b777940
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/8b777940
Branch: refs/heads/master
Commit: 8b77794003d54e89b959f3bc2cdfdf9c267847b6
Parents: 5dae950
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Tue Apr 23 16:07:09 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Wed Apr 24 06:24:07 2013 +1000
----------------------------------------------------------------------
.../drivers/fgcp/fgcp_driver_cimi_methods.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/8b777940/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 e93c9a4..0d21acb 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
@@ -297,7 +297,7 @@ module Deltacloud::Drivers::Fgcp
:component_descriptors => components.compact
)
end
- templates = templates.select { |t| context.system_template_url(CGI.escape(opts[:id])) == t[:id] } if opts[:id]
+ templates = templates.select { |t| context.system_template_url(opts[:id]) == t[:id] } if opts[:id]
templates
end
end
[2/2] git commit: FGCP: return easier to understand error when
creating system with already used name
Posted by dk...@apache.org.
FGCP: return easier to understand error when creating system with already used name
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/9917b22a
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/9917b22a
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/9917b22a
Branch: refs/heads/master
Commit: 9917b22a6fc9f11036d6ed46831e63f1479a5b2b
Parents: 8b77794
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Tue Apr 23 16:09:11 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Wed Apr 24 06:24:17 2013 +1000
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/9917b22a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index 9ca65c6..5a299fe 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -1536,6 +1536,11 @@ eofwopxml
status 409 # Conflict
end
+ # trying to create a system with a name that's already taken
+ on /SYSTEM_NAME_ALREADY_EXISTS/ do
+ status 409 # Conflict
+ end
+
# reached maximum number of attempts while polling for an update
on /Server did not include public IP address in FW NAT rules/ do
status 504 # Gateway Timeout