diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index 7f17a17ae2..12dc37e3d0 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -56,6 +56,9 @@ module OpenNebulaJSON when "restart" then self.restart when "reset" then self.reset when "saveas" then self.save_as(action_hash['params']) + when "snapshot_create" then self.snapshot_create(action_hash['params']) + when "snapshot_revert" then self.snapshot_revert(action_hash['params']) + when "snapshot_delete" then self.snapshot_delete(action_hash['params']) when "shutdown" then self.shutdown when "reboot" then self.reboot when "poweroff" then self.poweroff @@ -96,6 +99,18 @@ module OpenNebulaJSON super(params['disk_id'].to_i, params['image_name'], params['type'], params['hot']) end + def snapshot_create(params=Hash.new) + super(params['snapshot_name']) + end + + def snapshot_revert(params=Hash.new) + super(params['snapshot_id'].to_i) + end + + def snapshot_delete(params=Hash.new) + super(params['snapshot_id'].to_i) + end + def chown(params=Hash.new) super(params['owner_id'].to_i,params['group_id'].to_i) end diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index f2540dfd46..9df0b0c224 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -6772,7 +6772,7 @@ a.footer.button { /* line 769, ../sass/app.scss */ .vm_log_error { - color: #c0392b; + color: #ff8d81; } /* line 773, ../sass/app.scss */ diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 208d4037a0..9b3d5dcb18 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -696,6 +696,21 @@ var OpenNebula = { OpenNebula.Action.simple_action(params,OpenNebula.VM.resource, "saveas",action_obj); }, + "snapshot_create": function(params){ + var action_obj = params.data.extra_param; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource, + "snapshot_create",action_obj); + }, + "snapshot_revert": function(params){ + var action_obj = params.data.extra_param; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource, + "snapshot_revert",action_obj); + }, + "snapshot_delete": function(params){ + var action_obj = params.data.extra_param; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource, + "snapshot_delete",action_obj); + }, "vnc" : function(params,startstop){ var callback = params.success; var callback_error = params.error; diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 31c0551ed1..996fa27060 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -221,6 +221,15 @@ var vm_actions = { }, error: onError }, + "VM.showsnapshots" : { + type: "single", + call: OpenNebula.VM.show, + callback: function(request, vm){ + updateVMachineElement(request, vm); + updateVMSnapshotsInfo(request, vm); + }, + error: onError + }, "VM.refresh" : { type: "custom", call : function (){ @@ -363,6 +372,34 @@ var vm_actions = { notify: true }, + "VM.snapshot_create" : { + type: "single", + call: OpenNebula.VM.snapshot_create, + callback: function(request) { + Sunstone.runAction("VM.showsnapshots", request.request.data[0]); + }, + error:onError, + notify: true + }, + "VM.snapshot_revert" : { + type: "single", + call: OpenNebula.VM.snapshot_revert, + callback: function(request) { + Sunstone.runAction("VM.showsnapshots", request.request.data[0]); + }, + error:onError, + notify: true + }, + "VM.snapshot_delete" : { + type: "single", + call: OpenNebula.VM.snapshot_delete, + callback: function(request) { + Sunstone.runAction("VM.showsnapshots", request.request.data[0]); + }, + error:onError, + notify: true + }, + "VM.shutdown" : { type: "multiple", call: OpenNebula.VM.shutdown, @@ -1244,8 +1281,13 @@ function updateVMInfo(request,vm){ content: printCapacity(vm_info) }; + var snapshot_tab = { + title: tr("Snapshots"), + content: printSnapshots(vm_info) + }; + var template_tab = { - title: tr("VM Template"), + title: tr("Template"), content: '
| '+tr("VM template")+' |
|---|