\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js
index 8351928cfa..7cb4a0d19b 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js
@@ -24,6 +24,9 @@ define(function(require) {
var Sunstone = require('sunstone');
var Locale = require('utils/locale');
var VCenterNetworks = require('utils/vcenter/networks');
+ var HostsTable = require('tabs/hosts-tab/datatable');
+ var UniqueId = require('utils/unique-id');
+ var Notifier = require('utils/notifier');
/*
TEMPLATES
@@ -55,6 +58,15 @@ define(function(require) {
this.vCenterNetworks = new VCenterNetworks();
+ var options = {
+ 'select': true,
+ 'selectOptions': {
+ 'multiple_choice': false,
+ "filter_fn": function(host) { return host.VM_MAD === "vcenter" && host.IM_MAD === "vcenter"; }
+ }
+ };
+ this.hostsTable = new HostsTable('HostsTable' + UniqueId.id(), options);
+
BaseFormPanel.call(this);
}
@@ -75,38 +87,36 @@ define(function(require) {
function _htmlWizard() {
return TemplateHTML({
'formPanelId': this.formPanelId,
+ 'vCenterHostsHTML': this.hostsTable.dataTableHTML,
'vCenterNetworksHTML': this.vCenterNetworks.html()
});
}
function _setup(context) {
var that = this;
+ this.hostsTable.initialize();
+ this.hostsTable.refreshResourceTableSelect();
- $("form.vcenter_credentials", context)
- .off('forminvalid.zf.abide').off('formvalid.zf.abide').off("submit");
-
- Foundation.reInit($("form.vcenter_credentials", context));
-
- $("form.vcenter_credentials", context)
- .on('forminvalid.zf.abide', function(ev, frm) {
- })
- .on('formvalid.zf.abide', function(ev, frm) {
- Sunstone.enableFormPanelSubmit(TAB_ID);
-
- var vcenter_user = $("#vcenter_user", context).val();
- var vcenter_password = $("#vcenter_password", context).val();
- var vcenter_host = $("#vcenter_host", context).val();
-
+ $(context).off("click", "#get-vcenter-networks");
+ $(context).on("click", "#get-vcenter-networks", function(){
+ var selectedHost = that.hostsTable.retrieveResourceTableSelect();
+ if (selectedHost !== ""){
that.vCenterNetworks.insert({
container: context,
- vcenter_user: vcenter_user,
- vcenter_password: vcenter_password,
- vcenter_host: vcenter_host
+ selectedHost: selectedHost
});
- })
- .on("submit", function(ev) {
- ev.preventDefault();
- });
+ $("#import_vcenter_networks", this.parentElement).prop("disabled", false);
+ }
+ else {
+ Notifier.notifyMessage("You need select a vCenter host first");
+ }
+ });
+
+ $(context).off("click", "#import_vcenter_networks");
+ $(context).on("click", "#import_vcenter_networks", function(){
+ that.vCenterNetworks.import(context);
+ return false;
+ });
return false;
}
@@ -122,5 +132,6 @@ define(function(require) {
}
function _onShow(context) {
+ $("#vnets-tab .submit_button").hide();
}
});
diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs
index fbbefa98c6..8d681682d9 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs
@@ -15,30 +15,14 @@
{{! -------------------------------------------------------------------------- }}
-
-
+
+ {{{vCenterHostsHTML}}}
+
+
+
+
+
+
{{{vCenterNetworksHTML}}}
diff --git a/src/sunstone/public/app/utils/vcenter/clusters.js b/src/sunstone/public/app/utils/vcenter/clusters.js
index 9e5bd7adbb..181377bda7 100644
--- a/src/sunstone/public/app/utils/vcenter/clusters.js
+++ b/src/sunstone/public/app/utils/vcenter/clusters.js
@@ -89,11 +89,11 @@ define(function(require) {
content = FieldsetTableHTML({
tableId : tableId,
title : datacenter_name + ' ' + Locale.tr("DataCenter"),
- clearImported : Locale.tr("Clear Imported DataCenters"),
toggleAdvanced : false,
columns : [
'
',
Locale.tr("Cluster"),
+ Locale.tr("vCenter ref"),
Locale.tr("Location"),
""
]
@@ -105,15 +105,15 @@ define(function(require) {
$.each(elements, function(id, cluster) {
var cluster_name = cluster.simple_name;
var cluster_location = cluster.cluster_location;
- var cluster_hash = cluster.cluster_hash;
+ var cluster_ref = cluster.cluster_ref;
var rp_list = '
';
- var opts = { name: cluster_name, location: cluster_location, hash: cluster_hash };
+ var opts = { name: cluster_name, location: cluster_location, cluster_ref: cluster_ref };
var trow = $(RowTemplate(opts)).appendTo(tbody);
$(".check_item", trow).data("cluster", cluster);
@@ -131,8 +131,8 @@ define(function(require) {
//"ordering": false,
"aoColumnDefs": [
{"sWidth": "35px", "aTargets": [0]},
- {"bSortable": false, "aTargets": [0,2]},
- {"bSortable": true, "aTargets": [1]},
+ {"bSortable": false, "aTargets": [0,3,4]},
+ {"bSortable": true, "aTargets": [1,2]},
],
}
});
diff --git a/src/sunstone/public/app/utils/vcenter/clusters/row.hbs b/src/sunstone/public/app/utils/vcenter/clusters/row.hbs
index a85cc9ee4e..a85d20c70b 100644
--- a/src/sunstone/public/app/utils/vcenter/clusters/row.hbs
+++ b/src/sunstone/public/app/utils/vcenter/clusters/row.hbs
@@ -19,6 +19,7 @@
{{name}} |
+
{{cluster_ref}} |
{{location}} |
diff --git a/src/sunstone/public/app/utils/vcenter/datastores.js b/src/sunstone/public/app/utils/vcenter/datastores.js
index 9589305d26..1bf79f3850 100644
--- a/src/sunstone/public/app/utils/vcenter/datastores.js
+++ b/src/sunstone/public/app/utils/vcenter/datastores.js
@@ -23,7 +23,6 @@ define(function(require) {
var Notifier = require("utils/notifier");
var UniqueId = require("utils/unique-id");
var VCenterCommon = require("./vcenter-common");
- var Sunstone = require("sunstone");
var TemplateHTML = require("hbs!./common/html");
var RowTemplate = require("hbs!./datastores/row");
@@ -69,9 +68,12 @@ define(function(require) {
success: function(response){
$(".vcenter_datacenter_list", context).html("");
- if (response.length === 0){
+ var vcenter_name = Object.keys(response)[0];
+ response = response[vcenter_name];
+
+ if (Object.keys(response).length === 0){
content = EmptyFieldsetHTML({
- title : Locale.tr("vCenter Datastores"),
+ title : Locale.tr("vCenter Datastores") + ": " + vcenter_name,
message : Locale.tr("No new datastores found")
});
$(".vcenter_datacenter_list", context).append(content);
@@ -80,7 +82,7 @@ define(function(require) {
else {
var tableId = "vcenter_import_table" + UniqueId.id();
content = FieldsetTableHTML({
- title: Locale.tr("vCenter Datastores"),
+ title: Locale.tr("vCenter Datastores") + ": " + vcenter_name,
tableId : tableId,
toggleAdvanced : false,
columns : [
@@ -117,12 +119,13 @@ define(function(require) {
"bAutoWidth": false,
"bSortClasses" : false,
"bDeferRender": false,
- "ordering": false,
"aoColumnDefs": [
- { "sWidth": "35px", "aTargets": [0] },
+ {"sWidth": "35px", "aTargets": [0]},
+ {"bSortable": false, "aTargets": [6,7]},
+ {"bSortable": true, "aTargets": [1,2,3]},
+ {"sType": "num", "aTargets": [4,5]}
],
- },
- "customTrListener": function(tableObj, tr){ return false; }
+ }
});
elementsTable.initialize();
diff --git a/src/sunstone/public/app/utils/vcenter/images.js b/src/sunstone/public/app/utils/vcenter/images.js
index 807b5a88ba..6b9b784dee 100644
--- a/src/sunstone/public/app/utils/vcenter/images.js
+++ b/src/sunstone/public/app/utils/vcenter/images.js
@@ -16,28 +16,31 @@
define(function(require) {
// Dependencies
- var Locale = require('utils/locale');
- var OpenNebulaImage = require('opennebula/image');
- var OpenNebulaError = require('opennebula/error');
- var DomDataTable = require('utils/dom-datatable');
- var Notifier = require('utils/notifier');
- var UniqueId = require('utils/unique-id');
- var Humanize = require('utils/humanize');
- var VCenterCommon = require('./vcenter-common');
+ var Locale = require("utils/locale");
+ var OpenNebulaImage = require("opennebula/image");
+ var OpenNebulaError = require("opennebula/error");
+ var DomDataTable = require("utils/dom-datatable");
+ var Notifier = require("utils/notifier");
+ var UniqueId = require("utils/unique-id");
+ var Humanize = require("utils/humanize");
+ var VCenterCommon = require("./vcenter-common");
- var TemplateHTML = require('hbs!./common/html');
- var RowTemplate = require('hbs!./images/row');
- var EmptyFieldsetHTML = require('hbs!./common/empty-fieldset');
- var FieldsetTableHTML = require('hbs!./common/fieldset-table');
+ var TemplateHTML = require("hbs!./common/html");
+ var RowTemplate = require("hbs!./images/row");
+ var EmptyFieldsetHTML = require("hbs!./common/empty-fieldset");
+ var FieldsetTableHTML = require("hbs!./common/fieldset-table");
+
+ var path = "/vcenter/images";
+ var resource = "Image";
function VCenterImages() {
return this;
}
VCenterImages.prototype = {
- 'html': VCenterCommon.html,
- 'insert': _fillVCenterImages,
- 'import': _import
+ "html": VCenterCommon.html,
+ "insert": _fillVCenterImages,
+ "import": _import
};
VCenterImages.prototype.constructor = VCenterImages;
@@ -48,17 +51,13 @@ define(function(require) {
the container with them
opts = {
- datacenter: "Datacenter Name",
- cluster: "Cluster Name",
- container: Jquery div to inject the html,
- vcenter_user: vCenter Username,
- vcenter_password: vCenter Password,
- vcenter_host: vCenter Host,
- vcenter_datastore: vCenter datastore
+ container: JQuery div to inject the html,
+ selectedHost: Host selected for vCenter credentials
+ selectedHost: Datastore selected
}
*/
function _fillVCenterImages(opts) {
- var path = '/vcenter/images/' + opts.vcenter_datastore;
+ this.opts = opts;
var context = $(".vcenter_import", opts.container);
context.html(TemplateHTML({}));
@@ -67,33 +66,31 @@ define(function(require) {
$.ajax({
url: path,
type: "GET",
- data: {timeout: false},
+ data: { host: opts.selectedHost, ds: opts.selectedDs, timeout: false},
dataType: "json",
- headers: {
- "X-VCENTER-USER": opts.vcenter_user,
- "X-VCENTER-PASSWORD": opts.vcenter_password,
- "X-VCENTER-HOST": opts.vcenter_host
- },
success: function(response) {
$(".vcenter_datacenter_list", context).html("");
- var content;
- if (response.length == 0) {
- content = EmptyFieldsetHTML({
- title : opts.vcenter_datastore + ' ' + Locale.tr("Datastore"),
- message : Locale.tr("No new images found in this datastore")
- });
+ var vcenter_name = Object.keys(response)[0];
+ response = response[vcenter_name];
+
+ if (Object.keys(response).length === 0){
+ content = EmptyFieldsetHTML({
+ title : Locale.tr("vCenter Images") + ": " + vcenter_name,
+ message : Locale.tr("No new images found")
+ });
$(".vcenter_datacenter_list", context).append(content);
- } else {
+ }
+
+ else {
var tableId = "vcenter_import_table_" + UniqueId.id();
content = FieldsetTableHTML({
tableId : tableId,
- title : opts.vcenter_datastore + ' ' + Locale.tr("Datastore"),
- clearImported : Locale.tr("Clear Imported Images"),
+ title : Locale.tr("vCenter Images") + ": " + vcenter_name,
toggleAdvanced : false,
columns : [
- '',
- Locale.tr("Path"),
+ "",
+ Locale.tr("Image Path"),
Locale.tr("Size"),
Locale.tr("Type"),
""
@@ -101,14 +98,12 @@ define(function(require) {
});
var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
- var tbody = $('#' + tableId + ' tbody', context);
+ var tbody = $("#" + tableId + " tbody", context);
- $.each(response, function(id, element) {
+ $.each(response, function(image_name, element) {
var opts = { name: element.path, size: element.size, type: element.type };
var trow = $(RowTemplate(opts)).appendTo(tbody);
-
- $(".check_item", trow).data("datastore_id", element.dsid);
- $(".check_item", trow).data("one_template", element.one);
+ $(".check_item", trow).data("import_data", element);
});
var elementsTable = new DomDataTable(
@@ -120,18 +115,18 @@ define(function(require) {
"bAutoWidth": false,
"bSortClasses" : false,
"bDeferRender": false,
- //"ordering": false,
"aoColumnDefs": [
- {"bSortable": false, "aTargets": [0,2,3]},
- {"bSortable": true, "aTargets": [1]},
+ {"bSortable": false, "aTargets": [0,3,4]},
+ {"bSortable": true, "aTargets": [1,2]},
{"sWidth": "35px", "aTargets": [0]},
+ {"sType": "file-size", "aTargets": [2]}
]
}
});
elementsTable.initialize();
- $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Images", response.length));
+ $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Images", Object.keys(response).length));
VCenterCommon.setupTable({
context : newdiv,
@@ -139,11 +134,11 @@ define(function(require) {
selected: Locale.tr("%1$s Images selected.")
});
- context.off('click', '.clear_imported');
- context.on('click', '.clear_imported', function() {
+ context.off("click", ".clear_imported");
+ context.on("click", ".clear_imported", function() {
_fillVCenterImages(opts);
return false;
- });
+ });
}
},
error: function(response) {
@@ -154,43 +149,36 @@ define(function(require) {
}
function _import(context) {
- $.each($("table.vcenter_import_table", context), function() {
- $.each($(this).DataTable().$(".check_item:checked"), function() {
- var row_context = $(this).closest("tr");
+ var vcenter_refs = [];
- VCenterCommon.importLoading({context : row_context});
+ var table = $("table.vcenter_import_table", context);
+ $.each(table.DataTable().$(".check_item:checked"), function(){
+ vcenter_refs.push($(this).data("import_data").ref);
+ var row_context = $(this).closest("tr");
+ VCenterCommon.importLoading({context : row_context});
+ });
+ vcenter_refs = vcenter_refs.join(",");
- var image_json = {
- "image": {
- "image_raw": $(this).data("one_template")
- },
- "ds_id" : $(this).data("datastore_id")
- };
+ if (vcenter_refs.length === 0){
+ Notifier.notifyMessage("You must select at least one image");
+ return false;
+ }
- OpenNebulaImage.create({
- timeout: true,
- data: image_json,
- success: function(request, response) {
- VCenterCommon.importSuccess({
- context : row_context,
- message : Locale.tr("Image created successfully. ID: %1$s", response.IMAGE.ID)
- });
- },
- error: function (request, error_json) {
- var error_message_str = error_json.error.message
+ $.ajax({
+ url: path,
+ type: "POST",
+ data: { images: vcenter_refs, timeout: false },
+ dataType: "json",
+ success: function(response){
+ VCenterCommon.jGrowlSuccess({success : response.success, resource : resource, link_tab : "images-tab"});
+ VCenterCommon.jGrowlFailure({error : response.error, resource : resource});
- if(error_message_str=="[ImageAllocate] Not enough space in datastore"){
- error_message_str = error_message_str + ". "+
- Locale.tr("Please disable DATASTORE_CAPACITY_CHECK in /etc/one/oned.conf and restart OpenNebula");
- }
-
- VCenterCommon.importFailure({
- context : row_context,
- message : (error_message_str || Locale.tr("Cannot contact server: is it running and reachable?"))
- });
- }
- });
- });
+ $("#get-vcenter-images").click();
+ },
+ error: function (request, error_json) {
+ Notifier.notifyError(request.responseJSON.error.message);
+ $("#get-vcenter-images").click();
+ }
});
}
});
diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js
index 0041b982d8..bf7d35aaec 100644
--- a/src/sunstone/public/app/utils/vcenter/networks.js
+++ b/src/sunstone/public/app/utils/vcenter/networks.js
@@ -16,28 +16,32 @@
define(function(require) {
// Dependencies
- var Locale = require('utils/locale');
- var OpenNebulaNetwork = require('opennebula/network');
- var OpenNebulaError = require('opennebula/error');
- var DomDataTable = require('utils/dom-datatable');
- var Notifier = require('utils/notifier');
- var UniqueId = require('utils/unique-id');
- var VCenterCommon = require('./vcenter-common');
- var Sunstone = require('sunstone');
+ var Locale = require("utils/locale");
+ var OpenNebulaNetwork = require("opennebula/network");
+ var OpenNebulaError = require("opennebula/error");
+ var DomDataTable = require("utils/dom-datatable");
+ var Notifier = require("utils/notifier");
+ var UniqueId = require("utils/unique-id");
+ var VCenterCommon = require("./vcenter-common");
+ var Sunstone = require("sunstone");
+ var Tips = require("utils/tips");
- var TemplateHTML = require('hbs!./common/html');
- var RowTemplate = require('hbs!./networks/row');
- var EmptyFieldsetHTML = require('hbs!./common/empty-fieldset');
- var FieldsetTableHTML = require('hbs!./common/fieldset-table');
+ var TemplateHTML = require("hbs!./common/html");
+ var RowTemplate = require("hbs!./networks/row");
+ var EmptyFieldsetHTML = require("hbs!./common/empty-fieldset");
+ var FieldsetTableHTML = require("hbs!./common/fieldset-table");
+
+ var path = "/vcenter/networks";
+ var resource = "Networks";
function VCenterNetworks() {
return this;
}
VCenterNetworks.prototype = {
- 'html': VCenterCommon.html,
- 'insert': _fillVCenterNetworks,
- 'import': _import
+ "html": VCenterCommon.html,
+ "insert": _fillVCenterNetworks,
+ "import": _import
};
VCenterNetworks.prototype.constructor = VCenterNetworks;
@@ -47,16 +51,12 @@ define(function(require) {
Retrieve the list of networks from vCenter and fill the container with them
opts = {
- datacenter: "Datacenter Name",
- cluster: "Cluster Name",
container: Jquery div to inject the html,
- vcenter_user: vCenter Username,
- vcenter_password: vCenter Password,
- vcenter_host: vCenter Host
+ selectedHost: Host selected for vCenter credentials
}
*/
function _fillVCenterNetworks(opts) {
- var path = '/vcenter/networks';
+ this.opts = opts;
var context = $(".vcenter_import", opts.container);
context.html(TemplateHTML());
@@ -65,152 +65,93 @@ define(function(require) {
$.ajax({
url: path,
type: "GET",
- data: {timeout: false},
+ data: { host: opts.selectedHost, timeout: false },
dataType: "json",
- headers: {
- "X-VCENTER-USER": opts.vcenter_user,
- "X-VCENTER-PASSWORD": opts.vcenter_password,
- "X-VCENTER-HOST": opts.vcenter_host
- },
success: function(response) {
$(".vcenter_datacenter_list", context).html("");
- $.each(response, function(datacenter_name, elements) {
- var content;
- if (elements.length == 0) {
- content = EmptyFieldsetHTML({
- title : datacenter_name + ' ' + Locale.tr("DataCenter"),
- message : Locale.tr("No new networks found in this DataCenter")
- });
+ var vcenter_name = Object.keys(response)[0];
+ response = response[vcenter_name];
- $(".vcenter_datacenter_list", context).append(content);
- } else {
- var tableId = "vcenter_import_table_" + UniqueId.id();
- content = FieldsetTableHTML({
- tableId : tableId,
- title : datacenter_name + ' ' + Locale.tr("DataCenter"),
- clearImported : Locale.tr("Clear Imported Networks"),
- toggleAdvanced : true,
- columns : [
- '',
- Locale.tr("Network"),
- ""
- ]
- });
+ if (Object.keys(response).length === 0){
+ content = EmptyFieldsetHTML({
+ title : Locale.tr("vCenter Networks") + ": " + vcenter_name,
+ message : Locale.tr("No new networks found")
+ });
+ $(".vcenter_datacenter_list", context).append(content);
- var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
- var tbody = $('#' + tableId + ' tbody', context);
+ } else {
+ var tableId = "vcenter_import_table_" + UniqueId.id();
+ content = FieldsetTableHTML({
+ tableId : tableId,
+ title : Locale.tr("vCenter Networks") + ": " + vcenter_name,
+ toggleAdvanced : true,
+ columns : [
+ "",
+ Locale.tr("Network"),
+ ""
+ ]
+ });
- $.each(elements, function(id, element) {
- var opts = { data: element };
- var trow = $(RowTemplate(opts)).appendTo(tbody);
+ var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
+ var tbody = $("#" + tableId + " tbody", context);
- $('.check_item', trow).data("import_data", element);
- });
-
- var elementsTable = new DomDataTable(
- tableId,
- {
- actions: false,
- info: false,
- dataTableOptions: {
- "bAutoWidth": false,
- "bSortClasses" : false,
- "bDeferRender": false,
- "ordering": false,
- "aoColumnDefs": [
- {"sWidth": "35px", "aTargets": [0]},
- ],
- },
- "customTrListener": function(tableObj, tr){ return false; }
- });
-
- elementsTable.initialize();
-
- $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Networks", elements.length));
-
- VCenterCommon.setupTable({
- context : newdiv,
- allSelected : Locale.tr("All %1$s Networks selected."),
- selected: Locale.tr("%1$s Networks selected.")
- });
-
- context.off('click', '.clear_imported');
- context.on('click', '.clear_imported', function() {
- _fillVCenterNetworks(opts);
- return false;
- });
-
- context.off('change', '.type_select');
- context.on("change", '.type_select', function() {
- var row_context = $(this).closest(".vcenter_row");
- var type = $(this).val();
-
- var net_form_str = ''
-
- switch (type) {
- case 'ETHER':
- net_form_str =
- ' ' +
- '' +
- ' ';
- break;
- case 'IP4':
- net_form_str =
- '' +
- '' +
- ' ' +
- '' +
- '' +
- ' ';
- break;
- case 'IP6':
- net_form_str =
- '' +
- '' +
- ' ' +
- '' +
- '' +
- ' ' +
- '' +
- '' +
- ' ';
- break;
- case 'IP6_STATIC':
- net_form_str =
- '' +
- '' +
- ' '+'' +
- '' +
- ' '+
- '' +
- '' +
- ' ';
- break;
+ $.each(response, function(network_name, element) {
+ var importedClusters = [];
+ var unimportedClusters = [];
+ for (var i = 0; i < element.clusters.one_ids.length; i++){
+ var cluster = {};
+ cluster.name = element.clusters.names[i];
+ cluster.id = element.clusters.one_ids[i];
+ if (cluster.id === -1){
+ unimportedClusters.push(cluster);
+ } else {
+ importedClusters.push(cluster);
}
+ }
+ var opts = { data: element, importedClusters: importedClusters, unimportedClusters: unimportedClusters };
+ var trow = $(RowTemplate(opts)).appendTo(tbody);
- $('.net_options', row_context).html(net_form_str);
+ Tips.setup(trow);
+
+ $(".check_item", trow).data("import_data", element);
+ });
+
+ var elementsTable = new DomDataTable(
+ tableId,
+ {
+ actions: false,
+ info: false,
+ dataTableOptions: {
+ "bAutoWidth": false,
+ "bSortClasses" : false,
+ "bDeferRender": false,
+ "ordering": false,
+ "aoColumnDefs": [
+ {"sWidth": "35px", "aTargets": [0]},
+ ],
+ },
+ "customTrListener": function(tableObj, tr){ return false; }
});
- }
- });
+
+ elementsTable.initialize();
+
+ $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Networks", Object.keys(response).length));
+
+ VCenterCommon.setupTable({
+ context : newdiv,
+ allSelected : Locale.tr("All %1$s Networks selected."),
+ selected: Locale.tr("%1$s Networks selected.")
+ });
+
+ context.off("click", ".clear_imported");
+ context.on("click", ".clear_imported", function() {
+ _fillVCenterNetworks(opts);
+ return false;
+ });
+
+ setupAdvanced(context);
+ }
},
error: function(response) {
context.hide();
@@ -219,119 +160,151 @@ define(function(require) {
});
}
+ function setupAdvanced(context){
+ context.off("change", ".type_select");
+ context.on("change", ".type_select", function() {
+ var row_context = $(this).closest(".vcenter_row");
+ var type = $(this).val();
+
+ var net_form_str = "";
+
+ switch (type) {
+ case "ether":
+ net_form_str =
+ "" +
+ "" +
+ " ";
+ break;
+ case "ip4":
+ net_form_str =
+ "" +
+ "" +
+ " " +
+ "" +
+ "" +
+ " ";
+ break;
+ case "ip6":
+ net_form_str =
+ "" +
+ "" +
+ " " +
+ "" +
+ "" +
+ " " +
+ "" +
+ "" +
+ " ";
+ break;
+ case "ip6_static":
+ net_form_str =
+ "" +
+ "" +
+ " "+"" +
+ "" +
+ " "+
+ "" +
+ "" +
+ " ";
+ break;
+ }
+ $(".net_options", row_context).html(net_form_str);
+ });
+ }
+
function _import(context) {
- $.each($(".vcenter_import_table", context), function() {
- $.each($(this).DataTable().$(".check_item:checked"), function() {
- var row_context = $(this).closest("tr");
+ var vcenter_refs = [];
+ var opts = {};
- VCenterCommon.importLoading({context : row_context});
+ var table = $("table.vcenter_import_table", context);
- var network_size = $(".netsize", row_context).val();
- var network_tmpl = $(this).data("import_data").one;
- var type = $('.type_select', row_context).val();
+ $.each(table.DataTable().$(".check_item:checked"), function() {
+ var row_context = $(this).closest("tr");
+ VCenterCommon.importLoading({context : row_context});
- var ar_array = [];
- ar_array.push("TYPE=" + type);
- ar_array.push("SIZE=" + network_size);
+ var ref = $(this).data("import_data").ref;
+ vcenter_refs.push(ref);
- switch (type) {
- case 'ETHER':
- var mac = $('.eth_mac_net', row_context).val();
+ opts[ref] = {};
- if (mac) {
- ar_array.push("MAC=" + mac);
- }
+ opts[ref].size = $(".netsize", row_context).val();
+ opts[ref].type = $(".type_select", row_context).val();
- break;
- case 'IP4':
- var mac = $('.four_mac_net', row_context).val();
- var ip = $('.four_ip_net', row_context).val();
+ switch (opts[ref].type) {
+ case "ether":
+ opts[ref].mac = $(".eth_mac_net", row_context).val();
- if (mac) {
- ar_array.push("MAC=" + mac);
- }
- if (ip) {
- ar_array.push("IP=" + ip);
- }
+ break;
+ case "ip4":
+ opts[ref].mac = $(".four_mac_net", row_context).val();
+ opts[ref].ip = $(".four_ip_net", row_context).val();
- break;
- case 'IP6':
- var mac = $('.six_mac_net', row_context).val();
- var gp = $('.six_global_net', row_context).val();
- var ula = $('.six_mac_net', row_context).val();
+ break;
+ case "ip6":
+ opts[ref].mac = $(".six_mac_net", row_context).val();
+ opts[ref].global_prefix = $(".six_global_net", row_context).val();
+ opts[ref].ula_prefix = $(".six_mac_net", row_context).val();
- if (mac) {
- ar_array.push("MAC=" + mac);
- }
- if (gp) {
- ar_array.push("GLOBAL_PREFIX=" + gp);
- }
- if (ula) {
- ar_array.push("ULA_PREFIX=" + ula);
- }
+ break;
+ case "ip6_static":
+ opts[ref].mac = $(".six_mac_net", row_context).val();
+ opts[ref].ip6 = $(".six_static_net", row_context).val();
+ opts[ref].prefix_lenght = $(".six_prefix_net", row_context).val();
- break;
- case 'IP6_STATIC':
- var mac = $('.six_mac_net', row_context).val();
- var ip6_static = $('.six_static_net', row_context).val();
- var prefix = $('.six_prefix_net', row_context).val();
+ break;
+ }
- if (mac) {
- ar_array.push("MAC=" + mac);
- }
- if (ip6_static) {
- ar_array.push("IP6=" + ip6_static);
- }
- if (prefix) {
- ar_array.push("PREFIX_LENGTH=" + prefix);
- }
- break;
- }
-
- network_tmpl += "\nAR=["
- network_tmpl += ar_array.join(",\n")
- network_tmpl += "]"
-
- var vlaninfo = $(".vlaninfo", row_context).text();
-
- if ( vlaninfo != undefined && vlaninfo != "" ) {
- network_tmpl += "\nVLAN_TAGGED_ID=" + vlaninfo + "\n";
- }
-
- var vnet_json = {
- "vnet": {
- "vnet_raw": network_tmpl
- }
- };
-
- var one_cluster_id = $(this).data("import_data").one_cluster_id;
-
- if (one_cluster_id != -1){
- OpenNebulaNetwork.create({
- timeout: true,
- data: vnet_json,
- success: function(request, response) {
- VCenterCommon.importSuccess({
- context : row_context,
- message : Locale.tr("Virtual Network created successfully. ID: %1$s", response.VNET.ID)
- });
- Sunstone.runAction("Cluster.addvnet",one_cluster_id,response.VNET.ID);
- },
- error: function (request, error_json) {
- VCenterCommon.importFailure({
- context : row_context,
- message : (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?"))
- });
- }
- });
- } else {
- VCenterCommon.importFailure({
- context : row_context,
- message : Locale.tr("You need to import the associated vcenter cluster as one host first.")
- });
- }
+ var clParams = [];
+ $.each($("#vnet-clusters option:selected", row_context), function(){
+ clParams.push($(this).val());
});
+ opts[ref].selected_clusters = clParams;
});
+ vcenter_refs = vcenter_refs.join(",");
+
+ if (vcenter_refs.length === 0){
+ Notifier.notifyMessage("You must select at least one network");
+ return false;
+ }
+
+ $.ajax({
+ url: path,
+ type: "POST",
+ data: {
+ timeout: false,
+ networks: vcenter_refs,
+ opts: opts
+ },
+ dataType: "json",
+ success: function(response){
+ VCenterCommon.jGrowlSuccess({success : response.success, resource : resource, link_tab : "vnets-tab"});
+ VCenterCommon.jGrowlFailure({error : response.error, resource : resource});
+
+ $("#get-vcenter-networks").click();
+ },
+ error: function(request, error_json){
+ Notifier.notifyError(request.responseJSON.error.message);
+ $("#get-vcenter-networks").click();
+ }
+ });
}
});
diff --git a/src/sunstone/public/app/utils/vcenter/networks/row.hbs b/src/sunstone/public/app/utils/vcenter/networks/row.hbs
index 0a49d72c14..5e064610f9 100644
--- a/src/sunstone/public/app/utils/vcenter/networks/row.hbs
+++ b/src/sunstone/public/app/utils/vcenter/networks/row.hbs
@@ -27,16 +27,13 @@
{{data.name}}
- {{data.type}}
- {{#if data.cluster}} - {{tr "Cluster"}}: {{data.cluster}}{{/if}}
- {{#if data.cluster_location}} - {{tr "Location"}}: {{data.cluster_location}}{{/if}}
- {{#if data.one_cluster_id}} - {{tr "OpenNebula Cluster ID"}}: {{data.one_cluster_id}}{{/if}}
{{#if data.vlan}} - {{tr "VLAN"}}: {{data.vlan}}{{/if}}
+
+
+
+
+
+
+
diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js
index 1da0860cbe..9d9cc62bdc 100644
--- a/src/sunstone/public/app/utils/vcenter/templates.js
+++ b/src/sunstone/public/app/utils/vcenter/templates.js
@@ -68,80 +68,83 @@ define(function(require) {
$.ajax({
url: path,
type: "GET",
- data: { host: opts.selectedHost, timeout: false},
+ data: { host: opts.selectedHost, timeout: false },
dataType: "json",
success: function(response){
$(".vcenter_datacenter_list", context).html("");
- if (response.length === 0){
+ var vcenter_name = Object.keys(response)[0];
+ response = response[vcenter_name];
+
+ if (Object.keys(response).length === 0){
content = EmptyFieldsetHTML({
- title : Locale.tr("vCenter Templates"),
+ title : Locale.tr("vCenter Templates") + ": " + vcenter_name,
message : Locale.tr("No new templates found")
});
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_import_table_" + UniqueId.id();
- content = FieldsetTableHTML({
- tableId : tableId,
- title : Locale.tr("vCenter Templates"),
- toggleAdvanced : true,
- columns : [
- "",
- Locale.tr("Template"),
- ""
- ]
+ content = FieldsetTableHTML({
+ tableId : tableId,
+ title : Locale.tr("vCenter Templates") + ": " + vcenter_name,
+ toggleAdvanced : true,
+ columns : [
+ "",
+ Locale.tr("Template"),
+ ""
+ ]
+ });
+
+ var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
+ var tbody = $("#" + tableId + " tbody", context);
+
+ $.each(response, function(template_name, element){
+ var opts = {};
+ opts.data = element;
+ opts.id = UniqueId.id();
+ if (element.rp && element.rp !== "") {
+ opts.resourcePool = UserInputs.unmarshall(element.rp);
+ opts.resourcePool.params = opts.resourcePool.params.split(",");
+ }
+ var trow = $(RowTemplate(opts)).appendTo(tbody);
+ Tips.setup(trow);
+ setupAdvanced(opts, trow);
+ $(".check_item", trow).data("import_data", element);
+ });
+
+ var elementsTable = new DomDataTable(
+ tableId,
+ {
+ actions: false,
+ info: false,
+ dataTableOptions: {
+ "bAutoWidth": false,
+ "bSortClasses" : false,
+ "bDeferRender": false,
+ "ordering": false,
+ "aoColumnDefs": [
+ { "sWidth": "35px", "aTargets": [0] },
+ ],
+ },
+ "customTrListener": function(tableObj, tr){ return false; }
});
- var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
- var tbody = $("#" + tableId + " tbody", context);
+ elementsTable.initialize();
- $.each(response, function(template_name, element){
- var opts = {};
- opts.data = element;
- opts.id = UniqueId.id();
- if (element.rp && element.rp !== "") {
- opts.resourcePool = UserInputs.unmarshall(element.rp);
- opts.resourcePool.params = opts.resourcePool.params.split(",");
- }
- var trow = $(RowTemplate(opts)).appendTo(tbody);
- Tips.setup(trow);
- setupAdvanced(opts, trow);
- $(".check_item", trow).data("import_data", element);
- });
+ $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Templates", Object.keys(response).length));
- var elementsTable = new DomDataTable(
- tableId,
- {
- actions: false,
- info: false,
- dataTableOptions: {
- "bAutoWidth": false,
- "bSortClasses" : false,
- "bDeferRender": false,
- "ordering": false,
- "aoColumnDefs": [
- { "sWidth": "35px", "aTargets": [0] },
- ],
- },
- "customTrListener": function(tableObj, tr){ return false; }
- });
+ VCenterCommon.setupTable({
+ context : newdiv,
+ allSelected : Locale.tr("All %1$s Templates selected."),
+ selected: Locale.tr("%1$s Templates selected.")
+ });
- elementsTable.initialize();
-
- $("a.vcenter-table-select-all", context).text(Locale.tr("Select all %1$s Templates", Object.keys(response).length));
-
- VCenterCommon.setupTable({
- context : newdiv,
- allSelected : Locale.tr("All %1$s Templates selected."),
- selected: Locale.tr("%1$s Templates selected.")
- });
-
- context.off("click", ".clear_imported");
- context.on("click", ".clear_imported", function() {
- _fillVCenterDatastores(opts);
- return false;
- });
+ context.off("click", ".clear_imported");
+ context.on("click", ".clear_imported", function() {
+ _fillVCenterDatastores(opts);
+ return false;
+ });
}
},
error: function(response){
diff --git a/src/sunstone/public/app/utils/vcenter/vcenter-common.js b/src/sunstone/public/app/utils/vcenter/vcenter-common.js
index ed83e08dd8..11289183f7 100644
--- a/src/sunstone/public/app/utils/vcenter/vcenter-common.js
+++ b/src/sunstone/public/app/utils/vcenter/vcenter-common.js
@@ -113,7 +113,7 @@ define(function(require) {
'' +
'' +
'' +
- '');
+ '  ');
$(".vcenter_import_response", opts.context).html(opts.message);
}
@@ -122,8 +122,8 @@ define(function(require) {
$(".vcenter_import_result", opts.context).html(
'' +
'' +
- '' +
- '');
+ '' +
+ '  ');
$(".vcenter_import_response", opts.context).addClass("error-color").html(
opts.message);
diff --git a/src/sunstone/routes/vcenter.rb b/src/sunstone/routes/vcenter.rb
index 7262011c6e..7d9bcb6e91 100644
--- a/src/sunstone/routes/vcenter.rb
+++ b/src/sunstone/routes/vcenter.rb
@@ -101,16 +101,6 @@ helpers do
$importer = VCenterDriver::VcImporter.new_child(one_client, vi_client, type)
end
-# def af_format_response(resp)
-# if CloudClient::is_error?(resp)
-# logger.error("[OneFlow] " + resp.to_s)
-#
-# error = Error.new(resp.to_s)
-# error resp.code.to_i, error.to_json
-# else
-# body resp.body.to_s
-# end
-# end
end
get '/vcenter' do
@@ -135,6 +125,30 @@ get '/vcenter' do
end
end
+get '/vcenter/datastores' do
+ begin
+ new_vcenter_importer("datastores")
+
+ [200, $importer.get_list.to_json]
+ rescue Exception => e
+ logger.error("[vCenter] " + e.message)
+ error = Error.new(e.message)
+ error 403, error.to_json
+ end
+end
+
+post '/vcenter/datastores' do
+ begin
+ $importer.process_import(params["datastores"])
+
+ [200, $importer.output.to_json]
+ rescue Exception => e
+ logger.error("[vCenter] " + e.message)
+ error = Error.new(e.message)
+ error 403, error.to_json
+ end
+end
+
get '/vcenter/templates' do
begin
new_vcenter_importer("templates")
@@ -159,21 +173,11 @@ post '/vcenter/templates' do
end
end
-post '/vcenter/image_rollback/:image_id' do
+get '/vcenter/networks' do
begin
- image_id = params[:image_id]
- one_image = VCenterDriver::VIHelper.one_item(OpenNebula::Image, image_id.to_s, false)
+ new_vcenter_importer("networks")
- if OpenNebula.is_error?(one_image)
- raise "Error finding image #{image_id}: #{rc.message}\n"
- end
-
- rc = one_image.delete
- if OpenNebula.is_error?(rc)
- raise "Error deleting image #{image_id}: #{rc.message}\n"
- end
-
- [200, "Image #{image_id} deleted in rollback.".to_json]
+ [200, $importer.get_list.to_json]
rescue Exception => e
logger.error("[vCenter] " + e.message)
error = Error.new(e.message)
@@ -181,21 +185,11 @@ post '/vcenter/image_rollback/:image_id' do
end
end
-post '/vcenter/network_rollback/:network_id' do
+post '/vcenter/networks' do
begin
- network_id = params[:network_id]
- one_vnet = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualNetwork, network_id.to_s, false)
+ $importer.process_import(params["networks"], params["opts"])
- if OpenNebula.is_error?(one_vnet)
- raise "Error finding network #{network_id}: #{rc.message}\n"
- end
-
- rc = one_vnet.delete
- if OpenNebula.is_error?(rc)
- raise "Error deleting network #{network_id}: #{rc.message}\n"
- end
-
- [200, "Network #{network_id} deleted in rollback.".to_json]
+ [200, $importer.output.to_json]
rescue Exception => e
logger.error("[vCenter] " + e.message)
error = Error.new(e.message)
@@ -203,21 +197,30 @@ post '/vcenter/network_rollback/:network_id' do
end
end
-post '/vcenter/template_rollback/:template_id' do
+get '/vcenter/images' do
begin
- template_id = params[:template_id]
- one_template = VCenterDriver::VIHelper.one_item(OpenNebula::Template, template_id.to_s, false)
+ new_vcenter_importer("images")
- if OpenNebula.is_error?(one_template)
- raise "Error finding template #{template_id}: #{rc.message}\n"
- end
+ ds = VCenterDriver::VIHelper.one_item(OpenNebula::Datastore, params["ds"])
- rc = one_template.delete
- if OpenNebula.is_error?(rc)
- raise "Error deleting template #{template_id}: #{rc.message}\n"
- end
+ opts = {
+ ds_ref: ds['TEMPLATE/VCENTER_DS_REF'],
+ one_item: ds
+ }
- [200, "Template #{template_id} deleted in rollback.".to_json]
+ [200, $importer.get_list({datastore: opts}).to_json]
+ rescue Exception => e
+ logger.error("[vCenter] " + e.message)
+ error = Error.new(e.message)
+ error 403, error.to_json
+ end
+end
+
+post '/vcenter/images' do
+ begin
+ $importer.process_import(params["images"])
+
+ [200, $importer.output.to_json]
rescue Exception => e
logger.error("[vCenter] " + e.message)
error = Error.new(e.message)
@@ -246,224 +249,3 @@ post '/vcenter/wild_rollback/:vm_id' do
error 403, error.to_json
end
end
-
-get '/vcenter/template/:vcenter_ref/:template_id' do
- begin
- t = {}
-
- t[:one] = ""
- template_copy_ref = nil
- template = nil
- append = true
- lc_error = nil
-
- ref = params[:vcenter_ref]
- template_id = params[:template_id]
- use_linked_clones = params[:use_linked_clones] != "false"
- create_copy = params[:create_copy] != "false"
- template_name = params[:template_name] || ""
-
- if !ref || ref.empty?
- msg = "No template ref specified"
- return_error(404, msg)
- end
-
- template = VCenterDriver::Template.new_from_ref(ref, vcenter_client)
- vc_uuid = vcenter_client.vim.serviceContent.about.instanceUuid
-
- dpool = VCenterDriver::VIHelper.one_pool(OpenNebula::DatastorePool)
- if dpool.respond_to?(:message)
- msg = "Could not get OpenNebula DatastorePool: #{dpool.message}"
- return_error(404, msg)
- end
-
- ipool = VCenterDriver::VIHelper.one_pool(OpenNebula::ImagePool)
- if ipool.respond_to?(:message)
- msg = "Could not get OpenNebula ImagePool: #{ipool.message}"
- return_error(404, msg)
- end
-
- npool = VCenterDriver::VIHelper.one_pool(OpenNebula::VirtualNetworkPool)
- if npool.respond_to?(:message)
- msg = "Could not get OpenNebula VirtualNetworkPool: #{npool.message}"
- return_error(404, msg)
- end
-
- hpool = VCenterDriver::VIHelper.one_pool(OpenNebula::HostPool)
- if hpool.respond_to?(:message)
- msg = "Could not get OpenNebula HostPool: #{hpool.message}"
- return_error(404, msg)
- end
-
- # POST params
- if !use_linked_clones && (create_copy || !template_name.empty?)
- msg = "Should not set create template copy or template copy name if not using linked clones"
- return_error(404, msg)
- end
-
- if use_linked_clones && !create_copy && !template_name.empty?
- msg = "Should not set template copy name if create template copy hasn't been selected"
- return_error(404, msg)
- end
-
- if use_linked_clones
- if create_copy
- lc_error, template_copy_ref = template.create_template_copy(template_name)
-
- if template_copy_ref
- template = VCenterDriver::Template.new_from_ref(template_copy_ref, vcenter_client)
- one_template = VCenterDriver::Template.get_xml_template(template, vc_uuid, vcenter_client, vcenter_client.vim.host, "Datacenter")
-
- if one_template
- lc_error, use_lc = template.create_delta_disks
- if lc_error.nil?
- one_template[:create_copy] = "YES"
- one_template[:one] << "\nVCENTER_LINKED_CLONES=\"YES\"\n"
- t = one_template
- else
- return_error(404, lc_error)
- end
- else
- lc_error = "Could not obtain the info from the template's copy"
- return_error(404, lc_error)
- end
- end
- else
- lc_error, use_lc = template.create_delta_disks
- if lc_error && use_lc
- return_error(404, lc_error)
- end
- end
- end
-
- type = {:object => "template", :id => template_id}
-
- # Create images or get disks information for template
- error, template_disks = template.import_vcenter_disks(vc_uuid, dpool, ipool, type, true)
- raise error if !error.empty?
-
- template_moref = template_copy_ref ? template_copy_ref : ref
-
- # Create images or get nics information for template
- error, template_nics = template.import_vcenter_nics(vc_uuid,
- npool,
- hpool,
- vcenter_client.vim.host,
- template_moref,
- false,
- true,
- template["name"],
- template_id)
-
- raise error if !error.empty?
-
- t[:disks] = template_disks
- t[:nics] = template_nics
- t[:lc_error] = lc_error
-
- [200, t.to_json]
- rescue Exception => e
- template.delete_template if template_copy_ref
- return_error(e.message, 403)
- end
-end
-
-get '/vcenter/networks' do
- begin
- dc_folder = VCenterDriver::DatacenterFolder.new(vcenter_client)
-
- npool = VCenterDriver::VIHelper.one_pool(OpenNebula::VirtualNetworkPool, false)
-
- if npool.respond_to?(:message)
- msg = "Could not get OpenNebula VirtualNetworkPool: #{npool.message}"
- logger.error("[vCenter] " + msg)
- error = Error.new(msg)
- error 404, error.to_json
- end
-
- hpool = VCenterDriver::VIHelper.one_pool(OpenNebula::HostPool, false)
-
- if hpool.respond_to?(:message)
- msg = "Could not get OpenNebula HostPool: #{hpool.message}"
- logger.error("[vCenter] " + msg)
- error = Error.new(msg)
- error 404, error.to_json
- end
-
- # clean vcenterDriver cache
- VCenterDriver::VIHelper.clean_ref_hash("TEMPLATE/VCENTER_CCR_REF")
- networks = dc_folder.get_unimported_networks(npool,vcenter_client.vim.host,hpool)
-
- if networks.nil?
- msg = "No datacenter found"
- logger.error("[vCenter] " + msg)
- error = Error.new(msg)
- error 404, error.to_json
- end
-
- [200, networks.to_json]
- rescue Exception => e
- logger.error("[vCenter] " + e.message)
- error = Error.new(e.message)
- error 403, error.to_json
- end
-end
-
-get '/vcenter/images/:ds_name' do
- begin
- one_ds = VCenterDriver::VIHelper.find_by_name(OpenNebula::DatastorePool,
- params[:ds_name])
- one_ds_ref = one_ds['TEMPLATE/VCENTER_DS_REF']
- one_ds_instance_id = one_ds['TEMPLATE/VCENTER_INSTANCE_ID']
- vc_uuid = vcenter_client.vim.serviceContent.about.instanceUuid
-
- if one_ds_instance_id != vc_uuid
- msg = "Datastore is not in the same vCenter instance provided in credentials"
- logger.error("[vCenter] " + msg)
- error = Error.new(msg)
- error 404, error.to_json
- end
-
- ds = VCenterDriver::Datastore.new_from_ref(one_ds_ref, vcenter_client)
- ds.one_item = one_ds
-
- images = ds.get_images
-
- if images.nil?
- msg = "No datastore found"
- logger.error("[vCenter] " + msg)
- error = Error.new(msg)
- error 404, error.to_json
- end
-
- [200, images.to_json]
- rescue Exception => e
- logger.error("[vCenter] " + e.message)
- error = Error.new(e.message)
- error 403, error.to_json
- end
-end
-
-get '/vcenter/datastores' do
- begin
- new_vcenter_importer("datastores")
-
- [200, $importer.get_list.to_json]
- rescue Exception => e
- logger.error("[vCenter] " + e.message)
- error = Error.new(e.message)
- error 403, error.to_json
- end
-end
-
-post '/vcenter/datastores' do
- begin
- $importer.process_import(params["datastores"])
-
- [200, $importer.output.to_json]
- rescue Exception => e
- logger.error("[vCenter] " + e.message)
- error = Error.new(e.message)
- error 403, error.to_json
- end
-end
|