shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-11 04:58:16 +03:00
Code Releases Wiki Activity

B #6340: Fix request create a marketplace app (#2856)

Browse Source
This commit is contained in:
Jorge Miguel Lobo Escalona 2023-12-04 12:18:17 +01:00 committed by GitHub
parent fe545803c9
commit 2b0f530865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sunstone/models/SunstoneServer.rb
View File

@ -152,6 +152,26 @@ class SunstoneServer < CloudServer
end
end
############################################################################
#
############################################################################
def createMarketApp(type, template)
action_hash = JSONUtils.parse_json(template, 'action')
if OpenNebula.is_error?(action_hash)
return [500, image_hash.to_json]
end
marketplaceapp = MarketPlaceAppJSON.new(MarketPlaceApp.build_xml, @client)
rc = case type
when "service" then marketplaceapp.app_service_import(action_hash['params'])
else
marketplaceapp.app_vm_import(action_hash['params']) #VM / VM_TEMPLATE
end
return [201, rc.to_json]
end
############################################################################
#
############################################################################

24
src/sunstone/public/app/opennebula/action.js
View File

@ -464,7 +464,31 @@ define(function(require) {
return ""+id;
},
"importMarketApp": function(params, resource, method, action_obj) {
var callback = params.success;
var callbackError = params.error;
var id = params.data.id;
var action = OpenNebulaHelper.action(method, action_obj);
var request = OpenNebulaHelper.request(resource, method, [id, action_obj]);
var reqPath = resource.toLowerCase();
var cache_name = params.cache_name ? params.cache_name : resource;
$.ajax({
url: reqPath + "/" + id + "/create",
type: "POST",
contentType: "application/json; charset=utf-8",
data: JSON.stringify(action),
success: function(response) {
_clearCache(cache_name);
return callback ? callback(request, response) : null;
},
error: function(response) {
return callbackError ?
callbackError(request, OpenNebulaError(response)) : null;
}
});
},
"getAppTags": function(params, resource){
var callback = params.success;
var callbackError = params.error;

4
src/sunstone/public/app/opennebula/marketplaceapp.js
View File

@ -127,11 +127,11 @@ define(function(require) {
},
"import_vm_template" : function(params){
var action_obj = params.data.extra_param;
OpenNebulaAction.simple_action(params, RESOURCE, "vm-template.import", action_obj);
OpenNebulaAction.importMarketApp(params, RESOURCE, "vm-template.import", action_obj);
},
"import_service_template" : function(params){
var action_obj = params.data.extra_param;
OpenNebulaAction.simple_action(params, RESOURCE, "service_template.import", action_obj);
OpenNebulaAction.importMarketApp(params, RESOURCE, "service_template.import", action_obj);
},
}

6
src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js
View File

@ -436,7 +436,7 @@ define(function(require) {
var newTemplate = $.extend(marketPlaceJSON, { ORIGIN_ID: String(templateId) });
Sunstone.runAction("MarketPlaceApp.import_vm_template", 0, newTemplate);
Sunstone.runAction("MarketPlaceApp.import_vm_template", 'vm', newTemplate);
},
error: function(request, response) {
Sunstone.hideFormPanelLoading(TAB_ID);
@ -460,7 +460,7 @@ define(function(require) {
marketPlaceJSON['IMPORT_ALL'] = marketPlaceJSON['IMPORT_ALL'] === 'on'
marketPlaceJSON['MARKETPLACE_ID'] = marketplaceIdSelected;
Sunstone.runAction("MarketPlaceApp.import_vm_template", 0, marketPlaceJSON);
Sunstone.runAction("MarketPlaceApp.import_vm_template", 'vmtemplate', marketPlaceJSON);
break;
@ -471,7 +471,7 @@ define(function(require) {
marketPlaceJSON['MARKETPLACE_ID'] = marketplaceIdSelected;
marketPlaceJSON['MARKETPLACE_SERVICE_ID'] = this.marketPlacesServiceTable.idInput().val();
Sunstone.runAction("MarketPlaceApp.import_service_template", 0, marketPlaceJSON);
Sunstone.runAction("MarketPlaceApp.import_service_template", 'service', marketPlaceJSON);
break;

1
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/backup.js
View File

@ -135,7 +135,6 @@ define(function(require) {
function _fill(context, templateJSON) {
if(templateJSON && templateJSON.BACKUP_CONFIG){
var configs = templateJSON.BACKUP_CONFIG
console.log("dsadas", configs)
if(configs && configs.BACKUP_VOLATILE && configs.BACKUP_VOLATILE === 'YES'){
$(idsElements.backup_volatile, context).click();
}

7
src/sunstone/sunstone-server.rb
View File

@ -1191,6 +1191,13 @@ get '/marketplaceapp/:id/tags' do
@SunstoneServer.get_docker_tags(params[:id])
end
##############################################################################
# Create a marketPlacetApp
##############################################################################
post '/marketplaceapp/:type/create' do
@SunstoneServer.createMarketApp(params[:type], @request_body)
end
##############################################################################
# Create a new Resource
##############################################################################