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/25 12:42:37 UTC
[1/2] git commit: CIMI: added missing require for ipaddr
Updated Branches:
refs/heads/master 858d86f16 -> e75bf156f
CIMI: added missing require for ipaddr
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a9d24bf8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a9d24bf8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a9d24bf8
Branch: refs/heads/master
Commit: a9d24bf898b382ef022b09db7127c21c7972ddf0
Parents: 858d86f
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Thu Apr 25 13:36:56 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Thu Apr 25 20:41:54 2013 +1000
----------------------------------------------------------------------
server/lib/cimi/service/address.rb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a9d24bf8/server/lib/cimi/service/address.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/address.rb b/server/lib/cimi/service/address.rb
index f883c15..295c216 100644
--- a/server/lib/cimi/service/address.rb
+++ b/server/lib/cimi/service/address.rb
@@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+require 'ipaddr'
+
class CIMI::Service::Address < CIMI::Service::Base
def self.find(id, context)
[2/2] git commit: FGCP: added nil check in case a system has
addresses but no machines
Posted by dk...@apache.org.
FGCP: added nil check in case a system has addresses but no machines
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/e75bf156
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/e75bf156
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/e75bf156
Branch: refs/heads/master
Commit: e75bf156f2fb4de22df430d81791781c7bbf0a3a
Parents: a9d24bf
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Thu Apr 25 16:52:33 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Thu Apr 25 20:42:11 2013 +1000
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e75bf156/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 5a299fe..3410495 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -779,7 +779,8 @@ class FgcpDriver < Deltacloud::BaseDriver
# 2. for slbs, obtain all ids from list_efm
if addrs_to_instance.keys.size < associated_ips.keys.size # only if associated ips left to process
- if slbs = client.list_efm(vsys_id, 'SLB')['efms']
+ slbs = client.list_efm(vsys_id, 'SLB')['efms']
+ if slbs and slbs[0] and slbs[0]['efm']
slbs[0]['efm'].find do |slb|
associated_ips.find do |pub,priv|