From 6fd81e866802b042e6228260b56e3794953db5f2 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 14 Oct 2014 15:21:13 +0200 Subject: [PATCH] Fix upload error in SunstoneServer --- src/sunstone/models/OpenNebulaJSON/JSONUtils.rb | 6 +++++- src/sunstone/models/SunstoneServer.rb | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb index 32d6b7dd22..167cffa321 100644 --- a/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb +++ b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb @@ -27,7 +27,7 @@ module OpenNebulaJSON end end - def parse_json(json_str, root_element) + def self.parse_json(json_str, root_element) begin hash = JSON.parse(json_str) rescue Exception => e @@ -41,6 +41,10 @@ module OpenNebulaJSON end end + def parse_json(json_str, root_element) + JSONUtils.parse_json(json_str, root_element) + end + def parse_json_sym(json_str, root_element) begin parser = JSON.parser.new(json_str, {:symbolize_names => true}) diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 463fedba4f..1f484704d9 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -136,14 +136,14 @@ class SunstoneServer < CloudServer # ############################################################################ def upload(template, file_path) - image_hash = parse_json(template, 'image') + image_hash = JSONUtils.parse_json(template, 'image') if OpenNebula.is_error?(image_hash) return [500, image_hash.to_json] end image_hash['PATH'] = file_path - ds_id = parse_json(template, 'ds_id') + ds_id = JSONUtils.parse_json(template, 'ds_id') if OpenNebula.is_error?(ds_id) return [500, ds_id.to_json] end