From 2589ab86fe0f3c3fb01b7453f93f05156a7aaaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 27 Mar 2013 13:48:06 +0100 Subject: [PATCH 01/82] Feature #1835: Implement poweroff --hard in core --- include/DispatchManager.h | 4 ++- include/LifeCycleManager.h | 5 ++++ src/dm/DispatchManagerActions.cc | 12 +++++++-- src/lcm/LifeCycleActions.cc | 25 ++++++++++++++++- src/lcm/LifeCycleManager.cc | 8 ++++++ src/lcm/LifeCycleStates.cc | 30 +++++++++++++++++++-- src/rm/RequestManagerVirtualMachine.cc | 6 ++++- src/scheduler/src/pool/VirtualMachineXML.cc | 1 + src/vmm/VirtualMachineManager.cc | 3 ++- 9 files changed, 86 insertions(+), 8 deletions(-) diff --git a/include/DispatchManager.h b/include/DispatchManager.h index 91e2f2ffb7..9eb61dff3b 100644 --- a/include/DispatchManager.h +++ b/include/DispatchManager.h @@ -133,11 +133,13 @@ public: /** * Powers off a VM. * @param vid VirtualMachine identification + * @param hard True to force the poweroff (cancel instead of shutdown) * @return 0 on success, -1 if the VM does not exits or -2 if the VM is * in a wrong a state */ int poweroff ( - int vid); + int vid, + bool hard); /** * Holds a VM. diff --git a/include/LifeCycleManager.h b/include/LifeCycleManager.h index 649706a36d..0be92b0d80 100644 --- a/include/LifeCycleManager.h +++ b/include/LifeCycleManager.h @@ -85,6 +85,7 @@ public: LIVE_MIGRATE, /**< Sent by the DM to live-migrate a VM */ SHUTDOWN, /**< Sent by the DM to shutdown a running VM */ POWEROFF, /**< Sent by the DM to power off a running VM */ + POWEROFF_HARD, /**< Sent by the DM to power off hard a running VM */ RESTART, /**< Sent by the DM to restart a deployed VM */ DELETE, /**< Sent by the DM to delete a VM */ CLEAN, /**< Sent by the DM to cleanup a VM for resubmission*/ @@ -249,6 +250,10 @@ private: void poweroff_action(int vid); + void poweroff_hard_action(int vid); + + void poweroff_action(int vid, bool hard); + void failure_action(VirtualMachine * vm); void restart_action(int vid); diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 0d523c59df..05145f1037 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -210,7 +210,8 @@ error: /* -------------------------------------------------------------------------- */ int DispatchManager::poweroff ( - int vid) + int vid, + bool hard) { ostringstream oss; VirtualMachine * vm; @@ -231,7 +232,14 @@ int DispatchManager::poweroff ( Nebula& nd = Nebula::instance(); LifeCycleManager * lcm = nd.get_lcm(); - lcm->trigger(LifeCycleManager::POWEROFF,vid); + if (hard) + { + lcm->trigger(LifeCycleManager::POWEROFF_HARD,vid); + } + else + { + lcm->trigger(LifeCycleManager::POWEROFF,vid); + } } else { diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 6babd98d95..77680703c6 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -338,6 +338,22 @@ void LifeCycleManager::shutdown_action(int vid) /* -------------------------------------------------------------------------- */ void LifeCycleManager::poweroff_action(int vid) +{ + poweroff_action(vid, false); +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +void LifeCycleManager::poweroff_hard_action(int vid) +{ + poweroff_action(vid, true); +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +void LifeCycleManager::poweroff_action(int vid, bool hard) { VirtualMachine * vm; @@ -368,7 +384,14 @@ void LifeCycleManager::poweroff_action(int vid) //---------------------------------------------------- - vmm->trigger(VirtualMachineManager::SHUTDOWN,vid); + if (hard) + { + vmm->trigger(VirtualMachineManager::CANCEL,vid); + } + else + { + vmm->trigger(VirtualMachineManager::SHUTDOWN,vid); + } } else { diff --git a/src/lcm/LifeCycleManager.cc b/src/lcm/LifeCycleManager.cc index 1e89d9c0fe..10957e6b8f 100644 --- a/src/lcm/LifeCycleManager.cc +++ b/src/lcm/LifeCycleManager.cc @@ -252,6 +252,10 @@ void LifeCycleManager::trigger(Actions action, int _vid) aname = "POWEROFF"; break; + case POWEROFF_HARD: + aname = "POWEROFF_HARD"; + break; + default: delete vid; return; @@ -457,6 +461,10 @@ void LifeCycleManager::do_action(const string &action, void * arg) { poweroff_action(vid); } + else if (action == "POWEROFF_HARD") + { + poweroff_hard_action(vid); + } else if (action == ACTION_FINALIZE) { NebulaLog::log("LCM",Log::INFO,"Stopping Life-cycle Manager..."); diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 475c35e4b3..72533a626a 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -857,6 +857,7 @@ void LifeCycleManager::cancel_success_action(int vid) { Nebula& nd = Nebula::instance(); TransferManager * tm = nd.get_tm(); + DispatchManager * dm = nd.get_dm(); VirtualMachine * vm; time_t the_time = time(0); @@ -893,6 +894,30 @@ void LifeCycleManager::cancel_success_action(int vid) tm->trigger(TransferManager::EPILOG,vid); } + else if (vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF) + { + //---------------------------------------------------- + // POWEROFF STATE + //---------------------------------------------------- + + vm->delete_snapshots(); + + vmpool->update(vm); + + vm->set_running_etime(the_time); + + vm->set_etime(the_time); + + vm->set_vm_info(); + + vm->set_reason(History::STOP_RESUME); + + vmpool->update_history(vm); + + //---------------------------------------------------- + + dm->trigger(DispatchManager::POWEROFF_SUCCESS,vid); + } else { vm->log("LCM",Log::ERROR,"cancel_success_action, VM in a wrong state"); @@ -918,10 +943,11 @@ void LifeCycleManager::cancel_failure_action(int vid) return; } - if ( vm->get_lcm_state() == VirtualMachine::CANCEL ) + if ( vm->get_lcm_state() == VirtualMachine::CANCEL || + vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF) { //---------------------------------------------------- - // RUNNING STATE FROM CANCEL + // RUNNING STATE FROM CANCEL OR SHUTDOWN_POWEROFF //---------------------------------------------------- vm->set_state(VirtualMachine::RUNNING); diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 506412f4ad..1061d4f846 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -379,7 +379,11 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, } else if (action == "poweroff") { - rc = dm->poweroff(id); + rc = dm->poweroff(id, false); + } + else if (action == "poweroff-hard") + { + rc = dm->poweroff(id, true); } switch (rc) diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index 2e6af63cb5..949bf272cf 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -307,6 +307,7 @@ int VirtualMachineXML::parse_action_name(string& action_st) && action_st != "reboot" && action_st != "reboot-hard" && action_st != "poweroff" + && action_st != "poweroff-hard" && action_st != "snapshot-create") { return -1; diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc index 9a24583728..59a15b34ec 100644 --- a/src/vmm/VirtualMachineManager.cc +++ b/src/vmm/VirtualMachineManager.cc @@ -902,7 +902,8 @@ error_driver: os << "cancel_action, error getting driver " << vm->get_vmm_mad(); error_common: - if ( vm->get_lcm_state() == VirtualMachine::CANCEL ) //not in DELETE + if ( vm->get_lcm_state() == VirtualMachine::CANCEL || + vm->get_lcm_state() == VirtualMachine::SHUTDOWN_POWEROFF ) //not in DELETE { Nebula &ne = Nebula::instance(); LifeCycleManager * lcm = ne.get_lcm(); From 12faca7d16539378b67ed3ecb90656264c7737c5 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 27 Mar 2013 13:57:29 +0100 Subject: [PATCH 02/82] Update messages.po --- src/sunstone/locale/messages.pot | 5599 +++++++++-------- src/sunstone/public/js/plugins/acls-tab.js | 8 +- .../public/js/plugins/clusters-tab.js | 12 +- .../public/js/plugins/dashboard-tab.js | 166 - .../public/js/plugins/datastores-tab.js | 8 +- src/sunstone/public/js/plugins/files-tab.js | 8 +- src/sunstone/public/js/plugins/groups-tab.js | 8 +- src/sunstone/public/js/plugins/hosts-tab.js | 22 +- src/sunstone/public/js/plugins/images-tab.js | 8 +- .../public/js/plugins/marketplace-tab.js | 2 +- .../public/js/plugins/templates-tab.js | 79 +- src/sunstone/public/js/plugins/users-tab.js | 2 +- src/sunstone/public/js/plugins/vms-tab.js | 18 +- src/sunstone/public/js/plugins/vnets-tab.js | 8 +- 14 files changed, 3021 insertions(+), 2927 deletions(-) diff --git a/src/sunstone/locale/messages.pot b/src/sunstone/locale/messages.pot index b73b955301..86d7d44404 100644 --- a/src/sunstone/locale/messages.pot +++ b/src/sunstone/locale/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenNebula\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-17 11:43+0200\n" +"POT-Creation-Date: 2013-03-27 13:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,398 +45,740 @@ msgstr "" msgid "Sign out" msgstr "" -#: ../public/js/plugins/hosts-tab.js:23 -msgid "CPU Monitoring information" +#: ../public/js/monitoring.js:99 ../public/js/plugins/clusters-tab.js:1545 +#: ../public/js/plugins/clusters-tab.js:1546 +#: ../public/js/plugins/clusters-tab.js:1555 +#: ../public/js/plugins/clusters-tab.js:1565 +#: ../public/js/plugins/clusters-tab.js:1652 +#: ../public/js/plugins/clusters-tab.js:1653 +#: ../public/js/plugins/clusters-tab.js:1662 +#: ../public/js/plugins/clusters-tab.js:1672 +msgid "No monitoring information available" msgstr "" -#: ../public/js/plugins/hosts-tab.js:29 -msgid "Memory monitoring information" +#: ../public/js/plugins/acls-tab.js:28 +msgid "Access Control Lists" msgstr "" -#: ../public/js/plugins/hosts-tab.js:38 ../public/js/plugins/hosts-tab.js:373 -#: ../public/js/plugins/acls-tab.js:57 ../public/js/plugins/acls-tab.js:269 -#: ../public/js/plugins/dashboard-tab.js:25 -#: ../public/js/plugins/infra-tab.js:34 -#: ../public/js/plugins/clusters-tab.js:31 -#: ../public/js/plugins/clusters-tab.js:591 -#: ../public/js/plugins/clusters-tab.js:698 -#: ../public/js/plugins/clusters-tab.js:807 -msgid "Hosts" +#: ../public/js/plugins/acls-tab.js:44 +#: ../public/js/plugins/clusters-tab.js:110 +#: ../public/js/plugins/clusters-tab.js:127 +#: ../public/js/plugins/clusters-tab.js:144 +#: ../public/js/plugins/clusters-tab.js:880 +#: ../public/js/plugins/datastores-tab.js:43 +#: ../public/js/plugins/files-tab.js:43 ../public/js/plugins/groups-tab.js:64 +#: ../public/js/plugins/hosts-tab.js:47 ../public/js/plugins/images-tab.js:43 +#: ../public/js/plugins/marketplace-tab.js:123 +#: ../public/js/plugins/templates-tab.js:42 +#: ../public/js/plugins/templates-tab.js:757 +#: ../public/js/plugins/templates-tab.js:1113 +#: ../public/js/plugins/templates-tab.js:1849 +#: ../public/js/plugins/templates-tab.js:1906 +#: ../public/js/plugins/templates-tab.js:2360 +#: ../public/js/plugins/templates-tab.js:2610 +#: ../public/js/plugins/templates-tab.js:2644 +#: ../public/js/plugins/users-tab.js:67 ../public/js/plugins/vms-tab.js:64 +#: ../public/js/plugins/vnets-tab.js:43 +msgid "Search" msgstr "" -#: ../public/js/plugins/hosts-tab.js:45 ../public/js/plugins/users-tab.js:52 -#: ../public/js/plugins/acls-tab.js:29 ../public/js/plugins/acls-tab.js:69 -#: ../public/js/plugins/acls-tab.js:216 ../public/js/plugins/acls-tab.js:234 -#: ../public/js/plugins/acls-tab.js:500 ../public/js/plugins/vms-tab.js:68 -#: ../public/js/plugins/images-tab.js:27 -#: ../public/js/plugins/templates-tab.js:27 -#: ../public/js/plugins/datastores-tab.js:28 -#: ../public/js/plugins/vnets-tab.js:27 -#: ../public/js/plugins/clusters-tab.js:28 -#: ../public/js/plugins/groups-tab.js:49 -msgid "All" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:46 ../public/js/plugins/users-tab.js:53 -#: ../public/js/plugins/users-tab.js:631 ../public/js/plugins/acls-tab.js:30 -#: ../public/js/plugins/acls-tab.js:237 ../public/js/plugins/vms-tab.js:69 -#: ../public/js/plugins/vms-tab.js:972 ../public/js/plugins/images-tab.js:28 -#: ../public/js/plugins/images-tab.js:613 -#: ../public/js/plugins/marketplace-tab.js:103 -#: ../public/js/plugins/marketplace-tab.js:155 -#: ../public/js/plugins/templates-tab.js:28 -#: ../public/js/plugins/templates-tab.js:918 -#: ../public/js/plugins/datastores-tab.js:29 -#: ../public/js/plugins/datastores-tab.js:463 -#: ../public/js/plugins/vnets-tab.js:28 ../public/js/plugins/vnets-tab.js:573 -#: ../public/js/plugins/clusters-tab.js:29 -#: ../public/js/plugins/clusters-tab.js:543 -#: ../public/js/plugins/clusters-tab.js:649 -#: ../public/js/plugins/groups-tab.js:50 -#: ../public/js/plugins/groups-tab.js:433 +#: ../public/js/plugins/acls-tab.js:56 ../public/js/plugins/acls-tab.js:303 +#: ../public/js/plugins/clusters-tab.js:24 +#: ../public/js/plugins/clusters-tab.js:44 +#: ../public/js/plugins/clusters-tab.js:60 +#: ../public/js/plugins/clusters-tab.js:890 +#: ../public/js/plugins/clusters-tab.js:1533 +#: ../public/js/plugins/clusters-tab.js:1639 +#: ../public/js/plugins/datastores-tab.js:55 +#: ../public/js/plugins/datastores-tab.js:279 +#: ../public/js/plugins/datastores-tab.js:658 +#: ../public/js/plugins/files-tab.js:53 ../public/js/plugins/files-tab.js:519 +#: ../public/js/plugins/groups-tab.js:76 ../public/js/plugins/hosts-tab.js:59 +#: ../public/js/plugins/images-tab.js:53 +#: ../public/js/plugins/images-tab.js:658 +#: ../public/js/plugins/marketplace-tab.js:133 +#: ../public/js/plugins/marketplace-tab.js:189 +#: ../public/js/plugins/templates-tab.js:54 +#: ../public/js/plugins/templates-tab.js:764 +#: ../public/js/plugins/templates-tab.js:1120 +#: ../public/js/plugins/templates-tab.js:1349 +#: ../public/js/plugins/templates-tab.js:1856 +#: ../public/js/plugins/templates-tab.js:1913 +#: ../public/js/plugins/templates-tab.js:2367 +#: ../public/js/plugins/templates-tab.js:2617 +#: ../public/js/plugins/templates-tab.js:2651 +#: ../public/js/plugins/users-tab.js:79 ../public/js/plugins/users-tab.js:753 +#: ../public/js/plugins/vms-tab.js:74 ../public/js/plugins/vms-tab.js:1236 +#: ../public/js/plugins/vms-tab.js:1426 ../public/js/plugins/vms-tab.js:1785 +#: ../public/js/plugins/vms-tab.js:2125 ../public/js/plugins/vms-tab.js:2562 +#: ../public/js/plugins/vnets-tab.js:53 ../public/js/plugins/vnets-tab.js:756 msgid "ID" msgstr "" -#: ../public/js/plugins/hosts-tab.js:47 ../public/js/plugins/hosts-tab.js:81 -#: ../public/js/plugins/hosts-tab.js:690 ../public/js/plugins/users-tab.js:54 -#: ../public/js/plugins/vms-tab.js:72 ../public/js/plugins/vms-tab.js:976 -#: ../public/js/plugins/images-tab.js:31 ../public/js/plugins/images-tab.js:65 -#: ../public/js/plugins/images-tab.js:150 -#: ../public/js/plugins/images-tab.js:617 -#: ../public/js/plugins/images-tab.js:1138 -#: ../public/js/plugins/marketplace-tab.js:104 -#: ../public/js/plugins/templates-tab.js:31 -#: ../public/js/plugins/templates-tab.js:79 -#: ../public/js/plugins/templates-tab.js:450 -#: ../public/js/plugins/templates-tab.js:515 -#: ../public/js/plugins/templates-tab.js:922 -#: ../public/js/plugins/templates-tab.js:2057 -#: ../public/js/plugins/datastores-tab.js:32 -#: ../public/js/plugins/datastores-tab.js:54 -#: ../public/js/plugins/datastores-tab.js:467 -#: ../public/js/plugins/vnets-tab.js:31 ../public/js/plugins/vnets-tab.js:58 -#: ../public/js/plugins/vnets-tab.js:128 ../public/js/plugins/vnets-tab.js:577 -#: ../public/js/plugins/clusters-tab.js:30 -#: ../public/js/plugins/clusters-tab.js:44 -#: ../public/js/plugins/clusters-tab.js:547 -#: ../public/js/plugins/clusters-tab.js:653 -#: ../public/js/plugins/groups-tab.js:51 -msgid "Name" +#: ../public/js/plugins/acls-tab.js:57 +msgid "Applies to" msgstr "" -#: ../public/js/plugins/hosts-tab.js:48 ../public/js/plugins/hosts-tab.js:132 -#: ../public/js/plugins/hosts-tab.js:694 -#: ../public/js/plugins/datastores-tab.js:33 -#: ../public/js/plugins/datastores-tab.js:60 -#: ../public/js/plugins/datastores-tab.js:479 -#: ../public/js/plugins/vnets-tab.js:32 ../public/js/plugins/vnets-tab.js:581 +#: ../public/js/plugins/acls-tab.js:58 ../public/js/plugins/acls-tab.js:90 +msgid "Affected resources" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:59 +msgid "Resource ID / Owned by" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:60 ../public/js/plugins/acls-tab.js:134 +msgid "Allowed operations" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:61 +msgid "ACL String" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:72 ../public/js/plugins/acls-tab.js:421 +msgid "Create ACL" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:79 +msgid "This rule applies to" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:92 ../public/js/plugins/acls-tab.js:339 +#: ../public/js/plugins/clusters-tab.js:99 +#: ../public/js/plugins/clusters-tab.js:892 +#: ../public/js/plugins/clusters-tab.js:1390 +#: ../public/js/plugins/clusters-tab.js:1581 +#: ../public/js/plugins/clusters-tab.js:1688 +#: ../public/js/plugins/dashboard-tab.js:94 +#: ../public/js/plugins/hosts-tab.js:28 ../public/js/plugins/hosts-tab.js:450 +#: ../public/js/plugins/infra-tab.js:34 +#: ../public/js/plugins/templates-tab.js:2653 +msgid "Hosts" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:93 ../public/js/plugins/acls-tab.js:360 +#: ../public/js/plugins/clusters-tab.js:864 +#: ../public/js/plugins/clusters-tab.js:1100 +#: ../public/js/plugins/infra-tab.js:30 +msgid "Clusters" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:94 ../public/js/plugins/acls-tab.js:363 +#: ../public/js/plugins/clusters-tab.js:101 +#: ../public/js/plugins/clusters-tab.js:894 +#: ../public/js/plugins/clusters-tab.js:1412 +#: ../public/js/plugins/clusters-tab.js:1594 +#: ../public/js/plugins/clusters-tab.js:1702 +#: ../public/js/plugins/datastores-tab.js:27 +#: ../public/js/plugins/datastores-tab.js:549 +#: ../public/js/plugins/infra-tab.js:38 +#: ../public/js/plugins/templates-tab.js:2655 +msgid "Datastores" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:95 ../public/js/plugins/acls-tab.js:342 +#: ../public/js/plugins/dashboard-tab.js:133 +#: ../public/js/plugins/dashboard-users-tab.js:43 +#: ../public/js/plugins/dashboard-users-tab.js:111 +#: ../public/js/plugins/vms-tab.js:44 ../public/js/plugins/vms-tab.js:834 +msgid "Virtual Machines" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:96 ../public/js/plugins/acls-tab.js:345 +#: ../public/js/plugins/clusters-tab.js:100 +#: ../public/js/plugins/clusters-tab.js:1401 +#: ../public/js/plugins/clusters-tab.js:1607 +#: ../public/js/plugins/clusters-tab.js:1718 +#: ../public/js/plugins/infra-tab.js:42 ../public/js/plugins/vnets-tab.js:26 +#: ../public/js/plugins/vnets-tab.js:659 +#: ../public/js/plugins/vresources-tab.js:43 +msgid "Virtual Networks" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:99 ../public/js/plugins/acls-tab.js:348 +#: ../public/js/plugins/datastores-tab.js:127 +#: ../public/js/plugins/datastores-tab.js:699 +#: ../public/js/plugins/groups-tab.js:589 +#: ../public/js/plugins/images-tab.js:26 +#: ../public/js/plugins/images-tab.js:554 +#: ../public/js/plugins/users-tab.js:823 +#: ../public/js/plugins/vresources-tab.js:47 +msgid "Images" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:100 +#: ../public/js/plugins/templates-tab.js:26 +#: ../public/js/plugins/templates-tab.js:423 +msgid "Templates" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:101 ../public/js/plugins/acls-tab.js:354 +#: ../public/js/plugins/acls-tab.js:582 +#: ../public/js/plugins/dashboard-tab.js:57 +#: ../public/js/plugins/groups-tab.js:78 ../public/js/plugins/system-tab.js:34 +#: ../public/js/plugins/users-tab.js:51 ../public/js/plugins/users-tab.js:579 +msgid "Users" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:102 ../public/js/plugins/acls-tab.js:357 +#: ../public/js/plugins/acls-tab.js:587 ../public/js/plugins/groups-tab.js:48 +#: ../public/js/plugins/groups-tab.js:414 +#: ../public/js/plugins/system-tab.js:30 +msgid "Groups" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:103 ../public/js/plugins/acls-tab.js:366 +msgid "Documents" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:109 +msgid "Resource subset" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:111 ../public/js/plugins/acls-tab.js:282 +#: ../public/js/plugins/acls-tab.js:300 ../public/js/plugins/acls-tab.js:590 +#: ../public/js/plugins/datastores-tab.js:278 +msgid "All" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:112 +msgid "Specific ID" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:113 +msgid "Owned by group" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:114 +msgid "Assigned to cluster" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:118 +msgid "Resource ID" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:122 ../public/js/plugins/acls-tab.js:307 +#: ../public/js/plugins/clusters-tab.js:46 +#: ../public/js/plugins/clusters-tab.js:62 +#: ../public/js/plugins/datastores-tab.js:57 +#: ../public/js/plugins/datastores-tab.js:281 +#: ../public/js/plugins/files-tab.js:55 ../public/js/plugins/images-tab.js:55 +#: ../public/js/plugins/templates-tab.js:56 +#: ../public/js/plugins/templates-tab.js:117 +#: ../public/js/plugins/templates-tab.js:766 +#: ../public/js/plugins/templates-tab.js:1122 +#: ../public/js/plugins/templates-tab.js:1858 +#: ../public/js/plugins/templates-tab.js:1915 +#: ../public/js/plugins/templates-tab.js:2369 +#: ../public/js/plugins/users-tab.js:81 ../public/js/plugins/vms-tab.js:76 +#: ../public/js/plugins/vnets-tab.js:55 ../public/js/plugins/vnets-tab.js:371 +#: ../public/js/sunstone-util.js:1943 ../public/js/sunstone-util.js:1967 +#: ../public/js/sunstone-util.js:2081 +msgid "Group" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:126 +#: ../public/js/plugins/clusters-tab.js:26 +#: ../public/js/plugins/clusters-tab.js:48 +#: ../public/js/plugins/clusters-tab.js:64 +#: ../public/js/plugins/clusters-tab.js:1365 +#: ../public/js/plugins/datastores-tab.js:59 +#: ../public/js/plugins/datastores-tab.js:111 +#: ../public/js/plugins/hosts-tab.js:61 ../public/js/plugins/hosts-tab.js:172 +#: ../public/js/plugins/templates-tab.js:1124 +#: ../public/js/plugins/templates-tab.js:2619 +#: ../public/js/plugins/vnets-tab.js:57 ../public/js/sunstone-util.js:2042 msgid "Cluster" msgstr "" -#: ../public/js/plugins/hosts-tab.js:49 ../public/js/plugins/hosts-tab.js:745 -msgid "Running VMs" +#: ../public/js/plugins/acls-tab.js:135 +#: ../public/js/plugins/templates-tab.js:107 +#: ../public/js/plugins/vnets-tab.js:361 ../public/js/sunstone-util.js:1933 +msgid "Use" msgstr "" -#: ../public/js/plugins/hosts-tab.js:50 -msgid "Real CPU" +#: ../public/js/plugins/acls-tab.js:136 +#: ../public/js/plugins/templates-tab.js:108 +#: ../public/js/plugins/vnets-tab.js:362 ../public/js/sunstone-util.js:1934 +msgid "Manage" msgstr "" -#: ../public/js/plugins/hosts-tab.js:51 -msgid "Allocated CPU" +#: ../public/js/plugins/acls-tab.js:137 +msgid "Administrate" msgstr "" -#: ../public/js/plugins/hosts-tab.js:52 -msgid "Real MEM" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:53 -msgid "Allocated MEM" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:54 ../public/js/plugins/vms-tab.js:73 -#: ../public/js/plugins/images-tab.js:37 -msgid "Status" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:55 ../public/js/plugins/hosts-tab.js:702 -msgid "IM MAD" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:56 ../public/js/plugins/hosts-tab.js:706 -msgid "VM MAD" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:57 -msgid "Last monitored on" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:66 -msgid "CPU Use is calculated as the minimum between (total CPU - real CPU usage) and (allocated CPU). Real CPU usage is provided by the hosts monitoring driver. Available CPU is calculated using the information from the CPU setting of the VMs running on that host (allocated CPU)" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:69 -msgid "Memory use is calculated according to the information provided by the host monitoring driver." -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:72 -msgid "You can get monitoring graphs by clicking in the desired host and visiting the monitoring information tab. Note that oneacctd must be running for this information to be updated/available." -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:80 -msgid "Host parameters" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:83 -msgid "Drivers" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:86 -msgid "Virtualization Manager" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:88 ../public/js/plugins/hosts-tab.js:102 -msgid "KVM" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:89 ../public/js/plugins/hosts-tab.js:103 -#: ../public/js/plugins/templates-tab.js:387 -msgid "XEN" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:90 ../public/js/plugins/hosts-tab.js:104 -#: ../public/js/plugins/hosts-tab.js:123 -#: ../public/js/plugins/datastores-tab.js:66 -#: ../public/js/plugins/vnets-tab.js:69 -msgid "VMware" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:91 ../public/js/plugins/hosts-tab.js:105 -msgid "EC2" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:92 ../public/js/plugins/hosts-tab.js:107 -#: ../public/js/plugins/datastores-tab.js:76 -msgid "Dummy" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:93 ../public/js/plugins/hosts-tab.js:108 -#: ../public/js/plugins/hosts-tab.js:124 ../public/js/plugins/users-tab.js:95 -msgid "Custom" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:96 -msgid "Custom VMM_MAD" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:100 -msgid "Information Manager" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:106 -msgid "Ganglia" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:111 -msgid "Custom IM_MAD" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:118 -msgid "Default (dummy)" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:119 -msgid "Firewall" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:120 ../public/js/plugins/vnets-tab.js:66 -msgid "802.1Q" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:121 ../public/js/plugins/vnets-tab.js:67 -msgid "ebtables" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:122 ../public/js/plugins/vnets-tab.js:68 -msgid "Open vSwitch" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:127 -msgid "Custom VNM_MAD" -msgstr "" - -#: ../public/js/plugins/hosts-tab.js:139 ../public/js/plugins/users-tab.js:105 -#: ../public/js/plugins/acls-tab.js:83 ../public/js/plugins/acls-tab.js:91 -#: ../public/js/plugins/vms-tab.js:121 ../public/js/plugins/images-tab.js:164 -#: ../public/js/plugins/images-tab.js:182 -#: ../public/js/plugins/templates-tab.js:538 -#: ../public/js/plugins/templates-tab.js:555 -#: ../public/js/plugins/datastores-tab.js:87 -#: ../public/js/plugins/vnets-tab.js:143 ../public/js/plugins/vnets-tab.js:160 -#: ../public/js/plugins/clusters-tab.js:48 -#: ../public/js/plugins/groups-tab.js:79 +#: ../public/js/plugins/acls-tab.js:138 ../public/js/plugins/acls-tab.js:155 +#: ../public/js/plugins/clusters-tab.js:161 +#: ../public/js/plugins/datastores-tab.js:269 +#: ../public/js/plugins/files-tab.js:177 +#: ../public/js/plugins/groups-tab.js:111 +#: ../public/js/plugins/hosts-tab.js:185 +#: ../public/js/plugins/images-tab.js:261 +#: ../public/js/plugins/images-tab.js:277 +#: ../public/js/plugins/templates-tab.js:88 +#: ../public/js/plugins/users-tab.js:160 ../public/js/plugins/vms-tab.js:147 +#: ../public/js/plugins/vnets-tab.js:324 ../public/js/plugins/vnets-tab.js:340 msgid "Create" msgstr "" -#: ../public/js/plugins/hosts-tab.js:140 ../public/js/plugins/users-tab.js:106 -#: ../public/js/plugins/users-tab.js:122 ../public/js/plugins/acls-tab.js:92 -#: ../public/js/plugins/vms-tab.js:122 ../public/js/plugins/vms-tab.js:606 -#: ../public/js/plugins/images-tab.js:165 -#: ../public/js/plugins/images-tab.js:184 -#: ../public/js/plugins/templates-tab.js:540 -#: ../public/js/plugins/templates-tab.js:557 -#: ../public/js/plugins/datastores-tab.js:88 -#: ../public/js/plugins/vnets-tab.js:145 ../public/js/plugins/vnets-tab.js:162 -#: ../public/js/plugins/clusters-tab.js:49 -#: ../public/js/plugins/groups-tab.js:80 +#: ../public/js/plugins/acls-tab.js:143 +msgid "ACL String preview" +msgstr "" + +#: ../public/js/plugins/acls-tab.js:156 +#: ../public/js/plugins/clusters-tab.js:163 +#: ../public/js/plugins/datastores-tab.js:270 +#: ../public/js/plugins/files-tab.js:178 ../public/js/plugins/hosts-tab.js:186 +#: ../public/js/plugins/images-tab.js:262 +#: ../public/js/plugins/images-tab.js:278 +#: ../public/js/plugins/templates-tab.js:90 +#: ../public/js/plugins/vnets-tab.js:326 ../public/js/plugins/vnets-tab.js:342 msgid "Reset" msgstr "" -#: ../public/js/plugins/hosts-tab.js:271 ../public/js/plugins/users-tab.js:334 -#: ../public/js/plugins/templates-tab.js:674 -#: ../public/js/plugins/clusters-tab.js:184 -msgid "Template updated correctly" +#: ../public/js/plugins/acls-tab.js:157 +#: ../public/js/plugins/clusters-tab.js:164 +#: ../public/js/plugins/config-tab.js:62 +#: ../public/js/plugins/datastores-tab.js:271 +#: ../public/js/plugins/files-tab.js:179 ../public/js/plugins/files-tab.js:981 +#: ../public/js/plugins/groups-tab.js:112 +#: ../public/js/plugins/groups-tab.js:272 +#: ../public/js/plugins/hosts-tab.js:187 +#: ../public/js/plugins/images-tab.js:263 +#: ../public/js/plugins/images-tab.js:279 +#: ../public/js/plugins/images-tab.js:1192 +#: ../public/js/plugins/templates-tab.js:91 +#: ../public/js/plugins/templates-tab.js:175 +#: ../public/js/plugins/templates-tab.js:3976 +#: ../public/js/plugins/users-tab.js:161 ../public/js/plugins/users-tab.js:186 +#: ../public/js/plugins/users-tab.js:346 ../public/js/plugins/vms-tab.js:148 +#: ../public/js/plugins/vms-tab.js:1948 ../public/js/plugins/vms-tab.js:2015 +#: ../public/js/plugins/vms-tab.js:2276 ../public/js/plugins/vms-tab.js:2461 +#: ../public/js/plugins/vms-tab.js:2659 ../public/js/plugins/vnets-tab.js:327 +#: ../public/js/plugins/vnets-tab.js:343 +msgid "Close" msgstr "" -#: ../public/js/plugins/hosts-tab.js:317 ../public/js/plugins/users-tab.js:397 -#: ../public/js/plugins/acls-tab.js:165 ../public/js/plugins/vms-tab.js:502 -#: ../public/js/plugins/images-tab.js:450 -#: ../public/js/plugins/templates-tab.js:774 -#: ../public/js/plugins/datastores-tab.js:309 -#: ../public/js/plugins/vnets-tab.js:434 -#: ../public/js/plugins/clusters-tab.js:220 -msgid "+ New" +#: ../public/js/plugins/acls-tab.js:235 +#: ../public/js/plugins/clusters-tab.js:1095 +#: ../public/js/plugins/datastores-tab.js:535 +#: ../public/js/plugins/files-tab.js:397 +#: ../public/js/plugins/groups-tab.js:404 +#: ../public/js/plugins/images-tab.js:537 +#: ../public/js/plugins/templates-tab.js:405 +#: ../public/js/plugins/users-tab.js:557 ../public/js/plugins/vms-tab.js:2600 +#: ../public/js/plugins/vnets-tab.js:637 +msgid "Delete" msgstr "" -#: ../public/js/plugins/hosts-tab.js:322 -msgid "Update a template" +#: ../public/js/plugins/acls-tab.js:245 +msgid "ACLs" msgstr "" -#: ../public/js/plugins/hosts-tab.js:328 -#: ../public/js/plugins/datastores-tab.js:320 -#: ../public/js/plugins/vnets-tab.js:444 -msgid "Select cluster" +#: ../public/js/plugins/acls-tab.js:285 ../public/js/plugins/users-tab.js:749 +msgid "User" msgstr "" -#: ../public/js/plugins/hosts-tab.js:330 -#: ../public/js/plugins/datastores-tab.js:322 -#: ../public/js/plugins/vnets-tab.js:446 -msgid "Select the destination cluster:" +#: ../public/js/plugins/acls-tab.js:289 +msgid "Group " msgstr "" -#: ../public/js/plugins/hosts-tab.js:335 -#: ../public/js/plugins/images-tab.js:476 -#: ../public/js/plugins/templates-tab.js:172 -#: ../public/js/plugins/templates-tab.js:181 -msgid "Enable" +#: ../public/js/plugins/acls-tab.js:311 +msgid "Cluster ID" msgstr "" -#: ../public/js/plugins/hosts-tab.js:340 -#: ../public/js/plugins/images-tab.js:480 -#: ../public/js/plugins/templates-tab.js:173 -#: ../public/js/plugins/templates-tab.js:182 -msgid "Disable" +#: ../public/js/plugins/acls-tab.js:351 +#: ../public/js/plugins/vresources-tab.js:30 +msgid "VM Templates" msgstr "" -#: ../public/js/plugins/hosts-tab.js:345 -msgid "Delete host" +#: ../public/js/plugins/acls-tab.js:525 +msgid "Please specify to who this ACL applies" msgstr "" -#: ../public/js/plugins/hosts-tab.js:357 ../public/js/plugins/hosts-tab.js:678 -#: ../public/js/plugins/hosts-tab.js:682 -#: ../public/js/plugins/clusters-tab.js:236 -msgid "Host information" +#: ../public/js/plugins/acls-tab.js:531 +msgid "Please select at least one resource" msgstr "" -#: ../public/js/plugins/hosts-tab.js:362 ../public/js/plugins/hosts-tab.js:754 -#: ../public/js/plugins/hosts-tab.js:757 -#: ../public/js/plugins/clusters-tab.js:241 -msgid "Host template" +#: ../public/js/plugins/acls-tab.js:540 +msgid "Please provide a resource ID for the resource(s) in this rule" msgstr "" -#: ../public/js/plugins/hosts-tab.js:366 ../public/js/plugins/hosts-tab.js:763 -#: ../public/js/plugins/vms-tab.js:652 ../public/js/plugins/vms-tab.js:1024 -#: ../public/js/plugins/vms-tab.js:1071 -#: ../public/js/plugins/clusters-tab.js:245 -msgid "Monitoring information" +#: ../public/js/plugins/clusters-tab.js:25 +#: ../public/js/plugins/clusters-tab.js:47 +#: ../public/js/plugins/clusters-tab.js:63 +#: ../public/js/plugins/clusters-tab.js:87 +#: ../public/js/plugins/clusters-tab.js:891 +#: ../public/js/plugins/clusters-tab.js:1374 +#: ../public/js/plugins/clusters-tab.js:1537 +#: ../public/js/plugins/clusters-tab.js:1643 +#: ../public/js/plugins/datastores-tab.js:58 +#: ../public/js/plugins/datastores-tab.js:82 +#: ../public/js/plugins/datastores-tab.js:282 +#: ../public/js/plugins/datastores-tab.js:663 +#: ../public/js/plugins/files-tab.js:56 ../public/js/plugins/files-tab.js:83 +#: ../public/js/plugins/files-tab.js:524 ../public/js/plugins/files-tab.js:969 +#: ../public/js/plugins/groups-tab.js:77 ../public/js/plugins/groups-tab.js:99 +#: ../public/js/plugins/hosts-tab.js:60 ../public/js/plugins/hosts-tab.js:89 +#: ../public/js/plugins/hosts-tab.js:816 ../public/js/plugins/images-tab.js:56 +#: ../public/js/plugins/images-tab.js:89 +#: ../public/js/plugins/images-tab.js:663 +#: ../public/js/plugins/images-tab.js:1180 +#: ../public/js/plugins/marketplace-tab.js:134 +#: ../public/js/plugins/templates-tab.js:57 +#: ../public/js/plugins/templates-tab.js:767 +#: ../public/js/plugins/templates-tab.js:1123 +#: ../public/js/plugins/templates-tab.js:1354 +#: ../public/js/plugins/templates-tab.js:1859 +#: ../public/js/plugins/templates-tab.js:1916 +#: ../public/js/plugins/templates-tab.js:2370 +#: ../public/js/plugins/templates-tab.js:2618 +#: ../public/js/plugins/templates-tab.js:2652 +#: ../public/js/plugins/templates-tab.js:3964 +#: ../public/js/plugins/users-tab.js:80 ../public/js/plugins/vms-tab.js:77 +#: ../public/js/plugins/vms-tab.js:1241 ../public/js/plugins/vms-tab.js:2563 +#: ../public/js/plugins/vnets-tab.js:56 ../public/js/plugins/vnets-tab.js:85 +#: ../public/js/plugins/vnets-tab.js:276 ../public/js/plugins/vnets-tab.js:761 +msgid "Name" msgstr "" -#: ../public/js/plugins/hosts-tab.js:625 ../public/js/plugins/vms-tab.js:1108 -#: ../public/js/plugins/templates-tab.js:1929 -msgid "ERROR" +#: ../public/js/plugins/clusters-tab.js:27 +#: ../public/js/plugins/dashboard-users-tab.js:184 +#: ../public/js/plugins/hosts-tab.js:62 +#: ../public/js/plugins/templates-tab.js:2620 +msgid "RVMs" msgstr "" -#: ../public/js/plugins/hosts-tab.js:625 -msgid "OFF" +#: ../public/js/plugins/clusters-tab.js:28 +#: ../public/js/plugins/clusters-tab.js:1204 +#: ../public/js/plugins/hosts-tab.js:63 ../public/js/plugins/hosts-tab.js:582 +#: ../public/js/plugins/templates-tab.js:2621 +msgid "Real CPU" msgstr "" -#: ../public/js/plugins/hosts-tab.js:625 -msgid "RETRY" +#: ../public/js/plugins/clusters-tab.js:29 +#: ../public/js/plugins/clusters-tab.js:1207 +#: ../public/js/plugins/hosts-tab.js:64 ../public/js/plugins/hosts-tab.js:585 +#: ../public/js/plugins/templates-tab.js:2622 +msgid "Allocated CPU" msgstr "" -#: ../public/js/plugins/hosts-tab.js:686 -msgid "id" +#: ../public/js/plugins/clusters-tab.js:30 +#: ../public/js/plugins/clusters-tab.js:1240 +#: ../public/js/plugins/hosts-tab.js:65 ../public/js/plugins/hosts-tab.js:618 +#: ../public/js/plugins/templates-tab.js:2623 +msgid "Real MEM" msgstr "" -#: ../public/js/plugins/hosts-tab.js:698 -#: ../public/js/plugins/dashboard-tab.js:31 -#: ../public/js/plugins/dashboard-tab.js:115 -#: ../public/js/plugins/vms-tab.js:988 ../public/js/plugins/images-tab.js:661 -#: ../public/js/plugins/dashboard-users-tab.js:49 -msgid "State" +#: ../public/js/plugins/clusters-tab.js:31 +#: ../public/js/plugins/clusters-tab.js:1243 +#: ../public/js/plugins/hosts-tab.js:66 ../public/js/plugins/hosts-tab.js:621 +#: ../public/js/plugins/templates-tab.js:2624 +msgid "Allocated MEM" msgstr "" -#: ../public/js/plugins/hosts-tab.js:710 -msgid "VN MAD" +#: ../public/js/plugins/clusters-tab.js:32 +#: ../public/js/plugins/datastores-tab.js:288 +#: ../public/js/plugins/files-tab.js:62 ../public/js/plugins/hosts-tab.js:67 +#: ../public/js/plugins/images-tab.js:62 +#: ../public/js/plugins/templates-tab.js:773 +#: ../public/js/plugins/templates-tab.js:1865 +#: ../public/js/plugins/templates-tab.js:1922 +#: ../public/js/plugins/templates-tab.js:2376 +#: ../public/js/plugins/templates-tab.js:2625 +#: ../public/js/plugins/vms-tab.js:78 +msgid "Status" msgstr "" -#: ../public/js/plugins/hosts-tab.js:717 -msgid "Host shares" +#: ../public/js/plugins/clusters-tab.js:33 +#: ../public/js/plugins/hosts-tab.js:68 ../public/js/plugins/hosts-tab.js:827 +#: ../public/js/plugins/templates-tab.js:2626 +msgid "IM MAD" msgstr "" -#: ../public/js/plugins/hosts-tab.js:721 -msgid "Total Mem" +#: ../public/js/plugins/clusters-tab.js:34 +#: ../public/js/plugins/hosts-tab.js:69 ../public/js/plugins/hosts-tab.js:831 +#: ../public/js/plugins/templates-tab.js:2627 +msgid "VM MAD" msgstr "" -#: ../public/js/plugins/hosts-tab.js:725 -msgid "Used Mem (real)" +#: ../public/js/plugins/clusters-tab.js:35 +#: ../public/js/plugins/hosts-tab.js:70 +#: ../public/js/plugins/templates-tab.js:2628 +msgid "Last monitored on" msgstr "" -#: ../public/js/plugins/hosts-tab.js:729 -msgid "Used Mem (allocated)" +#: ../public/js/plugins/clusters-tab.js:45 +#: ../public/js/plugins/clusters-tab.js:61 +#: ../public/js/plugins/datastores-tab.js:56 +#: ../public/js/plugins/datastores-tab.js:280 +#: ../public/js/plugins/files-tab.js:54 ../public/js/plugins/images-tab.js:54 +#: ../public/js/plugins/templates-tab.js:55 +#: ../public/js/plugins/templates-tab.js:111 +#: ../public/js/plugins/templates-tab.js:765 +#: ../public/js/plugins/templates-tab.js:1121 +#: ../public/js/plugins/templates-tab.js:1857 +#: ../public/js/plugins/templates-tab.js:1914 +#: ../public/js/plugins/templates-tab.js:2368 +#: ../public/js/plugins/vms-tab.js:75 ../public/js/plugins/vnets-tab.js:54 +#: ../public/js/plugins/vnets-tab.js:365 ../public/js/sunstone-util.js:1937 +#: ../public/js/sunstone-util.js:1959 +msgid "Owner" msgstr "" -#: ../public/js/plugins/hosts-tab.js:733 +#: ../public/js/plugins/clusters-tab.js:49 +#: ../public/js/plugins/datastores-tab.js:125 +#: ../public/js/plugins/datastores-tab.js:285 +#: ../public/js/plugins/files-tab.js:59 ../public/js/plugins/files-tab.js:105 +#: ../public/js/plugins/files-tab.js:537 +#: ../public/js/plugins/groups-tab.js:259 +#: ../public/js/plugins/images-tab.js:59 +#: ../public/js/plugins/images-tab.js:111 +#: ../public/js/plugins/images-tab.js:676 +#: ../public/js/plugins/templates-tab.js:770 +#: ../public/js/plugins/templates-tab.js:1125 +#: ../public/js/plugins/templates-tab.js:1862 +#: ../public/js/plugins/templates-tab.js:1919 +#: ../public/js/plugins/templates-tab.js:2373 +#: ../public/js/plugins/users-tab.js:333 ../public/js/plugins/vnets-tab.js:58 +#: ../public/js/plugins/vnets-tab.js:95 +msgid "Type" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:50 +#: ../public/js/plugins/templates-tab.js:1126 +#: ../public/js/plugins/vms-tab.js:2128 ../public/js/plugins/vnets-tab.js:59 +#: ../public/js/plugins/vnets-tab.js:225 ../public/js/plugins/vnets-tab.js:772 +msgid "Bridge" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:51 +#: ../public/js/plugins/dashboard-users-tab.js:199 +#: ../public/js/plugins/groups-tab.js:691 +#: ../public/js/plugins/templates-tab.js:1127 +#: ../public/js/plugins/users-tab.js:925 ../public/js/plugins/vnets-tab.js:60 +msgid "Leases" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:65 +#: ../public/js/plugins/datastores-tab.js:60 +msgid "Basepath" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:66 +#: ../public/js/plugins/datastores-tab.js:61 +msgid "TM MAD" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:67 +#: ../public/js/plugins/datastores-tab.js:62 +msgid "DS MAD" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:68 +#: ../public/js/plugins/datastores-tab.js:63 +#: ../public/js/plugins/datastores-tab.js:130 +#: ../public/js/plugins/system-tab.js:88 +msgid "System" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:78 +msgid "Create Cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:79 +msgid "Update Cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:117 +#: ../public/js/plugins/templates-tab.js:2636 +msgid "Please select one or more hosts from the list" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:118 +#: ../public/js/plugins/templates-tab.js:2637 +msgid "You selected the following hosts:" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:134 +msgid "Please select one or more vnets from the list" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:135 +msgid "You selected the following vnets:" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:151 +msgid "Please select one or more datastores from the list" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:152 +msgid "You selected the following datastores:" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:162 +#: ../public/js/plugins/clusters-tab.js:1089 +#: ../public/js/plugins/templates-tab.js:89 +#: ../public/js/plugins/templates-tab.js:137 +#: ../public/js/plugins/templates-tab.js:374 +#: ../public/js/plugins/users-tab.js:978 ../public/js/plugins/vnets-tab.js:391 +#: ../public/js/sunstone-util.js:870 +msgid "Update" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:430 +msgid "Cluster name missing!" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:471 +#: ../public/js/plugins/clusters-tab.js:1836 +msgid "Create cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:500 +msgid "Update cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:509 +msgid "Please select one (and just one) cluster to update." +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:893 +#: ../public/js/plugins/templates-tab.js:2654 +msgid "VNets" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1055 +msgid "Cluster updated correctly" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1110 +#: ../public/js/plugins/clusters-tab.js:1528 +#: ../public/js/plugins/clusters-tab.js:1634 +msgid "Cluster information" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1115 +msgid "Cluster Hosts" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1119 +msgid "Cluster Virtual Networks" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1123 +msgid "Cluster Datastores" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1210 +#: ../public/js/plugins/hosts-tab.js:588 ../public/js/plugins/hosts-tab.js:851 msgid "Total CPU" msgstr "" -#: ../public/js/plugins/hosts-tab.js:737 -msgid "Used CPU (real)" +#: ../public/js/plugins/clusters-tab.js:1246 +#: ../public/js/plugins/hosts-tab.js:624 +msgid "Total MEM" msgstr "" -#: ../public/js/plugins/hosts-tab.js:741 -msgid "Used CPU (allocated)" +#: ../public/js/plugins/clusters-tab.js:1358 +#: ../public/js/plugins/datastores-tab.js:543 +#: ../public/js/plugins/datastores-tab.js:694 +#: ../public/js/plugins/files-tab.js:408 ../public/js/plugins/files-tab.js:510 +#: ../public/js/plugins/hosts-tab.js:124 ../public/js/plugins/hosts-tab.js:438 +#: ../public/js/plugins/hosts-tab.js:802 +#: ../public/js/plugins/images-tab.js:548 +#: ../public/js/plugins/images-tab.js:649 +#: ../public/js/plugins/marketplace-tab.js:177 +#: ../public/js/plugins/templates-tab.js:1340 +#: ../public/js/plugins/vms-tab.js:1226 ../public/js/plugins/vnets-tab.js:808 +msgid "Information" msgstr "" -#: ../public/js/plugins/hosts-tab.js:783 -msgid "Create host" +#: ../public/js/plugins/clusters-tab.js:1370 +#: ../public/js/plugins/hosts-tab.js:812 +msgid "id" msgstr "" -#: ../public/js/plugins/hosts-tab.js:827 -msgid "Host name missing!" +#: ../public/js/plugins/clusters-tab.js:1541 +#: ../public/js/plugins/clusters-tab.js:1647 +msgid "Hosts state" msgstr "" -#: ../public/js/plugins/config-tab.js:24 -msgid "Sunstone UI Configuration" +#: ../public/js/plugins/clusters-tab.js:1542 +#: ../public/js/plugins/clusters-tab.js:1648 +msgid "Hosts CPU Usage" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1550 +#: ../public/js/plugins/clusters-tab.js:1657 +msgid "Used vs. Max CPU" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1560 +#: ../public/js/plugins/clusters-tab.js:1667 +msgid "Used vs. Max Memory" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1584 +#: ../public/js/plugins/clusters-tab.js:1585 +#: ../public/js/plugins/clusters-tab.js:1693 +msgid "Create new host" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1586 +msgid "Manage unclustered hosts" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1597 +#: ../public/js/plugins/clusters-tab.js:1708 +msgid "Create new datastore" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1598 +msgid "Manage unclustered datastores" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1610 +#: ../public/js/plugins/clusters-tab.js:1724 +msgid "Create new virtual network" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1611 +msgid "Manage unclustered virtual networks" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1691 +msgid "Current number of hosts in this cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1694 +msgid "Manage cluster hosts" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1705 +msgid "Current number of datastores in this cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1709 +msgid "Manage cluster datastores" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1721 +msgid "Current number of virtual networks in this cluster" +msgstr "" + +#: ../public/js/plugins/clusters-tab.js:1725 +msgid "Manage cluster virtual networks" +msgstr "" + +#: ../public/js/plugins/config-tab.js:21 ../public/js/plugins/config-tab.js:77 +msgid "Configuration" msgstr "" #: ../public/js/plugins/config-tab.js:29 msgid "Language" msgstr "" -#: ../public/js/plugins/config-tab.js:32 -msgid "English (US)" -msgstr "" - #: ../public/js/plugins/config-tab.js:33 msgid "Catalan" msgstr "" @@ -450,2394 +792,1196 @@ msgid "Czech (CZ)" msgstr "" #: ../public/js/plugins/config-tab.js:36 -msgid "French (FR)" +msgid "English (US)" msgstr "" #: ../public/js/plugins/config-tab.js:37 -msgid "German" +msgid "French (FR)" msgstr "" #: ../public/js/plugins/config-tab.js:38 -msgid "Greek (GR)" +msgid "German" msgstr "" #: ../public/js/plugins/config-tab.js:39 -msgid "Italian (IT)" +msgid "Greek (GR)" msgstr "" #: ../public/js/plugins/config-tab.js:40 -msgid "Persian (IR)" +msgid "Italian (IT)" msgstr "" #: ../public/js/plugins/config-tab.js:41 -msgid "Portuguese (PT)" +msgid "Persian (IR)" msgstr "" #: ../public/js/plugins/config-tab.js:42 -msgid "Russian (RU)" +msgid "Portuguese (BR)" msgstr "" #: ../public/js/plugins/config-tab.js:43 -msgid "Spanish (SP)" +msgid "Portuguese (PT)" msgstr "" #: ../public/js/plugins/config-tab.js:44 +msgid "Russian (RU)" +msgstr "" + +#: ../public/js/plugins/config-tab.js:45 msgid "Slovak (SK)" msgstr "" -#: ../public/js/plugins/config-tab.js:49 +#: ../public/js/plugins/config-tab.js:46 +msgid "Spanish (SP)" +msgstr "" + +#: ../public/js/plugins/config-tab.js:52 msgid "Secure websockets connection" msgstr "" -#: ../public/js/plugins/config-tab.js:64 -msgid "These options are stored in your OpenNebula user template." -msgstr "" - -#: ../public/js/plugins/config-tab.js:67 -msgid "WSS connection requires additional configuration of Sunstone Server and that the SSL certificate is considered valid by your browser." -msgstr "" - -#: ../public/js/plugins/config-tab.js:82 -msgid "Configuration" -msgstr "" - -#: ../public/js/plugins/users-tab.js:25 ../public/js/plugins/vms-tab.js:28 -#: ../public/js/plugins/templates-tab.js:89 -#: ../public/js/plugins/groups-tab.js:23 -#: ../public/js/plugins/dashboard-users-tab.js:140 -msgid "CPU" -msgstr "" - -#: ../public/js/plugins/users-tab.js:29 ../public/js/plugins/vms-tab.js:33 -#: ../public/js/plugins/templates-tab.js:84 -#: ../public/js/plugins/groups-tab.js:27 -#: ../public/js/plugins/dashboard-users-tab.js:127 -msgid "Memory" -msgstr "" - -#: ../public/js/plugins/users-tab.js:33 ../public/js/plugins/groups-tab.js:31 -msgid "Net TX" -msgstr "" - -#: ../public/js/plugins/users-tab.js:37 ../public/js/plugins/groups-tab.js:35 -msgid "Net RX" -msgstr "" - -#: ../public/js/plugins/users-tab.js:45 ../public/js/plugins/users-tab.js:477 -#: ../public/js/plugins/acls-tab.js:64 ../public/js/plugins/acls-tab.js:284 -#: ../public/js/plugins/acls-tab.js:492 ../public/js/plugins/system-tab.js:34 -#: ../public/js/plugins/groups-tab.js:52 -msgid "Users" -msgstr "" - -#: ../public/js/plugins/users-tab.js:55 ../public/js/plugins/users-tab.js:635 -#: ../public/js/plugins/acls-tab.js:76 ../public/js/plugins/acls-tab.js:241 -#: ../public/js/plugins/vms-tab.js:71 ../public/js/plugins/vms-tab.js:148 -#: ../public/js/plugins/vms-tab.js:984 ../public/js/plugins/vms-tab.js:1013 -#: ../public/js/plugins/images-tab.js:30 -#: ../public/js/plugins/images-tab.js:216 -#: ../public/js/plugins/images-tab.js:629 -#: ../public/js/plugins/images-tab.js:674 -#: ../public/js/plugins/templates-tab.js:30 -#: ../public/js/plugins/templates-tab.js:585 -#: ../public/js/plugins/templates-tab.js:930 -#: ../public/js/plugins/templates-tab.js:943 -#: ../public/js/plugins/datastores-tab.js:31 -#: ../public/js/plugins/datastores-tab.js:114 -#: ../public/js/plugins/datastores-tab.js:475 -#: ../public/js/plugins/datastores-tab.js:504 -#: ../public/js/plugins/vnets-tab.js:30 ../public/js/plugins/vnets-tab.js:190 -#: ../public/js/plugins/vnets-tab.js:589 ../public/js/plugins/vnets-tab.js:614 -msgid "Group" -msgstr "" - -#: ../public/js/plugins/users-tab.js:56 ../public/js/plugins/users-tab.js:639 -msgid "Authentication driver" -msgstr "" - -#: ../public/js/plugins/users-tab.js:57 ../public/js/plugins/groups-tab.js:53 -msgid "VMs" -msgstr "" - -#: ../public/js/plugins/users-tab.js:58 ../public/js/plugins/groups-tab.js:54 -msgid "Used memory" -msgstr "" - -#: ../public/js/plugins/users-tab.js:59 ../public/js/plugins/vms-tab.js:74 -#: ../public/js/plugins/vms-tab.js:1040 ../public/js/plugins/groups-tab.js:55 -msgid "Used CPU" -msgstr "" - -#: ../public/js/plugins/users-tab.js:60 -msgid "Group ID" -msgstr "" - -#: ../public/js/plugins/users-tab.js:70 -msgid "Tip: You can save any information in the user template, in the form of VAR=VAL." -msgstr "" - -#: ../public/js/plugins/users-tab.js:75 -msgid "Tip: SSH authentication method is not available for web UI access." -msgstr "" - -#: ../public/js/plugins/users-tab.js:85 -msgid "Username" -msgstr "" - -#: ../public/js/plugins/users-tab.js:87 -#: ../public/js/plugins/templates-tab.js:430 -msgid "Password" -msgstr "" - -#: ../public/js/plugins/users-tab.js:89 -msgid "Authentication" -msgstr "" - -#: ../public/js/plugins/users-tab.js:91 ../public/js/plugins/users-tab.js:426 -msgid "Core" -msgstr "" - -#: ../public/js/plugins/users-tab.js:92 ../public/js/plugins/users-tab.js:427 -#: ../public/js/plugins/datastores-tab.js:74 -msgid "SSH" -msgstr "" - -#: ../public/js/plugins/users-tab.js:93 ../public/js/plugins/users-tab.js:428 -msgid "x509" -msgstr "" - -#: ../public/js/plugins/users-tab.js:94 ../public/js/plugins/users-tab.js:429 -msgid "Public" -msgstr "" - -#: ../public/js/plugins/users-tab.js:98 -msgid "Custom auth driver" -msgstr "" - -#: ../public/js/plugins/users-tab.js:114 -msgid "This will change the password for the selected users" -msgstr "" - -#: ../public/js/plugins/users-tab.js:115 -msgid "New password" -msgstr "" - -#: ../public/js/plugins/users-tab.js:121 -msgid "Change" -msgstr "" - -#: ../public/js/plugins/users-tab.js:129 ../public/js/plugins/groups-tab.js:87 -msgid "Please add/edit/remove quotas and click on the apply changes button. Note that if several items are selected, changes will be applied to each of them" -msgstr "" - -#: ../public/js/plugins/users-tab.js:130 ../public/js/plugins/groups-tab.js:88 -msgid "Add quota" -msgstr "" - -#: ../public/js/plugins/users-tab.js:132 ../public/js/plugins/groups-tab.js:90 -msgid "Quota type" -msgstr "" - -#: ../public/js/plugins/users-tab.js:133 ../public/js/plugins/groups-tab.js:91 -msgid "Virtual Machine" -msgstr "" - -#: ../public/js/plugins/users-tab.js:134 ../public/js/plugins/users-tab.js:147 -#: ../public/js/plugins/images-tab.js:32 ../public/js/plugins/images-tab.js:75 -#: ../public/js/plugins/images-tab.js:174 -#: ../public/js/plugins/images-tab.js:621 -#: ../public/js/plugins/datastores-tab.js:127 -#: ../public/js/plugins/groups-tab.js:92 -#: ../public/js/plugins/groups-tab.js:105 -#: ../public/js/plugins/dashboard-users-tab.js:149 -msgid "Datastore" -msgstr "" - -#: ../public/js/plugins/users-tab.js:135 ../public/js/plugins/users-tab.js:155 -#: ../public/js/plugins/images-tab.js:609 -#: ../public/js/plugins/templates-tab.js:203 -#: ../public/js/plugins/templates-tab.js:208 -#: ../public/js/plugins/groups-tab.js:93 -#: ../public/js/plugins/groups-tab.js:113 -#: ../public/js/plugins/dashboard-users-tab.js:178 -msgid "Image" -msgstr "" - -#: ../public/js/plugins/users-tab.js:136 ../public/js/plugins/users-tab.js:161 -#: ../public/js/plugins/templates-tab.js:262 -#: ../public/js/plugins/templates-tab.js:273 -#: ../public/js/plugins/groups-tab.js:94 -#: ../public/js/plugins/groups-tab.js:119 -#: ../public/js/plugins/dashboard-users-tab.js:193 -msgid "Network" -msgstr "" - -#: ../public/js/plugins/users-tab.js:139 ../public/js/plugins/groups-tab.js:97 -msgid "Max VMs" -msgstr "" - -#: ../public/js/plugins/users-tab.js:141 ../public/js/plugins/groups-tab.js:99 -msgid "Max Memory (MB)" -msgstr "" - -#: ../public/js/plugins/users-tab.js:143 -#: ../public/js/plugins/groups-tab.js:101 -msgid "Max CPU" -msgstr "" - -#: ../public/js/plugins/users-tab.js:149 -#: ../public/js/plugins/groups-tab.js:107 -msgid "Max size (MB)" -msgstr "" - -#: ../public/js/plugins/users-tab.js:151 -#: ../public/js/plugins/groups-tab.js:109 -msgid "Max images" -msgstr "" - -#: ../public/js/plugins/users-tab.js:157 -#: ../public/js/plugins/groups-tab.js:115 -msgid "Max RVMs" -msgstr "" - -#: ../public/js/plugins/users-tab.js:163 -#: ../public/js/plugins/groups-tab.js:121 -msgid "Max leases" -msgstr "" - -#: ../public/js/plugins/users-tab.js:166 -#: ../public/js/plugins/groups-tab.js:124 -msgid "Add/edit quota" -msgstr "" - -#: ../public/js/plugins/users-tab.js:172 ../public/js/plugins/vms-tab.js:1165 -#: ../public/js/plugins/vms-tab.js:1190 ../public/js/plugins/images-tab.js:34 -#: ../public/js/plugins/images-tab.js:83 -#: ../public/js/plugins/images-tab.js:633 -#: ../public/js/plugins/templates-tab.js:215 -#: ../public/js/plugins/templates-tab.js:375 -#: ../public/js/plugins/vnets-tab.js:33 ../public/js/plugins/groups-tab.js:130 -msgid "Type" -msgstr "" - -#: ../public/js/plugins/users-tab.js:173 -#: ../public/js/plugins/groups-tab.js:131 -msgid "Quota" -msgstr "" - -#: ../public/js/plugins/users-tab.js:174 -#: ../public/js/plugins/groups-tab.js:132 -msgid "Edit" -msgstr "" - -#: ../public/js/plugins/users-tab.js:180 -#: ../public/js/plugins/groups-tab.js:137 -msgid "Apply changes" -msgstr "" - -#: ../public/js/plugins/users-tab.js:235 -msgid "Change password successful" -msgstr "" - -#: ../public/js/plugins/users-tab.js:365 -#: ../public/js/plugins/groups-tab.js:235 -msgid "Quotas updated correctly" -msgstr "" - -#: ../public/js/plugins/users-tab.js:402 ../public/js/plugins/vms-tab.js:508 -#: ../public/js/plugins/images-tab.js:454 -#: ../public/js/plugins/templates-tab.js:778 -#: ../public/js/plugins/datastores-tab.js:314 -#: ../public/js/plugins/vnets-tab.js:439 -#: ../public/js/plugins/clusters-tab.js:224 -msgid "Update properties" -msgstr "" - -#: ../public/js/plugins/users-tab.js:407 ../public/js/plugins/users-tab.js:813 -msgid "Change password" -msgstr "" - -#: ../public/js/plugins/users-tab.js:411 -#: ../public/js/plugins/groups-tab.js:279 -msgid "Update quotas" -msgstr "" - -#: ../public/js/plugins/users-tab.js:416 ../public/js/plugins/vms-tab.js:522 -#: ../public/js/plugins/images-tab.js:466 -#: ../public/js/plugins/templates-tab.js:794 -#: ../public/js/plugins/datastores-tab.js:334 -#: ../public/js/plugins/vnets-tab.js:459 -msgid "Change group" -msgstr "" - -#: ../public/js/plugins/users-tab.js:418 -msgid "This will change the main group of the selected users. Select the new group" -msgstr "" - -#: ../public/js/plugins/users-tab.js:423 -msgid "Change authentication" -msgstr "" - -#: ../public/js/plugins/users-tab.js:431 -msgid "Please choose the new type of authentication for the selected users" -msgstr "" - -#: ../public/js/plugins/users-tab.js:450 ../public/js/plugins/acls-tab.js:169 -#: ../public/js/plugins/vms-tab.js:619 ../public/js/plugins/images-tab.js:498 -#: ../public/js/plugins/templates-tab.js:805 -#: ../public/js/plugins/datastores-tab.js:341 -#: ../public/js/plugins/vnets-tab.js:467 -#: ../public/js/plugins/clusters-tab.js:229 -#: ../public/js/plugins/groups-tab.js:284 -msgid "Delete" -msgstr "" - -#: ../public/js/plugins/users-tab.js:463 ../public/js/plugins/users-tab.js:623 -#: ../public/js/plugins/users-tab.js:627 -msgid "User information" -msgstr "" - -#: ../public/js/plugins/users-tab.js:467 ../public/js/plugins/users-tab.js:673 -#: ../public/js/plugins/users-tab.js:844 -#: ../public/js/plugins/dashboard-users-tab.js:25 -msgid "User quotas" -msgstr "" - -#: ../public/js/plugins/users-tab.js:471 ../public/js/plugins/users-tab.js:678 -#: ../public/js/plugins/groups-tab.js:300 -#: ../public/js/plugins/groups-tab.js:472 -msgid "Historical usages" -msgstr "" - -#: ../public/js/plugins/users-tab.js:486 -msgid "User info" -msgstr "" - -#: ../public/js/plugins/users-tab.js:645 -msgid "User template" -msgstr "" - -#: ../public/js/plugins/users-tab.js:681 -#: ../public/js/plugins/groups-tab.js:475 -msgid "From / to" -msgstr "" - -#: ../public/js/plugins/users-tab.js:685 ../public/js/plugins/vms-tab.js:169 -#: ../public/js/plugins/images-tab.js:235 -#: ../public/js/plugins/templates-tab.js:605 -#: ../public/js/plugins/datastores-tab.js:134 -#: ../public/js/plugins/vnets-tab.js:210 -#: ../public/js/plugins/groups-tab.js:479 ../public/js/sunstone-util.js:746 -msgid "Update" -msgstr "" - -#: ../public/js/plugins/users-tab.js:690 -#: ../public/js/plugins/groups-tab.js:484 -msgid "Meters" -msgstr "" - -#: ../public/js/plugins/users-tab.js:765 -msgid "Create user" -msgstr "" - -#: ../public/js/plugins/users-tab.js:796 -msgid "User name and password must be filled in" -msgstr "" - -#: ../public/js/plugins/users-tab.js:831 -msgid "Fill in a new password" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:22 -msgid "Access Control Lists" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:31 -msgid "Applies to" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:32 ../public/js/plugins/acls-tab.js:56 -msgid "Affected resources" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:33 -msgid "Resource ID / Owned by" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:34 ../public/js/plugins/acls-tab.js:79 -msgid "Allowed operations" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:35 -msgid "ACL String" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:44 -msgid "This table shows the ACLs rules broken down to easier the reading and meaning of each one. You can show the ACL original string by clicking on Show/Hide columns." -msgstr "" - -#: ../public/js/plugins/acls-tab.js:53 -msgid "This rule applies to" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:58 ../public/js/plugins/acls-tab.js:290 -#: ../public/js/plugins/dashboard-tab.js:75 -#: ../public/js/plugins/infra-tab.js:30 -#: ../public/js/plugins/clusters-tab.js:21 -#: ../public/js/plugins/clusters-tab.js:253 -msgid "Clusters" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:59 ../public/js/plugins/acls-tab.js:293 -#: ../public/js/plugins/datastores-tab.js:21 -#: ../public/js/plugins/datastores-tab.js:364 -#: ../public/js/plugins/infra-tab.js:38 -#: ../public/js/plugins/clusters-tab.js:33 -#: ../public/js/plugins/clusters-tab.js:604 -#: ../public/js/plugins/clusters-tab.js:712 -#: ../public/js/plugins/clusters-tab.js:814 -msgid "Datastores" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:60 ../public/js/plugins/acls-tab.js:272 -#: ../public/js/plugins/dashboard-tab.js:109 -#: ../public/js/plugins/vms-tab.js:61 ../public/js/plugins/vms-tab.js:658 -#: ../public/js/plugins/dashboard-users-tab.js:43 -#: ../public/js/plugins/dashboard-users-tab.js:111 -msgid "Virtual Machines" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:61 ../public/js/plugins/acls-tab.js:275 -#: ../public/js/plugins/vresources-tab.js:43 -#: ../public/js/plugins/vnets-tab.js:20 ../public/js/plugins/vnets-tab.js:489 -#: ../public/js/plugins/infra-tab.js:42 -#: ../public/js/plugins/clusters-tab.js:32 -#: ../public/js/plugins/clusters-tab.js:617 -#: ../public/js/plugins/clusters-tab.js:728 -#: ../public/js/plugins/clusters-tab.js:821 -msgid "Virtual Networks" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:62 ../public/js/plugins/acls-tab.js:278 -#: ../public/js/plugins/images-tab.js:20 -#: ../public/js/plugins/images-tab.js:521 -#: ../public/js/plugins/vresources-tab.js:47 -#: ../public/js/plugins/datastores-tab.js:495 -msgid "Images" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:63 -#: ../public/js/plugins/templates-tab.js:20 -#: ../public/js/plugins/templates-tab.js:823 -msgid "Templates" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:65 ../public/js/plugins/acls-tab.js:287 -#: ../public/js/plugins/acls-tab.js:497 ../public/js/plugins/system-tab.js:30 -#: ../public/js/plugins/groups-tab.js:42 -#: ../public/js/plugins/groups-tab.js:306 -msgid "Groups" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:66 ../public/js/plugins/acls-tab.js:296 -msgid "Documents" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:68 -msgid "Resource subset" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:70 -msgid "Specific ID" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:71 -msgid "Owned by group" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:73 -msgid "Resource ID" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:80 ../public/js/plugins/vms-tab.js:138 -#: ../public/js/plugins/images-tab.js:206 -#: ../public/js/plugins/templates-tab.js:575 -#: ../public/js/plugins/datastores-tab.js:104 -#: ../public/js/plugins/vnets-tab.js:180 -msgid "Use" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:81 ../public/js/plugins/vms-tab.js:139 -#: ../public/js/plugins/images-tab.js:207 -#: ../public/js/plugins/templates-tab.js:576 -#: ../public/js/plugins/datastores-tab.js:105 -#: ../public/js/plugins/vnets-tab.js:181 -msgid "Manage" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:82 -msgid "Administrate" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:85 -msgid "ACL String preview" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:179 -msgid "ACLs" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:219 -msgid "User" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:223 -msgid "Group " -msgstr "" - -#: ../public/js/plugins/acls-tab.js:281 -#: ../public/js/plugins/vresources-tab.js:30 -msgid "VM Templates" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:351 -msgid "Create ACL" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:442 -msgid "Please specify to who this ACL applies" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:448 -msgid "Please select at least one resource" -msgstr "" - -#: ../public/js/plugins/acls-tab.js:457 -msgid "Please provide a resource ID for the resource(s) in this rule" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:30 -msgid "Total Hosts" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:39 -msgid "Global CPU Usage" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:47 -#: ../public/js/plugins/clusters-tab.js:560 -#: ../public/js/plugins/clusters-tab.js:667 -msgid "Used vs. Max CPU" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:57 -#: ../public/js/plugins/clusters-tab.js:570 -#: ../public/js/plugins/clusters-tab.js:677 -msgid "Used vs. Max Memory" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:81 -msgid "Allocated CPU per cluster" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:89 -msgid "Allocated Memory per cluster" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:114 -#: ../public/js/plugins/dashboard-users-tab.js:48 -msgid "Total VMs" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:124 -#: ../public/js/plugins/dashboard-users-tab.js:58 -msgid "Bandwidth - Upload" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:125 -#: ../public/js/plugins/dashboard-users-tab.js:59 -msgid "Bandwidth - Download" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:133 -#: ../public/js/plugins/dashboard-users-tab.js:67 -msgid "Global transfer rates" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:150 -msgid "System Information" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:155 -msgid "Total Users" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:156 -msgid "Total Groups" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:165 -msgid "Users per group" -msgstr "" - -#: ../public/js/plugins/dashboard-tab.js:182 +#: ../public/js/plugins/dashboard-tab.js:24 +#: ../public/js/plugins/dashboard-tab.js:174 #: ../public/js/plugins/dashboard-users-tab.js:86 msgid "Dashboard" msgstr "" -#: ../public/js/plugins/vms-tab.js:38 -msgid "Network transmission" +#: ../public/js/plugins/dashboard-tab.js:40 +#: ../public/js/plugins/templates-tab.js:1630 +#: ../public/js/plugins/vms-tab.js:1321 +msgid "Storage" msgstr "" -#: ../public/js/plugins/vms-tab.js:44 -msgid "Network reception" +#: ../public/js/plugins/dashboard-tab.js:46 +msgid "IMAGES" msgstr "" -#: ../public/js/plugins/vms-tab.js:70 ../public/js/plugins/vms-tab.js:142 -#: ../public/js/plugins/vms-tab.js:980 ../public/js/plugins/vms-tab.js:1009 -#: ../public/js/plugins/images-tab.js:29 -#: ../public/js/plugins/images-tab.js:210 -#: ../public/js/plugins/images-tab.js:625 -#: ../public/js/plugins/images-tab.js:670 -#: ../public/js/plugins/templates-tab.js:29 -#: ../public/js/plugins/templates-tab.js:579 -#: ../public/js/plugins/templates-tab.js:926 -#: ../public/js/plugins/templates-tab.js:939 -#: ../public/js/plugins/datastores-tab.js:30 -#: ../public/js/plugins/datastores-tab.js:108 -#: ../public/js/plugins/datastores-tab.js:471 -#: ../public/js/plugins/datastores-tab.js:500 -#: ../public/js/plugins/vnets-tab.js:29 ../public/js/plugins/vnets-tab.js:184 -#: ../public/js/plugins/vnets-tab.js:585 ../public/js/plugins/vnets-tab.js:610 -msgid "Owner" +#: ../public/js/plugins/dashboard-tab.js:48 +msgid "USED" msgstr "" -#: ../public/js/plugins/vms-tab.js:75 ../public/js/plugins/vms-tab.js:1036 -msgid "Used Memory" +#: ../public/js/plugins/dashboard-tab.js:63 +msgid "USERS" msgstr "" -#: ../public/js/plugins/vms-tab.js:76 ../public/js/plugins/vms-tab.js:891 -#: ../public/js/plugins/vms-tab.js:996 -msgid "Host" +#: ../public/js/plugins/dashboard-tab.js:65 +msgid "GROUPS" msgstr "" -#: ../public/js/plugins/vms-tab.js:77 -msgid "IPs" +#: ../public/js/plugins/dashboard-tab.js:74 +#: ../public/js/plugins/dashboard-users-tab.js:193 +#: ../public/js/plugins/groups-tab.js:131 +#: ../public/js/plugins/groups-tab.js:231 +#: ../public/js/plugins/templates-tab.js:1699 +#: ../public/js/plugins/templates-tab.js:2346 +#: ../public/js/plugins/users-tab.js:205 ../public/js/plugins/users-tab.js:305 +#: ../public/js/plugins/vms-tab.js:1326 ../public/js/plugins/vms-tab.js:2126 +msgid "Network" msgstr "" -#: ../public/js/plugins/vms-tab.js:78 -msgid "Start Time" +#: ../public/js/plugins/dashboard-tab.js:80 +msgid "VNETS" msgstr "" -#: ../public/js/plugins/vms-tab.js:79 -msgid "VNC Access" +#: ../public/js/plugins/dashboard-tab.js:82 +#: ../public/js/plugins/vnets-tab.js:30 +msgid "ADDRESSES" msgstr "" -#: ../public/js/plugins/vms-tab.js:88 -msgid "CPU, Memory and Start time are hidden columns by default. You can get monitoring graphs by clicking on the desired VM and visiting the monitoring information tab." +#: ../public/js/plugins/dashboard-tab.js:100 +#: ../public/js/plugins/dashboard-tab.js:139 +#: ../public/js/plugins/files-tab.js:29 ../public/js/plugins/groups-tab.js:51 +#: ../public/js/plugins/hosts-tab.js:31 ../public/js/plugins/images-tab.js:29 +#: ../public/js/plugins/users-tab.js:54 ../public/js/plugins/vms-tab.js:47 +#: ../public/js/plugins/vnets-tab.js:29 +msgid "TOTAL" msgstr "" -#: ../public/js/plugins/vms-tab.js:91 -msgid "VNC console requires previous install of the noVNC addon. Check Sunstone documentation for more information." +#: ../public/js/plugins/dashboard-tab.js:102 +#: ../public/js/plugins/hosts-tab.js:32 ../public/js/plugins/hosts-tab.js:687 +msgid "ON" msgstr "" -#: ../public/js/plugins/vms-tab.js:94 -msgid "You can hotplug and detach existing disks from running VMs from the Disks & Hotplugging tab in the VM information dialog." +#: ../public/js/plugins/dashboard-tab.js:104 +#: ../public/js/plugins/hosts-tab.js:33 ../public/js/plugins/hosts-tab.js:694 +#: ../public/js/plugins/hosts-tab.js:724 ../public/js/plugins/vms-tab.js:49 +msgid "OFF" msgstr "" -#: ../public/js/plugins/vms-tab.js:103 -msgid "VM Name" +#: ../public/js/plugins/dashboard-tab.js:106 +#: ../public/js/plugins/hosts-tab.js:34 ../public/js/plugins/hosts-tab.js:690 +#: ../public/js/plugins/hosts-tab.js:724 +msgid "ERROR" msgstr "" -#: ../public/js/plugins/vms-tab.js:105 -msgid "Defaults to template name when emtpy" +#: ../public/js/plugins/dashboard-tab.js:111 +#: ../public/js/plugins/dashboard-users-tab.js:140 +#: ../public/js/plugins/groups-tab.js:23 +#: ../public/js/plugins/groups-tab.js:568 +#: ../public/js/plugins/hosts-tab.js:885 +#: ../public/js/plugins/templates-tab.js:522 +#: ../public/js/plugins/users-tab.js:25 ../public/js/plugins/users-tab.js:85 +#: ../public/js/plugins/users-tab.js:802 ../public/js/plugins/vms-tab.js:2376 +msgid "CPU" msgstr "" -#: ../public/js/plugins/vms-tab.js:108 -msgid "Select template" +#: ../public/js/plugins/dashboard-tab.js:118 +#: ../public/js/plugins/hosts-tab.js:898 +#: ../public/js/plugins/templates-tab.js:538 +#: ../public/js/plugins/vms-tab.js:2378 +msgid "MEMORY" msgstr "" -#: ../public/js/plugins/vms-tab.js:113 -msgid "Deploy # VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:115 -msgid "You can use the wildcard %i. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:129 -msgid "Please, choose and modify the virtual machine you want to update" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:131 -msgid "Select a VM" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:137 ../public/js/plugins/images-tab.js:205 -#: ../public/js/plugins/images-tab.js:668 -#: ../public/js/plugins/templates-tab.js:574 -#: ../public/js/plugins/templates-tab.js:937 -#: ../public/js/plugins/datastores-tab.js:103 -#: ../public/js/plugins/datastores-tab.js:498 -#: ../public/js/plugins/vnets-tab.js:179 ../public/js/plugins/vnets-tab.js:608 -msgid "Permissions" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:140 ../public/js/plugins/images-tab.js:208 -#: ../public/js/plugins/templates-tab.js:577 -#: ../public/js/plugins/datastores-tab.js:106 -#: ../public/js/plugins/vnets-tab.js:182 -msgid "Admin" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:154 ../public/js/plugins/vms-tab.js:1017 -#: ../public/js/plugins/images-tab.js:222 -#: ../public/js/plugins/images-tab.js:678 -#: ../public/js/plugins/templates-tab.js:591 -#: ../public/js/plugins/templates-tab.js:947 -#: ../public/js/plugins/datastores-tab.js:120 -#: ../public/js/plugins/datastores-tab.js:508 -#: ../public/js/plugins/vnets-tab.js:196 ../public/js/plugins/vnets-tab.js:618 -msgid "Other" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:161 ../public/js/plugins/images-tab.js:229 -#: ../public/js/plugins/templates-tab.js:598 -#: ../public/js/plugins/templates-tab.js:914 -#: ../public/js/plugins/templates-tab.js:953 -#: ../public/js/plugins/templates-tab.js:955 -#: ../public/js/plugins/vnets-tab.js:203 -msgid "Template" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:514 ../public/js/plugins/images-tab.js:459 -#: ../public/js/plugins/templates-tab.js:787 -#: ../public/js/plugins/datastores-tab.js:327 -#: ../public/js/plugins/vnets-tab.js:451 -msgid "Change owner" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:516 ../public/js/plugins/images-tab.js:461 -#: ../public/js/plugins/templates-tab.js:789 -#: ../public/js/plugins/datastores-tab.js:329 -#: ../public/js/plugins/vnets-tab.js:453 -msgid "Select the new owner" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:524 ../public/js/plugins/images-tab.js:468 -#: ../public/js/plugins/templates-tab.js:796 -#: ../public/js/plugins/datastores-tab.js:336 -#: ../public/js/plugins/vnets-tab.js:461 -msgid "Select the new group" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:530 -msgid "Shutdown" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:531 -msgid "This will initiate the shutdown process in the selected VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:539 -msgid "Deploy" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:540 -msgid "This will deploy the selected VMs on the chosen host" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:546 -msgid "Migrate" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:547 -msgid "This will migrate the selected VMs to the chosen host" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:554 -msgid "Live migrate" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:555 -msgid "This will live-migrate the selected VMs to the chosen host" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:561 ../public/js/plugins/vnets-tab.js:671 -msgid "Hold" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:562 -msgid "This will hold selected pending VMs from being deployed" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:566 -msgid "Release" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:567 -msgid "This will release held machines" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:571 -msgid "Suspend" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:572 -msgid "This will suspend selected machines" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:576 -msgid "Resume" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:577 -msgid "This will resume selected stopped or suspended VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:581 -msgid "Stop" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:582 -msgid "This will stop selected VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:586 -msgid "Restart" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:587 -msgid "This will redeploy selected VMs (in UNKNOWN or BOOT state)" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:591 -msgid "Resubmit" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:592 -msgid "This will resubmits VMs to PENDING state" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:596 -msgid "Power Off" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:597 -msgid "This will send a power off signal to running VMs. They can be restarted later." -msgstr "" - -#: ../public/js/plugins/vms-tab.js:601 -msgid "Reboot" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:602 -msgid "This will send a reboot action to running VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:607 -msgid "This will perform a hard reboot on selected VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:611 ../public/js/sunstone.js:664 -#: ../public/js/sunstone.js:696 -msgid "Cancel" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:612 -msgid "This will cancel selected VMs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:620 -msgid "This will delete the selected VMs from the database" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:632 ../public/js/plugins/vms-tab.js:968 -msgid "Virtual Machine information" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:636 ../public/js/plugins/vms-tab.js:1052 -msgid "Disks & Hotplugging" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:640 ../public/js/plugins/vms-tab.js:1060 -msgid "VM template" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:644 ../public/js/plugins/vms-tab.js:1066 -msgid "VM log" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:648 ../public/js/plugins/vms-tab.js:1076 -msgid "History information" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:815 ../public/js/plugins/vms-tab.js:823 -#: ../public/js/plugins/vms-tab.js:955 +#: ../public/js/plugins/dashboard-tab.js:141 +#: ../public/js/plugins/vms-tab.js:48 ../public/js/plugins/vms-tab.js:991 +#: ../public/js/plugins/vms-tab.js:1009 ../public/js/plugins/vms-tab.js:1021 +#: ../public/js/plugins/vms-tab.js:1206 msgid "ACTIVE" msgstr "" -#: ../public/js/plugins/vms-tab.js:815 ../public/js/plugins/vms-tab.js:955 -msgid "SUSPENDED" +#: ../public/js/plugins/dashboard-tab.js:143 +#: ../public/js/plugins/vms-tab.js:50 ../public/js/plugins/vms-tab.js:1002 +msgid "PENDING" msgstr "" -#: ../public/js/plugins/vms-tab.js:890 -msgid "Sequence" +#: ../public/js/plugins/dashboard-tab.js:145 +#: ../public/js/plugins/vms-tab.js:51 ../public/js/plugins/vms-tab.js:1006 +msgid "FAILED" msgstr "" -#: ../public/js/plugins/vms-tab.js:892 -msgid "Reason" +#: ../public/js/plugins/dashboard-tab.js:150 +#: ../public/js/plugins/vms-tab.js:2220 +msgid "NET DOWNLOAD SPEED" msgstr "" -#: ../public/js/plugins/vms-tab.js:893 -msgid "State change time" +#: ../public/js/plugins/dashboard-tab.js:159 +#: ../public/js/plugins/vms-tab.js:2233 +msgid "NET UPLOAD SPEED" msgstr "" -#: ../public/js/plugins/vms-tab.js:894 -msgid "Total time" +#: ../public/js/plugins/dashboard-users-tab.js:25 +#: ../public/js/plugins/users-tab.js:569 +#: ../public/js/plugins/users-tab.js:1132 +msgid "User quotas" msgstr "" -#: ../public/js/plugins/vms-tab.js:895 -msgid "Prolog time" +#: ../public/js/plugins/dashboard-users-tab.js:48 +msgid "Total VMs" msgstr "" -#: ../public/js/plugins/vms-tab.js:964 -msgid "VM information" +#: ../public/js/plugins/dashboard-users-tab.js:49 +#: ../public/js/plugins/files-tab.js:568 ../public/js/plugins/hosts-tab.js:823 +#: ../public/js/plugins/images-tab.js:707 ../public/js/plugins/vms-tab.js:1249 +msgid "State" msgstr "" -#: ../public/js/plugins/vms-tab.js:992 -msgid "LCM State" +#: ../public/js/plugins/dashboard-users-tab.js:58 +msgid "Bandwidth - Upload" msgstr "" -#: ../public/js/plugins/vms-tab.js:1000 -msgid "Start time" +#: ../public/js/plugins/dashboard-users-tab.js:59 +msgid "Bandwidth - Download" msgstr "" -#: ../public/js/plugins/vms-tab.js:1004 -msgid "Deploy ID" +#: ../public/js/plugins/dashboard-users-tab.js:67 +msgid "Global transfer rates" msgstr "" -#: ../public/js/plugins/vms-tab.js:1028 -msgid "Net_TX" +#: ../public/js/plugins/dashboard-users-tab.js:127 +#: ../public/js/plugins/groups-tab.js:27 +#: ../public/js/plugins/groups-tab.js:567 ../public/js/plugins/users-tab.js:29 +#: ../public/js/plugins/users-tab.js:84 ../public/js/plugins/users-tab.js:801 +msgid "Memory" msgstr "" -#: ../public/js/plugins/vms-tab.js:1032 -msgid "Net_RX" +#: ../public/js/plugins/dashboard-users-tab.js:149 +#: ../public/js/plugins/datastores-tab.js:159 +#: ../public/js/plugins/datastores-tab.js:283 +#: ../public/js/plugins/datastores-tab.js:654 +#: ../public/js/plugins/files-tab.js:57 ../public/js/plugins/files-tab.js:160 +#: ../public/js/plugins/files-tab.js:532 +#: ../public/js/plugins/groups-tab.js:129 +#: ../public/js/plugins/groups-tab.js:172 +#: ../public/js/plugins/images-tab.js:57 +#: ../public/js/plugins/images-tab.js:244 +#: ../public/js/plugins/images-tab.js:270 +#: ../public/js/plugins/images-tab.js:671 +#: ../public/js/plugins/templates-tab.js:768 +#: ../public/js/plugins/templates-tab.js:1860 +#: ../public/js/plugins/templates-tab.js:1917 +#: ../public/js/plugins/templates-tab.js:2371 +#: ../public/js/plugins/users-tab.js:203 ../public/js/plugins/users-tab.js:246 +msgid "Datastore" msgstr "" -#: ../public/js/plugins/vms-tab.js:1044 -msgid "VNC Session" +#: ../public/js/plugins/dashboard-users-tab.js:154 +msgid "Storage size" msgstr "" -#: ../public/js/plugins/vms-tab.js:1057 -msgid "VM Template" +#: ../public/js/plugins/dashboard-users-tab.js:167 +msgid "Number of images" msgstr "" -#: ../public/js/plugins/vms-tab.js:1108 -#: ../public/js/plugins/templates-tab.js:1929 -msgid "DISABLED" +#: ../public/js/plugins/dashboard-users-tab.js:178 +#: ../public/js/plugins/groups-tab.js:130 +#: ../public/js/plugins/groups-tab.js:207 +#: ../public/js/plugins/images-tab.js:655 +#: ../public/js/plugins/templates-tab.js:747 +#: ../public/js/plugins/users-tab.js:204 ../public/js/plugins/users-tab.js:281 +msgid "Image" msgstr "" -#: ../public/js/plugins/vms-tab.js:1108 -#: ../public/js/plugins/templates-tab.js:1929 -msgid "LOCKED" +#: ../public/js/plugins/dashboard-users-tab.js:217 +msgid "VM quota" msgstr "" -#: ../public/js/plugins/vms-tab.js:1114 -msgid "Disks information - Save As and Detach" +#: ../public/js/plugins/dashboard-users-tab.js:219 +#: ../public/js/plugins/dashboard-users-tab.js:229 +#: ../public/js/plugins/dashboard-users-tab.js:239 +#: ../public/js/plugins/dashboard-users-tab.js:249 +msgid "None" msgstr "" -#: ../public/js/plugins/vms-tab.js:1128 -msgid "No disks to show" +#: ../public/js/plugins/dashboard-users-tab.js:227 +msgid "Datastore quotas" msgstr "" -#: ../public/js/plugins/vms-tab.js:1140 -msgid "Detach" +#: ../public/js/plugins/dashboard-users-tab.js:237 +msgid "Image quotas" msgstr "" -#: ../public/js/plugins/vms-tab.js:1142 ../public/js/plugins/vms-tab.js:1212 -msgid "Save" +#: ../public/js/plugins/dashboard-users-tab.js:247 +msgid "Network quotas" msgstr "" -#: ../public/js/plugins/vms-tab.js:1144 -msgid "Save_as name" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1162 -msgid "Attach disk to running VM" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1168 -msgid "Existing image" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1169 -msgid "Volatile disk" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1173 -msgid "Select image" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1180 ../public/js/plugins/images-tab.js:33 -#: ../public/js/plugins/images-tab.js:133 -#: ../public/js/plugins/marketplace-tab.js:179 -#: ../public/js/plugins/templates-tab.js:224 -msgid "Size" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1185 -#: ../public/js/plugins/marketplace-tab.js:108 -#: ../public/js/plugins/templates-tab.js:230 -msgid "Format" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1193 -msgid "swap" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1194 -msgid "fs" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1198 ../public/js/plugins/images-tab.js:97 -msgid "Device prefix" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1204 -msgid "Readonly" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1207 ../public/js/plugins/vms-tab.js:1215 -#: ../public/js/plugins/vnets-tab.js:78 -msgid "No" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1208 ../public/js/plugins/vms-tab.js:1216 -#: ../public/js/plugins/vnets-tab.js:77 -msgid "Yes" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1223 -msgid "Attach" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1289 -msgid "Please select an image to attach" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1315 -msgid "Create Virtual Machine" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1338 -msgid "You have not selected a template" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1377 -msgid "Update VM properties" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1517 -msgid "VNC connection" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1524 ../public/js/plugins/images-tab.js:997 -#: ../public/js/plugins/templates-tab.js:1971 -#: ../public/js/plugins/datastores-tab.js:623 -#: ../public/js/plugins/vnets-tab.js:1053 -msgid "Loading" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1532 -msgid "Canvas not supported." -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1584 -msgid "RUNNING" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1586 -msgid "Open VNC Session" -msgstr "" - -#: ../public/js/plugins/vms-tab.js:1589 -msgid "VNC Disabled" -msgstr "" - -#: ../public/js/plugins/images-tab.js:35 -#: ../public/js/plugins/templates-tab.js:32 -msgid "Registration time" -msgstr "" - -#: ../public/js/plugins/images-tab.js:36 ../public/js/plugins/images-tab.js:92 -#: ../public/js/plugins/images-tab.js:199 -#: ../public/js/plugins/images-tab.js:641 -msgid "Persistent" -msgstr "" - -#: ../public/js/plugins/images-tab.js:38 -msgid "#VMS" -msgstr "" - -#: ../public/js/plugins/images-tab.js:39 -#: ../public/js/plugins/images-tab.js:107 -#: ../public/js/plugins/templates-tab.js:235 -#: ../public/js/plugins/templates-tab.js:295 -msgid "Target" -msgstr "" - -#: ../public/js/plugins/images-tab.js:48 -msgid "Size and registration time are hidden colums. Note that persistent images can only be used by 1 VM. To change image datastore, please re-register the image." -msgstr "" - -#: ../public/js/plugins/images-tab.js:55 ../public/js/plugins/vnets-tab.js:52 -msgid "Wizard" -msgstr "" - -#: ../public/js/plugins/images-tab.js:56 -#: ../public/js/plugins/templates-tab.js:54 -#: ../public/js/plugins/vnets-tab.js:53 -msgid "Advanced mode" -msgstr "" - -#: ../public/js/plugins/images-tab.js:61 -#: ../public/js/plugins/templates-tab.js:67 -msgid "Fields marked with" -msgstr "" - -#: ../public/js/plugins/images-tab.js:62 -#: ../public/js/plugins/templates-tab.js:68 -msgid "are mandatory" -msgstr "" - -#: ../public/js/plugins/images-tab.js:67 -msgid "Name that the Image will get. Every image must have a unique name." -msgstr "" - -#: ../public/js/plugins/images-tab.js:70 -#: ../public/js/plugins/marketplace-tab.js:190 -msgid "Description" -msgstr "" - -#: ../public/js/plugins/images-tab.js:72 -msgid "Human readable description of the image for other users." -msgstr "" - -#: ../public/js/plugins/images-tab.js:78 -msgid "Select the datastore for this image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:85 -#: ../public/js/plugins/images-tab.js:544 -#: ../public/js/plugins/marketplace-tab.js:171 -msgid "OS" -msgstr "" - -#: ../public/js/plugins/images-tab.js:86 -#: ../public/js/plugins/images-tab.js:545 -msgid "CD-ROM" -msgstr "" - -#: ../public/js/plugins/images-tab.js:87 -#: ../public/js/plugins/images-tab.js:546 -msgid "Datablock" -msgstr "" - -#: ../public/js/plugins/images-tab.js:89 -msgid "Type of the image, explained in detail in the following section. If omitted, the default value is the one defined in oned.conf (install default is OS)." -msgstr "" - -#: ../public/js/plugins/images-tab.js:94 -msgid "Persistence of the image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:99 -msgid "Prefix for the emulated device this image will be mounted at. For instance, “hd”, “sd”. If omitted, the default value is the one defined in oned.conf (installation default is “hd”)." -msgstr "" - -#: ../public/js/plugins/images-tab.js:102 -#: ../public/js/plugins/templates-tab.js:240 -msgid "Driver" -msgstr "" - -#: ../public/js/plugins/images-tab.js:104 -msgid "Specific image mapping driver. KVM: raw, qcow2. XEN: tap:aio, file:" -msgstr "" - -#: ../public/js/plugins/images-tab.js:109 -msgid "Target on which the image will be mounted at. For example: hda, sdb..." -msgstr "" - -#: ../public/js/plugins/images-tab.js:114 -msgid "Image location" -msgstr "" - -#: ../public/js/plugins/images-tab.js:117 -msgid "Provide a path" -msgstr "" - -#: ../public/js/plugins/images-tab.js:120 -msgid "Upload" -msgstr "" - -#: ../public/js/plugins/images-tab.js:123 -msgid "Create an empty datablock" -msgstr "" - -#: ../public/js/plugins/images-tab.js:124 -msgid "Please choose path if you have a file-based image. Otherwise upload or create an empty datablock disk." -msgstr "" - -#: ../public/js/plugins/images-tab.js:128 -#: ../public/js/plugins/images-tab.js:649 -msgid "Path" -msgstr "" - -#: ../public/js/plugins/images-tab.js:130 -msgid "Path to the original file that will be copied to the image repository. If not specified for a DATABLOCK type image, an empty image will be created." -msgstr "" - -#: ../public/js/plugins/images-tab.js:135 -msgid "Size of the datablock in MB." -msgstr "" - -#: ../public/js/plugins/images-tab.js:138 -msgid "FS type" -msgstr "" - -#: ../public/js/plugins/images-tab.js:140 -msgid "Type of file system to be built. This can be any value understood by mkfs unix command." -msgstr "" - -#: ../public/js/plugins/images-tab.js:143 -msgid "Upload file" -msgstr "" - -#: ../public/js/plugins/images-tab.js:152 -#: ../public/js/plugins/templates-tab.js:455 -#: ../public/js/plugins/templates-tab.js:520 -#: ../public/js/plugins/vnets-tab.js:130 -msgid "Value" -msgstr "" - -#: ../public/js/plugins/images-tab.js:154 -#: ../public/js/plugins/templates-tab.js:245 -#: ../public/js/plugins/templates-tab.js:357 -#: ../public/js/plugins/templates-tab.js:392 -#: ../public/js/plugins/templates-tab.js:460 -#: ../public/js/plugins/templates-tab.js:525 -#: ../public/js/plugins/vnets-tab.js:98 ../public/js/plugins/vnets-tab.js:132 -#: ../public/js/plugins/vnets-tab.js:676 -msgid "Add" -msgstr "" - -#: ../public/js/plugins/images-tab.js:155 -#: ../public/js/plugins/templates-tab.js:246 -#: ../public/js/plugins/templates-tab.js:358 -#: ../public/js/plugins/templates-tab.js:393 -#: ../public/js/plugins/templates-tab.js:461 -#: ../public/js/plugins/templates-tab.js:526 -#: ../public/js/plugins/vnets-tab.js:101 ../public/js/plugins/vnets-tab.js:133 -msgid "Remove selected" -msgstr "" - -#: ../public/js/plugins/images-tab.js:157 -#: ../public/js/plugins/vnets-tab.js:135 -msgid "Custom attributes" -msgstr "" - -#: ../public/js/plugins/images-tab.js:173 -msgid "Write the image template here" -msgstr "" - -#: ../public/js/plugins/images-tab.js:193 -msgid "Please, choose and modify the image you want to update" -msgstr "" - -#: ../public/js/plugins/images-tab.js:195 -msgid "Select an image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:324 -msgid "Image updated correctly" -msgstr "" - -#: ../public/js/plugins/images-tab.js:484 -msgid "Make persistent" -msgstr "" - -#: ../public/js/plugins/images-tab.js:488 -msgid "Make non persistent" -msgstr "" - -#: ../public/js/plugins/images-tab.js:494 -#: ../public/js/plugins/images-tab.js:1143 -#: ../public/js/plugins/templates-tab.js:801 -#: ../public/js/plugins/templates-tab.js:2062 -msgid "Clone" -msgstr "" - -#: ../public/js/plugins/images-tab.js:509 -#: ../public/js/plugins/images-tab.js:605 -msgid "Image information" -msgstr "" - -#: ../public/js/plugins/images-tab.js:514 -#: ../public/js/plugins/images-tab.js:685 -#: ../public/js/plugins/images-tab.js:687 -msgid "Image template" -msgstr "" - -#: ../public/js/plugins/images-tab.js:610 -#: ../public/js/plugins/templates-tab.js:915 -#: ../public/js/plugins/vnets-tab.js:570 -msgid "information" -msgstr "" - -#: ../public/js/plugins/images-tab.js:637 -#: ../public/js/plugins/templates-tab.js:934 -msgid "Register time" -msgstr "" - -#: ../public/js/plugins/images-tab.js:642 -msgid "yes" -msgstr "" - -#: ../public/js/plugins/images-tab.js:642 -msgid "no" -msgstr "" - -#: ../public/js/plugins/images-tab.js:645 -msgid "Source" -msgstr "" - -#: ../public/js/plugins/images-tab.js:653 -msgid "Filesystem type" -msgstr "" - -#: ../public/js/plugins/images-tab.js:657 -msgid "Size (Mb)" -msgstr "" - -#: ../public/js/plugins/images-tab.js:665 -msgid "Running #VMS" -msgstr "" - -#: ../public/js/plugins/images-tab.js:701 -msgid "Create Image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:765 -msgid "Custom attribute name and value must be filled in" -msgstr "" - -#: ../public/js/plugins/images-tab.js:818 -msgid "Uploading..." -msgstr "" - -#: ../public/js/plugins/images-tab.js:857 -msgid "There are mandatory parameters missing" -msgstr "" - -#: ../public/js/plugins/images-tab.js:866 -#: ../public/js/plugins/images-tab.js:942 -msgid "Please select a datastore for this image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:973 -msgid "Update image properties" -msgstr "" - -#: ../public/js/plugins/images-tab.js:1070 -#: ../public/js/plugins/templates-tab.js:200 -#: ../public/js/plugins/templates-tab.js:412 ../public/js/sunstone-util.js:585 -#: ../public/js/sunstone-util.js:807 -msgid "Please select" -msgstr "" - -#: ../public/js/plugins/images-tab.js:1129 -msgid "Clone an image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:1135 -msgid "Choose a new name for the image" -msgstr "" - -#: ../public/js/plugins/images-tab.js:1136 -msgid "Several image are selected, please choose prefix to name the new copies" -msgstr "" - -#: ../public/js/plugins/images-tab.js:1139 -#: ../public/js/plugins/templates-tab.js:2058 -msgid "Prefix" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:90 -msgid "Import to local infrastructure" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:95 -msgid "OpenNebula Marketplace" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:105 -#: ../public/js/plugins/marketplace-tab.js:163 -msgid "Publisher" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:106 -#: ../public/js/plugins/marketplace-tab.js:183 -msgid "Hypervisor" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:107 -#: ../public/js/plugins/marketplace-tab.js:175 -msgid "Arch" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:109 -msgid "Tags" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:119 -msgid "Marketplace" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:134 -#: ../public/js/plugins/marketplace-tab.js:147 -#: ../public/js/plugins/marketplace-tab.js:151 -msgid "Appliance information" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:159 -msgid "URL" -msgstr "" - -#: ../public/js/plugins/marketplace-tab.js:167 -msgid "Downloads" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:25 -msgid "Summary of virtual resources" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:35 -msgid "VM Instances" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:36 -msgid "total" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:37 -msgid "running" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:38 -msgid "failed" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:59 -#: ../public/js/plugins/system-tab.js:50 ../public/js/plugins/infra-tab.js:54 -msgid "Quickstart" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:62 -msgid "Create new Virtual Machine" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:63 -msgid "Create new VM Template" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:64 -msgid "Create new Image" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:77 -#: ../public/js/plugins/vresources-tab.js:96 -msgid "Virtual Resources" -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:79 -msgid "The Virtual Resources menu allows management of Virtual Machine Templates, Instances and storage (Images)." -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:80 -msgid "Virtual Machine templates can be instantiated as many times as you want. You can do it from the Templates tab or by creating a new VM in the VM tab. The second method allows you to customize the name and the number of VMs you want to launch." -msgstr "" - -#: ../public/js/plugins/vresources-tab.js:81 -#: ../public/js/plugins/system-tab.js:71 ../public/js/plugins/infra-tab.js:76 -msgid "You can find further information on the following links:" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:41 -msgid "Clicking `instantiate` will instantly create new Virtual Machines from the selected templates and name one-id. If you want to assign a specific name to a new VM, or launch several instances at once, use Virtual Machines->New button." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:44 -msgid "You can clone a template to obtain a copy from an existing template. This copy will be owned by you." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:51 -msgid "Wizard KVM" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:52 -msgid "Wizard XEN" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:53 -msgid "Wizard VMware" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:69 -msgid "Fold / Unfold all sections" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:75 -msgid "Capacity options" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:77 -msgid "Capacity" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:81 -msgid "Name that the VM will get for description purposes. If NAME is not supplied a name generated by one will be in the form of one-<VID>." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:86 -msgid "Amount of RAM required for the VM, in Megabytes." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:91 -msgid "Percentage of CPU divided by 100 required for the Virtual Machine. Half a processor is written 0.5." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:94 -msgid "VCPU" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:96 -msgid "Number of virtual cpus. This value is optional, the default hypervisor behavior is used, usually one virtual CPU." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:105 -msgid "Boot/OS options" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:107 -msgid "OS and Boot options" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:109 -msgid "Architecture" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:114 -msgid "CPU architecture to virtualization" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:119 -msgid "Boot method" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:122 -#: ../public/js/plugins/templates-tab.js:128 -msgid "Kernel" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:123 -#: ../public/js/plugins/templates-tab.js:148 -msgid "Bootloader" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:125 -msgid "Select boot method" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:130 -msgid "Path to the OS kernel to boot the image" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:133 -msgid "Initrd" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:135 -msgid "Path to the initrd image" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:138 -msgid "Root" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:140 -msgid "Device to be mounted as root" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:143 -msgid "Kernel commands" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:145 -msgid "Arguments for the booting kernel" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:150 -msgid "Path to the bootloader executable" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:153 -msgid "Boot" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:156 -msgid "Boot device type" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:165 -#: ../public/js/plugins/templates-tab.js:167 -msgid "Features" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:169 -msgid "PAE" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:171 -#: ../public/js/plugins/templates-tab.js:180 -#: ../public/js/plugins/vnets-tab.js:65 -msgid "Default" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:175 -msgid "Physical address extension mode allows 32-bit guests to address more than 4 GB of memory" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:178 -msgid "ACPI" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:184 -msgid "Useful for power management, for example, normally required for graceful shutdown to work" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:196 -msgid "Add disks/images" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:198 -msgid "Disks" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:201 -msgid "Volatile Disk" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:211 -msgid "Name of the image to use" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:217 -msgid "FS" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:218 -msgid "Swap" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:220 -#: ../public/js/plugins/datastores-tab.js:79 -msgid "Disk type" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:226 -msgid "Size in MB" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:232 -msgid "Filesystem type for the fs images" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:237 -msgid "Device to map image disk. If set, it will overwrite the default device mapping" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:242 -msgid "Specific image mapping driver. KVM: raw, qcow2. Xen:tap:aio:, file:. VMware unsupported" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:248 -msgid "Current disks" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:260 -msgid "Setup Networks" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:264 -msgid "Add network" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:265 -msgid "Predefined" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:267 -msgid "Manual" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:276 -msgid "Name of the network to attach this device" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:280 -msgid "IP" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:282 -msgid "Request an specific IP from the Network" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:285 -msgid "MAC" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:287 -msgid "HW address associated with the network interface" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:290 -#: ../public/js/plugins/vnets-tab.js:34 ../public/js/plugins/vnets-tab.js:71 -#: ../public/js/plugins/vnets-tab.js:593 -msgid "Bridge" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:292 -msgid "Name of the bridge the network device is going to be attached to" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:297 -msgid "Name for the tun device created for the VM" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:300 -msgid "Script" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:302 -msgid "Name of a shell script to be executed after creating the tun device for the VM" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:305 -msgid "Model" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:307 -msgid "Hardware that will emulate this network interface. With Xen this is the type attribute of the vif." -msgstr "" - -#: ../public/js/plugins/templates-tab.js:310 -msgid "TCP firewall mode" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:312 -#: ../public/js/plugins/templates-tab.js:331 -msgid "Optional, please select" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:313 -#: ../public/js/plugins/templates-tab.js:332 -msgid "Port whitelist" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:314 -#: ../public/js/plugins/templates-tab.js:333 -msgid "Port blacklist" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:319 -msgid "TCP white ports" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:321 -msgid "Permits access to the VM only through the specified ports in the TCP protocol" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:324 -msgid "TCP black ports" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:326 -msgid "Disallow access to the VM through the specified ports in the TCP protocol" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:329 -msgid "UDP firewall mode" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:338 -msgid "UDP white ports" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:340 -msgid "Permits access to the VM only through the specified ports in the UDP protocol" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:343 -msgid "UDP black ports" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:345 -msgid "Disallow access to the VM through the specified ports in the UDP protocol" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:348 -msgid "ICMP" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:350 -msgid "Accept (default)" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:351 -msgid "Drop" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:353 -msgid "ICMP policy" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:360 -msgid "Current NICs" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:371 -msgid "Add inputs" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:373 -msgid "Inputs" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:377 -msgid "Mouse" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:378 -msgid "Tablet" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:383 -msgid "Bus" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:385 -msgid "USB" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:386 -msgid "PS2" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:395 -msgid "Current inputs" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:406 -msgid "Add Graphics" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:408 -msgid "Graphics" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:410 -msgid "Graphics type" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:413 -msgid "VNC" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:414 -msgid "SDL" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:415 -msgid "SPICE" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:417 -msgid "VMware supports VNC only. SPICE is supported by KVM" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:420 -msgid "Listen IP" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:422 -msgid "IP to listen on" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:425 -msgid "Port" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:427 -msgid "Port for the VNC/SPICE server" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:432 -msgid "Password for the VNC/SPICE server" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:435 -msgid "Keymap" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:437 -msgid "Keyboard configuration locale to use in the VNC/SPICE display" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:446 -msgid "Add context variables" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:448 -msgid "Context" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:452 -msgid "Name for the context variable" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:457 -msgid "Value of the context variable" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:463 -#: ../public/js/plugins/templates-tab.js:528 -msgid "Current variables" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:474 -msgid "Add placement options" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:476 -msgid "Placement" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:478 -msgid "Requirements" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:480 -msgid "Boolean expression that rules out provisioning hosts from list of machines suitable to run this VM" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:483 -msgid "Rank" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:485 -msgid "This field sets which attribute will be used to sort the suitable hosts for this VM. Basically, it defines which hosts are more suitable than others" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:494 -msgid "Add Hypervisor raw options" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:496 -msgid "Raw" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:499 -msgid "Data" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:502 -msgid "Raw data to be passed directly to the hypervisor" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:511 -msgid "Add custom variables" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:513 -msgid "Custom variables" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:517 -msgid "Name for the custom variable" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:522 -msgid "Value of the custom variable" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:547 -msgid "Write the Virtual Machine template here" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:566 ../public/js/sunstone-util.js:736 -msgid "Please, choose and modify the template you want to update" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:568 ../public/js/sunstone-util.js:738 -#: ../public/js/sunstone-util.js:741 -msgid "Select a template" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:783 -msgid "Instantiate" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:817 -msgid "Template information" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:910 -msgid "Information" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1050 -msgid "hd" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1051 -msgid "fd" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1052 -msgid "cdrom" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1053 -msgid "network" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1057 -msgid "Driver default" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1076 -msgid "Please choose" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1130 -msgid "There are mandatory parameters missing in this section" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1654 -msgid "Context variable name and value must be filled in" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1705 -msgid "Custom variable name and value must be filled in" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1724 -msgid "Create VM Template" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1812 -msgid "There are mandatory fields missing in the capacity section" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1823 -msgid "Xen templates must specify a boot method" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1828 -msgid "There are mandatory fields missing in the OS Boot options section" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:1946 -msgid "Update template properties" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:2048 -msgid "Clone a template" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:2054 -msgid "Choose a new name for the template" -msgstr "" - -#: ../public/js/plugins/templates-tab.js:2055 -msgid "Several templates are selected, please choose prefix to name the new copies" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:34 -msgid "Basepath" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:35 -msgid "TM MAD" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:36 -msgid "DS MAD" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:37 -#: ../public/js/plugins/system-tab.js:88 -msgid "System" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:46 -msgid "Datatables are sets of images which share a common transfer driver. i.e. Images in a SSH datastore will be copied to the hosts using SSH when deploying a Virtual Machine." -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:57 -msgid "System datastore" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:63 -msgid "Datastore manager" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:65 -msgid "Filesystem" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:67 #: ../public/js/plugins/datastores-tab.js:75 -msgid "iSCSI" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:68 -msgid "LVM" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:69 -#: ../public/js/plugins/datastores-tab.js:77 -msgid "VMFS" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:71 -msgid "Transfer manager" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:73 -msgid "Shared" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:81 -msgid "File" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:82 -msgid "Block" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:95 -msgid "Please, choose and modify the datastore you want to update" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:97 -msgid "Select a datastore" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:219 -msgid "Datastore updated correctly" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:354 -#: ../public/js/plugins/datastores-tab.js:455 -#: ../public/js/plugins/datastores-tab.js:459 -msgid "Datastore information" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:358 -#: ../public/js/plugins/datastores-tab.js:519 -msgid "Datastore template" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:483 -msgid "DS Mad" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:487 -msgid "TM Mad" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:491 -msgid "Base path" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:516 -msgid "Datastore Template" -msgstr "" - -#: ../public/js/plugins/datastores-tab.js:532 +#: ../public/js/plugins/datastores-tab.js:758 msgid "Create Datastore" msgstr "" -#: ../public/js/plugins/datastores-tab.js:598 -msgid "Update Datastore properties" +#: ../public/js/plugins/datastores-tab.js:93 +msgid "Presets" msgstr "" -#: ../public/js/plugins/vnets-tab.js:35 -msgid "Total Leases" +#: ../public/js/plugins/datastores-tab.js:97 +#: ../public/js/plugins/datastores-tab.js:163 +msgid "Filesystem" msgstr "" -#: ../public/js/plugins/vnets-tab.js:44 -msgid "Tip: edit the leases of a network by clicking on one and going to the lease management tab." +#: ../public/js/plugins/datastores-tab.js:98 +msgid "VMware (FS Based)" msgstr "" -#: ../public/js/plugins/vnets-tab.js:63 -msgid "Network mode" +#: ../public/js/plugins/datastores-tab.js:99 +msgid "VMware (VMFS Based)" msgstr "" -#: ../public/js/plugins/vnets-tab.js:73 ../public/js/plugins/vnets-tab.js:601 -msgid "Physical device" +#: ../public/js/plugins/datastores-tab.js:100 +#: ../public/js/plugins/datastores-tab.js:165 +#: ../public/js/plugins/datastores-tab.js:183 +msgid "iSCSI" msgstr "" -#: ../public/js/plugins/vnets-tab.js:75 ../public/js/plugins/vnets-tab.js:597 -msgid "VLAN" +#: ../public/js/plugins/datastores-tab.js:101 +#: ../public/js/plugins/datastores-tab.js:166 +#: ../public/js/plugins/datastores-tab.js:185 +msgid "LVM" msgstr "" -#: ../public/js/plugins/vnets-tab.js:80 ../public/js/plugins/vnets-tab.js:605 -msgid "VLAN ID" +#: ../public/js/plugins/datastores-tab.js:102 +#: ../public/js/plugins/datastores-tab.js:168 +#: ../public/js/plugins/datastores-tab.js:187 +msgid "Ceph" msgstr "" -#: ../public/js/plugins/vnets-tab.js:84 -msgid "Network type" +#: ../public/js/plugins/datastores-tab.js:103 +#: ../public/js/plugins/hosts-tab.js:112 ../public/js/plugins/hosts-tab.js:134 +#: ../public/js/plugins/hosts-tab.js:157 ../public/js/plugins/users-tab.js:148 +msgid "Custom" msgstr "" -#: ../public/js/plugins/vnets-tab.js:85 -msgid "Fixed network" +#: ../public/js/plugins/datastores-tab.js:133 +#: ../public/js/plugins/templates-tab.js:2317 +msgid "Files" msgstr "" -#: ../public/js/plugins/vnets-tab.js:86 -msgid "Ranged network" +#: ../public/js/plugins/datastores-tab.js:140 +#: ../public/js/plugins/templates-tab.js:837 +msgid "Disk type" msgstr "" -#: ../public/js/plugins/vnets-tab.js:92 -msgid "Lease IP" +#: ../public/js/plugins/datastores-tab.js:144 +#: ../public/js/plugins/files-tab.js:516 +msgid "File" msgstr "" -#: ../public/js/plugins/vnets-tab.js:94 -msgid "Lease MAC (opt):" +#: ../public/js/plugins/datastores-tab.js:145 +msgid "Block" msgstr "" -#: ../public/js/plugins/vnets-tab.js:103 -msgid "Current leases" +#: ../public/js/plugins/datastores-tab.js:146 +msgid "RBD" msgstr "" -#: ../public/js/plugins/vnets-tab.js:111 -msgid "Network Address" +#: ../public/js/plugins/datastores-tab.js:156 +msgid "Managers" msgstr "" -#: ../public/js/plugins/vnets-tab.js:113 -msgid "Network Mask" +#: ../public/js/plugins/datastores-tab.js:164 +#: ../public/js/plugins/hosts-tab.js:109 ../public/js/plugins/hosts-tab.js:130 +#: ../public/js/plugins/hosts-tab.js:156 ../public/js/plugins/vnets-tab.js:215 +msgid "VMware" msgstr "" -#: ../public/js/plugins/vnets-tab.js:115 -msgid "Define a subnet by IP range" +#: ../public/js/plugins/datastores-tab.js:167 +#: ../public/js/plugins/datastores-tab.js:186 +msgid "VMFS" msgstr "" -#: ../public/js/plugins/vnets-tab.js:117 ../public/js/plugins/vnets-tab.js:658 -msgid "IP Start" +#: ../public/js/plugins/datastores-tab.js:176 +msgid "Transfer" msgstr "" -#: ../public/js/plugins/vnets-tab.js:119 ../public/js/plugins/vnets-tab.js:662 -msgid "IP End" +#: ../public/js/plugins/datastores-tab.js:180 +msgid "Shared" msgstr "" -#: ../public/js/plugins/vnets-tab.js:152 -msgid "Write the Virtual Network template here" +#: ../public/js/plugins/datastores-tab.js:181 +#: ../public/js/plugins/templates-tab.js:2325 +#: ../public/js/plugins/users-tab.js:145 ../public/js/plugins/users-tab.js:548 +msgid "SSH" msgstr "" -#: ../public/js/plugins/vnets-tab.js:171 -msgid "Please, choose and modify the virtual network you want to update" +#: ../public/js/plugins/datastores-tab.js:182 +msgid "qcow2" msgstr "" -#: ../public/js/plugins/vnets-tab.js:173 -msgid "Select a network" +#: ../public/js/plugins/datastores-tab.js:184 +#: ../public/js/plugins/hosts-tab.js:111 ../public/js/plugins/hosts-tab.js:133 +msgid "Dummy" msgstr "" -#: ../public/js/plugins/vnets-tab.js:479 -msgid "Virtual network information" +#: ../public/js/plugins/datastores-tab.js:199 +msgid "Safe Directories" msgstr "" -#: ../public/js/plugins/vnets-tab.js:483 ../public/js/plugins/vnets-tab.js:636 -msgid "Lease management" +#: ../public/js/plugins/datastores-tab.js:209 +msgid "Restricted Directories" msgstr "" -#: ../public/js/plugins/vnets-tab.js:569 +#: ../public/js/plugins/datastores-tab.js:219 +msgid "Host Bridge List" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:229 +msgid "Use SSH for Datastore Manager" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:232 +msgid "Use SSH for Transfer Manager" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:237 +msgid "Storage Server" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:247 +msgid "Base IQN" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:257 +msgid "Volume Group Name" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:284 +#: ../public/js/plugins/files-tab.js:58 ../public/js/plugins/groups-tab.js:590 +#: ../public/js/plugins/images-tab.js:58 +#: ../public/js/plugins/images-tab.js:167 +#: ../public/js/plugins/marketplace-tab.js:213 +#: ../public/js/plugins/templates-tab.js:769 +#: ../public/js/plugins/templates-tab.js:1861 +#: ../public/js/plugins/templates-tab.js:1918 +#: ../public/js/plugins/templates-tab.js:2372 +#: ../public/js/plugins/users-tab.js:824 +msgid "Size" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:286 +#: ../public/js/plugins/files-tab.js:60 ../public/js/plugins/images-tab.js:60 +#: ../public/js/plugins/templates-tab.js:58 +#: ../public/js/plugins/templates-tab.js:771 +#: ../public/js/plugins/templates-tab.js:1863 +#: ../public/js/plugins/templates-tab.js:1920 +#: ../public/js/plugins/templates-tab.js:2374 +msgid "Registration time" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:287 +#: ../public/js/plugins/files-tab.js:61 ../public/js/plugins/files-tab.js:550 +#: ../public/js/plugins/images-tab.js:61 +#: ../public/js/plugins/images-tab.js:129 +#: ../public/js/plugins/images-tab.js:689 +#: ../public/js/plugins/templates-tab.js:772 +#: ../public/js/plugins/templates-tab.js:1864 +#: ../public/js/plugins/templates-tab.js:1921 +#: ../public/js/plugins/templates-tab.js:2375 +#: ../public/js/plugins/vms-tab.js:1788 +msgid "Persistent" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:289 +#: ../public/js/plugins/files-tab.js:63 ../public/js/plugins/images-tab.js:63 +#: ../public/js/plugins/templates-tab.js:774 +#: ../public/js/plugins/templates-tab.js:1866 +#: ../public/js/plugins/templates-tab.js:1923 +#: ../public/js/plugins/templates-tab.js:2377 +msgid "#VMS" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:290 +#: ../public/js/plugins/files-tab.js:64 ../public/js/plugins/images-tab.js:64 +#: ../public/js/plugins/images-tab.js:233 +#: ../public/js/plugins/templates-tab.js:775 +#: ../public/js/plugins/templates-tab.js:1867 +#: ../public/js/plugins/templates-tab.js:1924 +#: ../public/js/plugins/templates-tab.js:2378 +#: ../public/js/plugins/vms-tab.js:1786 +msgid "Target" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:410 +msgid "Datastore updated correctly" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:511 +#: ../public/js/plugins/hosts-tab.js:405 ../public/js/plugins/vnets-tab.js:610 +msgid "Select cluster" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:514 +#: ../public/js/plugins/hosts-tab.js:407 ../public/js/plugins/vnets-tab.js:613 +msgid "Select the destination cluster:" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:519 +#: ../public/js/plugins/files-tab.js:365 +#: ../public/js/plugins/images-tab.js:495 +#: ../public/js/plugins/templates-tab.js:383 +#: ../public/js/plugins/vms-tab.js:702 ../public/js/plugins/vnets-tab.js:618 +msgid "Change owner" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:522 +#: ../public/js/plugins/files-tab.js:368 +#: ../public/js/plugins/images-tab.js:498 +#: ../public/js/plugins/templates-tab.js:386 +#: ../public/js/plugins/vms-tab.js:705 ../public/js/plugins/vnets-tab.js:621 +msgid "Select the new owner" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:527 +#: ../public/js/plugins/files-tab.js:373 +#: ../public/js/plugins/images-tab.js:503 +#: ../public/js/plugins/templates-tab.js:391 +#: ../public/js/plugins/users-tab.js:535 ../public/js/plugins/vms-tab.js:711 +#: ../public/js/plugins/vnets-tab.js:627 +msgid "Change group" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:530 +#: ../public/js/plugins/files-tab.js:376 +#: ../public/js/plugins/images-tab.js:506 +#: ../public/js/plugins/templates-tab.js:394 +#: ../public/js/plugins/vms-tab.js:714 ../public/js/plugins/vnets-tab.js:630 +msgid "Select the new group" +msgstr "" + +#: ../public/js/plugins/datastores-tab.js:671 +msgid "Base path" +msgstr "" + +#: ../public/js/plugins/files-tab.js:26 ../public/js/plugins/files-tab.js:414 +msgid "Files & Kernels" +msgstr "" + +#: ../public/js/plugins/files-tab.js:30 ../public/js/plugins/images-tab.js:30 +#: ../public/js/plugins/templates-tab.js:857 +msgid "SIZE" +msgstr "" + +#: ../public/js/plugins/files-tab.js:75 ../public/js/plugins/files-tab.js:674 +msgid "Create File" +msgstr "" + +#: ../public/js/plugins/files-tab.js:88 +msgid "Name that the File will get. Every file must have a unique name." +msgstr "" + +#: ../public/js/plugins/files-tab.js:92 ../public/js/plugins/images-tab.js:98 +#: ../public/js/plugins/marketplace-tab.js:226 +msgid "Description" +msgstr "" + +#: ../public/js/plugins/files-tab.js:98 +msgid "Human readable description of the file for other users." +msgstr "" + +#: ../public/js/plugins/files-tab.js:109 ../public/js/plugins/files-tab.js:623 +#: ../public/js/plugins/images-tab.js:118 +#: ../public/js/plugins/images-tab.js:765 +#: ../public/js/plugins/templates-tab.js:1761 +msgid "Kernel" +msgstr "" + +#: ../public/js/plugins/files-tab.js:110 ../public/js/plugins/files-tab.js:624 +#: ../public/js/plugins/images-tab.js:119 +#: ../public/js/plugins/images-tab.js:766 +#: ../public/js/plugins/templates-tab.js:1762 +msgid "Ramdisk" +msgstr "" + +#: ../public/js/plugins/files-tab.js:111 ../public/js/plugins/files-tab.js:625 +#: ../public/js/plugins/images-tab.js:120 +#: ../public/js/plugins/images-tab.js:767 +msgid "Context" +msgstr "" + +#: ../public/js/plugins/files-tab.js:115 +msgid "Type of the file, explained in detail in the following section. If omitted, the default value is the one defined in oned.conf (install default is OS)." +msgstr "" + +#: ../public/js/plugins/files-tab.js:122 +msgid "File location" +msgstr "" + +#: ../public/js/plugins/files-tab.js:125 +#: ../public/js/plugins/images-tab.js:145 +msgid "Provide a path" +msgstr "" + +#: ../public/js/plugins/files-tab.js:126 +#: ../public/js/plugins/images-tab.js:146 +msgid "Upload" +msgstr "" + +#: ../public/js/plugins/files-tab.js:132 +#: ../public/js/plugins/images-tab.js:153 +msgid "Path" +msgstr "" + +#: ../public/js/plugins/files-tab.js:138 +msgid "Path to the original file that will be copied to the file repository. If not specified for a DATABLOCK type file, an empty file will be created." +msgstr "" + +#: ../public/js/plugins/files-tab.js:153 +#: ../public/js/plugins/images-tab.js:202 +#: ../public/js/plugins/templates-tab.js:556 +#: ../public/js/plugins/templates-tab.js:791 +#: ../public/js/plugins/templates-tab.js:875 +#: ../public/js/plugins/templates-tab.js:1143 +msgid "Advanced options" +msgstr "" + +#: ../public/js/plugins/files-tab.js:167 +msgid "Select the datastore for this file" +msgstr "" + +#: ../public/js/plugins/files-tab.js:382 ../public/js/plugins/hosts-tab.js:413 +#: ../public/js/plugins/images-tab.js:512 +msgid "Enable" +msgstr "" + +#: ../public/js/plugins/files-tab.js:387 ../public/js/plugins/hosts-tab.js:419 +#: ../public/js/plugins/images-tab.js:517 +msgid "Disable" +msgstr "" + +#: ../public/js/plugins/files-tab.js:392 ../public/js/plugins/files-tab.js:979 +#: ../public/js/plugins/images-tab.js:532 +#: ../public/js/plugins/images-tab.js:1190 +#: ../public/js/plugins/templates-tab.js:400 +#: ../public/js/plugins/templates-tab.js:3974 +msgid "Clone" +msgstr "" + +#: ../public/js/plugins/files-tab.js:545 +#: ../public/js/plugins/images-tab.js:684 +#: ../public/js/plugins/templates-tab.js:1362 +msgid "Register time" +msgstr "" + +#: ../public/js/plugins/files-tab.js:551 ../public/js/plugins/files-tab.js:641 +#: ../public/js/plugins/images-tab.js:690 +#: ../public/js/plugins/images-tab.js:783 +msgid "yes" +msgstr "" + +#: ../public/js/plugins/files-tab.js:551 ../public/js/plugins/files-tab.js:642 +#: ../public/js/plugins/images-tab.js:690 +#: ../public/js/plugins/images-tab.js:784 +msgid "no" +msgstr "" + +#: ../public/js/plugins/files-tab.js:558 +#: ../public/js/plugins/images-tab.js:697 +msgid "Filesystem type" +msgstr "" + +#: ../public/js/plugins/files-tab.js:563 +#: ../public/js/plugins/images-tab.js:702 +msgid "Size (MB)" +msgstr "" + +#: ../public/js/plugins/files-tab.js:573 +#: ../public/js/plugins/images-tab.js:712 +msgid "Running VMS" +msgstr "" + +#: ../public/js/plugins/files-tab.js:750 +#: ../public/js/plugins/images-tab.js:892 +msgid "Custom attribute name and value must be filled in" +msgstr "" + +#: ../public/js/plugins/files-tab.js:803 ../public/js/plugins/files-tab.js:816 +#: ../public/js/plugins/images-tab.js:945 +#: ../public/js/plugins/images-tab.js:958 +msgid "Uploading..." +msgstr "" + +#: ../public/js/plugins/files-tab.js:850 +#: ../public/js/plugins/images-tab.js:1022 +msgid "There are mandatory parameters missing" +msgstr "" + +#: ../public/js/plugins/files-tab.js:859 +msgid "Please select a datastore for this file" +msgstr "" + +#: ../public/js/plugins/files-tab.js:951 +msgid "Clone an file" +msgstr "" + +#: ../public/js/plugins/files-tab.js:958 +msgid "Clone File" +msgstr "" + +#: ../public/js/plugins/files-tab.js:964 +msgid "Several file are selected, please choose prefix to name the new copies" +msgstr "" + +#: ../public/js/plugins/files-tab.js:970 +#: ../public/js/plugins/images-tab.js:1181 +#: ../public/js/plugins/templates-tab.js:3965 +msgid "Prefix" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:31 ../public/js/plugins/users-tab.js:33 +msgid "Net TX" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:35 ../public/js/plugins/users-tab.js:37 +msgid "Net RX" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:79 +#: ../public/js/plugins/groups-tab.js:566 ../public/js/plugins/users-tab.js:83 +#: ../public/js/plugins/users-tab.js:800 +msgid "VMs" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:80 +msgid "UMEM" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:81 +msgid "UCPU" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:92 +msgid "Create Group" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:119 +#: ../public/js/plugins/users-tab.js:193 +msgid "Update Quota" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:127 +#: ../public/js/plugins/users-tab.js:201 +msgid "Quota type" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:128 +#: ../public/js/plugins/users-tab.js:202 ../public/js/plugins/vms-tab.js:1232 +msgid "Virtual Machine" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:137 +#: ../public/js/plugins/users-tab.js:211 +msgid "Max VMs" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:148 +#: ../public/js/plugins/users-tab.js:222 +msgid "Max Memory (MB)" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:159 +#: ../public/js/plugins/users-tab.js:233 +msgid "Max CPU" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:183 +#: ../public/js/plugins/users-tab.js:257 +msgid "Max size (MB)" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:194 +#: ../public/js/plugins/users-tab.js:268 +msgid "Max images" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:218 +#: ../public/js/plugins/users-tab.js:292 +msgid "Max RVMs" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:242 +#: ../public/js/plugins/users-tab.js:316 +msgid "Max leases" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:253 +#: ../public/js/plugins/users-tab.js:327 +msgid "Add/edit quota" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:260 +#: ../public/js/plugins/users-tab.js:334 +msgid "Quota" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:261 +#: ../public/js/plugins/users-tab.js:335 +msgid "Edit" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:271 +#: ../public/js/plugins/users-tab.js:345 +msgid "Apply changes" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:361 +#: ../public/js/plugins/users-tab.js:487 +msgid "Quotas updated correctly" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:398 +#: ../public/js/plugins/users-tab.js:530 +msgid "Update quotas" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:423 +msgid "Group info" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:588 +#: ../public/js/plugins/users-tab.js:822 +msgid "Datastore ID" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:643 +#: ../public/js/plugins/users-tab.js:877 +msgid "Image ID" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:644 +#: ../public/js/plugins/hosts-tab.js:863 ../public/js/plugins/users-tab.js:878 +msgid "Running VMs" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:690 +#: ../public/js/plugins/users-tab.js:924 +msgid "Network ID" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:732 +#: ../public/js/plugins/users-tab.js:966 +msgid "Quotas" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:748 +msgid "Create group" +msgstr "" + +#: ../public/js/plugins/groups-tab.js:771 +msgid "Group quotas" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:82 +msgid "Create Host" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:100 +msgid "Drivers" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:103 +msgid "Virtualization" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:107 ../public/js/plugins/hosts-tab.js:128 +msgid "KVM" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:108 ../public/js/plugins/hosts-tab.js:129 +#: ../public/js/plugins/templates-tab.js:2236 +msgid "XEN" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:110 ../public/js/plugins/hosts-tab.js:131 +msgid "EC2" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:115 +msgid "Custom VMM_MAD" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:132 +msgid "Ganglia" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:137 +msgid "Custom IM_MAD" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:147 ../public/js/plugins/vnets-tab.js:752 msgid "Virtual Network" msgstr "" -#: ../public/js/plugins/vnets-tab.js:625 -msgid "Virtual Network template (attributes)" +#: ../public/js/plugins/hosts-tab.js:151 +msgid "Default (dummy)" msgstr "" -#: ../public/js/plugins/vnets-tab.js:631 -msgid "Virtual Network information" +#: ../public/js/plugins/hosts-tab.js:152 +msgid "Firewall" msgstr "" -#: ../public/js/plugins/vnets-tab.js:653 -msgid "Leases information" +#: ../public/js/plugins/hosts-tab.js:153 ../public/js/plugins/vnets-tab.js:212 +msgid "802.1Q" msgstr "" -#: ../public/js/plugins/vnets-tab.js:666 -msgid "Network mask" +#: ../public/js/plugins/hosts-tab.js:154 ../public/js/plugins/vnets-tab.js:213 +msgid "ebtables" msgstr "" -#: ../public/js/plugins/vnets-tab.js:670 -msgid "Hold lease" +#: ../public/js/plugins/hosts-tab.js:155 ../public/js/plugins/vnets-tab.js:214 +msgid "Open vSwitch" msgstr "" -#: ../public/js/plugins/vnets-tab.js:675 -msgid "Add lease" +#: ../public/js/plugins/hosts-tab.js:160 +msgid "Custom VNM_MAD" msgstr "" -#: ../public/js/plugins/vnets-tab.js:685 -msgid "No leases to show" +#: ../public/js/plugins/hosts-tab.js:287 ../public/js/plugins/hosts-tab.js:294 +#: ../public/js/plugins/hosts-tab.js:318 ../public/js/plugins/hosts-tab.js:325 +msgid "Allocated" msgstr "" -#: ../public/js/plugins/vnets-tab.js:731 -msgid "hold" +#: ../public/js/plugins/hosts-tab.js:287 ../public/js/plugins/hosts-tab.js:294 +#: ../public/js/plugins/hosts-tab.js:318 ../public/js/plugins/hosts-tab.js:325 +msgid "Real" msgstr "" -#: ../public/js/plugins/vnets-tab.js:731 -msgid "delete" +#: ../public/js/plugins/hosts-tab.js:287 ../public/js/plugins/hosts-tab.js:294 +#: ../public/js/plugins/hosts-tab.js:318 ../public/js/plugins/hosts-tab.js:325 +msgid "Total" msgstr "" -#: ../public/js/plugins/vnets-tab.js:734 -msgid "Used by VM" +#: ../public/js/plugins/hosts-tab.js:350 +#: ../public/js/plugins/templates-tab.js:261 +#: ../public/js/plugins/users-tab.js:455 +msgid "Template updated correctly" msgstr "" -#: ../public/js/plugins/vnets-tab.js:737 -msgid "release" +#: ../public/js/plugins/hosts-tab.js:425 +msgid "Delete host" msgstr "" -#: ../public/js/plugins/vnets-tab.js:750 -msgid "Create Virtual Network" +#: ../public/js/plugins/hosts-tab.js:443 ../public/js/plugins/hosts-tab.js:880 +msgid "Graphs" msgstr "" -#: ../public/js/plugins/vnets-tab.js:823 -msgid "Please provide a lease IP" +#: ../public/js/plugins/hosts-tab.js:685 ../public/js/plugins/vms-tab.js:1001 +msgid "INIT" msgstr "" -#: ../public/js/plugins/vnets-tab.js:889 -msgid "Virtual Network name missing!" +#: ../public/js/plugins/hosts-tab.js:686 +msgid "UPDATE" msgstr "" -#: ../public/js/plugins/vnets-tab.js:976 -msgid "There are missing network parameters" +#: ../public/js/plugins/hosts-tab.js:691 ../public/js/plugins/hosts-tab.js:724 +msgid "RETRY" msgstr "" -#: ../public/js/plugins/vnets-tab.js:1028 -msgid "Update network properties" +#: ../public/js/plugins/hosts-tab.js:808 ../public/js/plugins/vms-tab.js:81 +#: ../public/js/plugins/vms-tab.js:1140 ../public/js/plugins/vms-tab.js:1259 +msgid "Host" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:835 +msgid "VN MAD" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:839 +msgid "Total Mem" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:843 +msgid "Used Mem (real)" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:847 +msgid "Used Mem (allocated)" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:855 +msgid "Used CPU (real)" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:859 +msgid "Used CPU (allocated)" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:928 +msgid "Create host" +msgstr "" + +#: ../public/js/plugins/hosts-tab.js:973 +msgid "Host name missing!" +msgstr "" + +#: ../public/js/plugins/images-tab.js:75 +#: ../public/js/plugins/images-tab.js:816 +msgid "Create Image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:78 ../public/js/plugins/vnets-tab.js:76 +msgid "Wizard" +msgstr "" + +#: ../public/js/plugins/images-tab.js:79 ../public/js/plugins/vnets-tab.js:77 +msgid "Advanced mode" +msgstr "" + +#: ../public/js/plugins/images-tab.js:94 +msgid "Name that the Image will get. Every image must have a unique name." +msgstr "" + +#: ../public/js/plugins/images-tab.js:104 +msgid "Human readable description of the image for other users." +msgstr "" + +#: ../public/js/plugins/images-tab.js:115 +#: ../public/js/plugins/images-tab.js:762 +#: ../public/js/plugins/marketplace-tab.js:205 +msgid "OS" +msgstr "" + +#: ../public/js/plugins/images-tab.js:116 +#: ../public/js/plugins/images-tab.js:763 +#: ../public/js/plugins/templates-tab.js:1791 +msgid "CDROM" +msgstr "" + +#: ../public/js/plugins/images-tab.js:117 +msgid "DATABLOCK" +msgstr "" + +#: ../public/js/plugins/images-tab.js:124 +msgid "Type of the image, explained in detail in the following section. If omitted, the default value is the one defined in oned.conf (install default is OS)." +msgstr "" + +#: ../public/js/plugins/images-tab.js:135 +msgid "Persistence of the image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:142 +msgid "Image location" +msgstr "" + +#: ../public/js/plugins/images-tab.js:147 +msgid "Empty datablock" +msgstr "" + +#: ../public/js/plugins/images-tab.js:159 +msgid "Path to the original file that will be copied to the image repository. If not specified for a DATABLOCK type image, an empty image will be created." +msgstr "" + +#: ../public/js/plugins/images-tab.js:173 +msgid "Size of the datablock in MB." +msgstr "" + +#: ../public/js/plugins/images-tab.js:180 +msgid "FS type" +msgstr "" + +#: ../public/js/plugins/images-tab.js:186 +msgid "Type of file system to be built. This can be any value understood by mkfs unix command." +msgstr "" + +#: ../public/js/plugins/images-tab.js:209 +msgid "Device prefix" +msgstr "" + +#: ../public/js/plugins/images-tab.js:215 +msgid "Prefix for the emulated device this image will be mounted at. For instance, “hd”, “sd”. If omitted, the default value is the one defined in oned.conf (installation default is “hd”)." +msgstr "" + +#: ../public/js/plugins/images-tab.js:220 +msgid "Driver" +msgstr "" + +#: ../public/js/plugins/images-tab.js:226 +msgid "Specific image mapping driver. KVM: raw, qcow2. XEN: tap:aio, file:" +msgstr "" + +#: ../public/js/plugins/images-tab.js:239 +msgid "Target on which the image will be mounted at. For example: hda, sdb..." +msgstr "" + +#: ../public/js/plugins/images-tab.js:251 +msgid "Select the datastore for this image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:269 +msgid "Write the image template here" +msgstr "" + +#: ../public/js/plugins/images-tab.js:522 +msgid "Make persistent" +msgstr "" + +#: ../public/js/plugins/images-tab.js:527 +msgid "Make non persistent" +msgstr "" + +#: ../public/js/plugins/images-tab.js:764 +msgid "Datablock" +msgstr "" + +#: ../public/js/plugins/images-tab.js:1031 +#: ../public/js/plugins/images-tab.js:1107 +msgid "Please select a datastore for this image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:1162 +msgid "Clone an image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:1169 +msgid "Clone Image" +msgstr "" + +#: ../public/js/plugins/images-tab.js:1175 +msgid "Several image are selected, please choose prefix to name the new copies" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:25 +msgid "Summary of infrastructure resources" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:54 ../public/js/plugins/system-tab.js:50 +#: ../public/js/plugins/vresources-tab.js:59 +msgid "Quickstart" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:57 +msgid "Create new Cluster" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:58 +msgid "Create new Host" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:59 +msgid "Create new Datastore" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:60 +msgid "Create new Virtual Network" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:73 +msgid "Infrastructure resources" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:75 +msgid "The Infrastructure menu allows management of Hosts, Datastores, Virtual Networks. Users in the oneadmin group can manage clusters as well." +msgstr "" + +#: ../public/js/plugins/infra-tab.js:76 ../public/js/plugins/system-tab.js:71 +#: ../public/js/plugins/vresources-tab.js:81 +msgid "You can find further information on the following links:" +msgstr "" + +#: ../public/js/plugins/infra-tab.js:92 +msgid "Infrastructure" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:96 +msgid "Import" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:107 +msgid "OpenNebula Marketplace" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:135 +#: ../public/js/plugins/marketplace-tab.js:197 +msgid "Publisher" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:136 +#: ../public/js/plugins/marketplace-tab.js:217 +msgid "Hypervisor" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:137 +#: ../public/js/plugins/marketplace-tab.js:209 +#: ../public/js/plugins/templates-tab.js:1769 +msgid "Arch" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:138 +msgid "Format" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:139 +msgid "Tags" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:149 +msgid "Marketplace" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:164 +msgid "Appliance information" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:184 +msgid "Appliance" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:193 +msgid "URL" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:194 +msgid "link" +msgstr "" + +#: ../public/js/plugins/marketplace-tab.js:201 +msgid "Downloads" msgstr "" #: ../public/js/plugins/system-tab.js:25 @@ -2868,261 +2012,1438 @@ msgstr "" msgid "System resources management is only accesible to users of the oneadmin group. It comprises the operations regarding OpenNebula groups, users and ACLs." msgstr "" -#: ../public/js/plugins/infra-tab.js:25 -msgid "Summary of infrastructure resources" +#: ../public/js/plugins/templates-tab.js:70 +msgid "Create VM Template" msgstr "" -#: ../public/js/plugins/infra-tab.js:57 -msgid "Create new Cluster" +#: ../public/js/plugins/templates-tab.js:98 ../public/js/sunstone-util.js:860 +msgid "Please, choose and modify the template you want to update" msgstr "" -#: ../public/js/plugins/infra-tab.js:58 -msgid "Create new Host" +#: ../public/js/plugins/templates-tab.js:100 ../public/js/sunstone-util.js:862 +#: ../public/js/sunstone-util.js:865 +msgid "Select a template" msgstr "" -#: ../public/js/plugins/infra-tab.js:59 -msgid "Create new Datastore" +#: ../public/js/plugins/templates-tab.js:106 +#: ../public/js/plugins/vnets-tab.js:360 ../public/js/sunstone-util.js:1932 +msgid "Permissions" msgstr "" -#: ../public/js/plugins/infra-tab.js:60 -msgid "Create new Virtual Network" +#: ../public/js/plugins/templates-tab.js:109 +#: ../public/js/plugins/vnets-tab.js:363 ../public/js/sunstone-util.js:1935 +msgid "Admin" msgstr "" -#: ../public/js/plugins/infra-tab.js:73 -msgid "Infrastructure resources" +#: ../public/js/plugins/templates-tab.js:123 +#: ../public/js/plugins/vnets-tab.js:377 ../public/js/sunstone-util.js:1949 +msgid "Other" msgstr "" -#: ../public/js/plugins/infra-tab.js:75 -msgid "The Infrastructure menu allows management of Hosts, Datastores, Virtual Networks. Users in the oneadmin group can manage clusters as well." +#: ../public/js/plugins/templates-tab.js:130 +#: ../public/js/plugins/templates-tab.js:1346 +#: ../public/js/plugins/templates-tab.js:1378 +#: ../public/js/plugins/templates-tab.js:1380 +#: ../public/js/plugins/vms-tab.js:1341 ../public/js/plugins/vnets-tab.js:384 +msgid "Template" msgstr "" -#: ../public/js/plugins/infra-tab.js:92 -msgid "Infrastructure" +#: ../public/js/plugins/templates-tab.js:146 +#: ../public/js/plugins/templates-tab.js:4051 +msgid "Instantiate VM Template" msgstr "" -#: ../public/js/plugins/clusters-tab.js:497 -msgid "No datastores in this cluster" +#: ../public/js/plugins/templates-tab.js:152 +#: ../public/js/plugins/vms-tab.js:113 +msgid "VM Name" msgstr "" -#: ../public/js/plugins/clusters-tab.js:507 -msgid "No hosts in this cluster" +#: ../public/js/plugins/templates-tab.js:158 +#: ../public/js/plugins/vms-tab.js:119 +msgid "Defaults to template name when emtpy" msgstr "" -#: ../public/js/plugins/clusters-tab.js:517 -msgid "No virtual networks in this cluster" +#: ../public/js/plugins/templates-tab.js:163 +#: ../public/js/plugins/vms-tab.js:136 +msgid "Deploy # VMs" msgstr "" -#: ../public/js/plugins/clusters-tab.js:538 -#: ../public/js/plugins/clusters-tab.js:644 -msgid "Cluster information" +#: ../public/js/plugins/templates-tab.js:169 +#: ../public/js/plugins/vms-tab.js:142 +msgid "You can use the wildcard %i. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them" msgstr "" -#: ../public/js/plugins/clusters-tab.js:551 -#: ../public/js/plugins/clusters-tab.js:657 -msgid "Hosts state" +#: ../public/js/plugins/templates-tab.js:174 +#: ../public/js/plugins/templates-tab.js:379 +msgid "Instantiate" msgstr "" -#: ../public/js/plugins/clusters-tab.js:552 -#: ../public/js/plugins/clusters-tab.js:658 -msgid "Hosts CPU Usage" +#: ../public/js/plugins/templates-tab.js:417 +msgid "Template information" msgstr "" -#: ../public/js/plugins/clusters-tab.js:555 -#: ../public/js/plugins/clusters-tab.js:556 -#: ../public/js/plugins/clusters-tab.js:565 -#: ../public/js/plugins/clusters-tab.js:575 -#: ../public/js/plugins/clusters-tab.js:662 -#: ../public/js/plugins/clusters-tab.js:663 -#: ../public/js/plugins/clusters-tab.js:672 -#: ../public/js/plugins/clusters-tab.js:682 ../public/js/monitoring.js:99 -msgid "No monitoring information available" +#: ../public/js/plugins/templates-tab.js:509 +msgid "NAME" msgstr "" -#: ../public/js/plugins/clusters-tab.js:594 -#: ../public/js/plugins/clusters-tab.js:595 -#: ../public/js/plugins/clusters-tab.js:703 -msgid "Create new host" +#: ../public/js/plugins/templates-tab.js:515 +msgid "Name that the VM will get for description purposes. If NAME is not supplied a name generated by one will be in the form of one-<VID>." msgstr "" -#: ../public/js/plugins/clusters-tab.js:596 -msgid "Manage unclustered hosts" +#: ../public/js/plugins/templates-tab.js:530 +msgid "Percentage of CPU divided by 100 required for the Virtual Machine. Half a processor is written 0.5." msgstr "" -#: ../public/js/plugins/clusters-tab.js:607 -#: ../public/js/plugins/clusters-tab.js:718 -msgid "Create new datastore" +#: ../public/js/plugins/templates-tab.js:547 +#: ../public/js/plugins/templates-tab.js:867 +msgid "MB" msgstr "" -#: ../public/js/plugins/clusters-tab.js:608 -msgid "Manage unclustered datastores" +#: ../public/js/plugins/templates-tab.js:548 +#: ../public/js/plugins/templates-tab.js:866 +msgid "GB" msgstr "" -#: ../public/js/plugins/clusters-tab.js:620 -#: ../public/js/plugins/clusters-tab.js:734 -msgid "Create new virtual network" +#: ../public/js/plugins/templates-tab.js:552 +msgid "Amount of RAM required for the VM, in Megabytes." msgstr "" -#: ../public/js/plugins/clusters-tab.js:621 -msgid "Manage unclustered virtual networks" +#: ../public/js/plugins/templates-tab.js:561 +#: ../public/js/plugins/vms-tab.js:2377 +msgid "VCPU" msgstr "" -#: ../public/js/plugins/clusters-tab.js:701 -msgid "Current number of hosts in this cluster" +#: ../public/js/plugins/templates-tab.js:569 +msgid "Number of virtual cpus. This value is optional, the default hypervisor behavior is used, usually one virtual CPU." msgstr "" -#: ../public/js/plugins/clusters-tab.js:704 -msgid "Manage cluster hosts" +#: ../public/js/plugins/templates-tab.js:750 +msgid "Volatile Disk" msgstr "" -#: ../public/js/plugins/clusters-tab.js:715 -msgid "Current number of datastores in this cluster" +#: ../public/js/plugins/templates-tab.js:783 +msgid "Please select an image from the list" msgstr "" -#: ../public/js/plugins/clusters-tab.js:719 -msgid "Manage cluster datastores" +#: ../public/js/plugins/templates-tab.js:784 +msgid "You selected the following image: " msgstr "" -#: ../public/js/plugins/clusters-tab.js:731 -msgid "Current number of virtual networks in this cluster" +#: ../public/js/plugins/templates-tab.js:797 +#: ../public/js/plugins/templates-tab.js:881 +msgid "TARGET" msgstr "" -#: ../public/js/plugins/clusters-tab.js:735 -msgid "Manage cluster virtual networks" +#: ../public/js/plugins/templates-tab.js:803 +#: ../public/js/plugins/templates-tab.js:887 +msgid "Device to map image disk. If set, it will overwrite the default device mapping" msgstr "" -#: ../public/js/plugins/clusters-tab.js:888 -msgid "Create cluster" +#: ../public/js/plugins/templates-tab.js:810 +#: ../public/js/plugins/templates-tab.js:894 +msgid "DRIVER" msgstr "" -#: ../public/js/plugins/clusters-tab.js:904 -msgid "Cluster name missing!" +#: ../public/js/plugins/templates-tab.js:816 +#: ../public/js/plugins/templates-tab.js:900 +msgid "Specific image mapping driver. KVM: raw, qcow2. Xen:tap:aio:, file:. VMware unsupported" msgstr "" -#: ../public/js/plugins/groups-tab.js:64 -msgid "Tip: Refresh the list if it only shows user ids in the Users column." +#: ../public/js/plugins/templates-tab.js:828 +#: ../public/js/plugins/templates-tab.js:2248 +msgid "TYPE" msgstr "" -#: ../public/js/plugins/groups-tab.js:73 -msgid "Group name" +#: ../public/js/plugins/templates-tab.js:832 +msgid "FS" msgstr "" -#: ../public/js/plugins/groups-tab.js:267 -msgid "+ New Group" +#: ../public/js/plugins/templates-tab.js:833 +msgid "Swap" msgstr "" -#: ../public/js/plugins/groups-tab.js:296 -#: ../public/js/plugins/groups-tab.js:429 -#: ../public/js/plugins/groups-tab.js:466 -msgid "Group information" +#: ../public/js/plugins/templates-tab.js:844 +msgid "FORMAT" msgstr "" -#: ../public/js/plugins/groups-tab.js:315 -msgid "Group info" +#: ../public/js/plugins/templates-tab.js:850 +msgid "Filesystem type for the fs images" msgstr "" -#: ../public/js/plugins/groups-tab.js:440 -msgid "Quota information" +#: ../public/js/plugins/templates-tab.js:871 +msgid "Size of the new disk" msgstr "" -#: ../public/js/plugins/groups-tab.js:562 -msgid "Create group" +#: ../public/js/plugins/templates-tab.js:1135 +msgid "Please select an network from the list" msgstr "" -#: ../public/js/plugins/groups-tab.js:591 -msgid "Group quotas" +#: ../public/js/plugins/templates-tab.js:1136 +msgid "You selected the following image:" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:154 -msgid "Storage size" +#: ../public/js/plugins/templates-tab.js:1150 +#: ../public/js/plugins/vms-tab.js:2129 ../public/js/plugins/vnets-tab.js:110 +msgid "IP" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:167 -msgid "Number of images" +#: ../public/js/plugins/templates-tab.js:1156 +msgid "Request an specific IP from the Network" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:184 -msgid "RVMs" +#: ../public/js/plugins/templates-tab.js:1163 +msgid "MODEL" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:199 -msgid "Leases" +#: ../public/js/plugins/templates-tab.js:1169 +msgid "Hardware that will emulate this network interface. With Xen this is the type attribute of the vif." msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:217 -msgid "VM quota" +#: ../public/js/plugins/templates-tab.js:1177 +msgid "TCP Firewall" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:219 -#: ../public/js/plugins/dashboard-users-tab.js:229 -#: ../public/js/plugins/dashboard-users-tab.js:239 -#: ../public/js/plugins/dashboard-users-tab.js:249 -msgid "None" +#: ../public/js/plugins/templates-tab.js:1189 +#: ../public/js/plugins/templates-tab.js:1214 +msgid "PORTS" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:227 -msgid "Datastore quotas" +#: ../public/js/plugins/templates-tab.js:1195 +#: ../public/js/plugins/templates-tab.js:1220 +msgid "A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:237 -msgid "Image quotas" +#: ../public/js/plugins/templates-tab.js:1202 +msgid "UDP Firewall" msgstr "" -#: ../public/js/plugins/dashboard-users-tab.js:247 -msgid "Network quotas" +#: ../public/js/plugins/templates-tab.js:1205 +msgid "Whitelist" msgstr "" -#: ../public/js/sunstone.js:589 -msgid "Previous action" +#: ../public/js/plugins/templates-tab.js:1208 +msgid "Blacklist" msgstr "" -#: ../public/js/sunstone.js:652 ../public/js/sunstone.js:686 -msgid "Confirmation of action" +#: ../public/js/plugins/templates-tab.js:1232 +msgid "Drop ICMP" msgstr "" -#: ../public/js/sunstone.js:658 -msgid "You have to confirm this action." +#: ../public/js/plugins/templates-tab.js:1467 +msgid "There are mandatory parameters missing in this section" msgstr "" -#: ../public/js/sunstone.js:660 -msgid "Do you want to proceed?" +#: ../public/js/plugins/templates-tab.js:1624 +msgid "Add another disk" msgstr "" -#: ../public/js/sunstone.js:663 ../public/js/sunstone.js:695 -msgid "OK" +#: ../public/js/plugins/templates-tab.js:1669 +msgid "DISK" msgstr "" -#: ../public/js/sunstone.js:691 -msgid "You need to select something." +#: ../public/js/plugins/templates-tab.js:1693 +msgid "Add another nic" msgstr "" -#: ../public/js/sunstone-util.js:210 +#: ../public/js/plugins/templates-tab.js:1735 +msgid "NIC" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1760 +#: ../public/js/plugins/templates-tab.js:1784 +#: ../public/js/plugins/vms-tab.js:774 +msgid "Boot" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1779 +msgid "CPU architecture to virtualization" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1789 +msgid "HD" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1790 +msgid "FD" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1792 +msgid "NETWORK" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1796 +msgid "Boot device type" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1801 +msgid "Root" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1807 +msgid "Device to be mounted as root" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1814 +msgid "Kernel cmd" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1820 +msgid "Arguments for the booting kernel" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1825 +msgid "Bootloader" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1831 +msgid "Path to the bootloader executable" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1839 +msgid "Registered Image" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1842 +#: ../public/js/plugins/templates-tab.js:1899 +msgid "Remote PATH" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1874 +msgid "Please select a Kernel from the list" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1875 +msgid "You selected the following Kernel: " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1883 +#: ../public/js/plugins/templates-tab.js:1940 +msgid "PATH" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1889 +msgid "Path to the OS kernel to boot the image" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1896 +msgid "Registered Image " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1931 +msgid "Please select a Ramdisk from the list" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1932 +msgid "You selected the following Ramdisk: " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:1946 +msgid "Path to the initrd image" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2156 +msgid "Graphics" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2176 +msgid "Listen IP" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2182 +msgid "IP to listen on" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2187 +msgid "Port" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2193 +msgid "Port for the VNC/SPICE server" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2198 +#: ../public/js/plugins/users-tab.js:129 +msgid "Password" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2204 +msgid "Password for the VNC/SPICE server" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2209 +msgid "Keymap" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2215 +msgid "Keyboard configuration locale to use in the VNC/SPICE display" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2222 +msgid "Inputs" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2227 +msgid "Mouse" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2228 +msgid "Tablet" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2234 +msgid "USB" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2235 +msgid "PS2" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2240 +#: ../public/js/plugins/templates-tab.js:2399 +#: ../public/js/plugins/vms-tab.js:1471 ../public/js/plugins/vms-tab.js:1497 +#: ../public/js/plugins/vnets-tab.js:131 ../public/js/plugins/vnets-tab.js:297 +#: ../public/js/plugins/vnets-tab.js:884 ../public/js/sunstone-util.js:1444 +#: ../public/js/sunstone-util.js:1686 +msgid "Add" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2249 +msgid "BUS" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2316 +msgid "Network & SSH" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2318 +msgid "Custom variables" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2328 +msgid " Add SSH contextualization" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2334 +msgid "Public Key" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2349 +msgid " Add Network contextualization" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2385 +msgid "Please select files from the list" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2386 +msgid "You selected the following files:" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2407 +msgid "KEY" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2408 +msgid "VALUE" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2593 +#: ../public/js/plugins/vms-tab.js:1120 ../public/js/plugins/vms-tab.js:1361 +msgid "Placement" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2594 +msgid "Policy" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2600 +msgid "Select Hosts " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2603 +msgid "Select Clusters " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2663 +msgid "Please select one or more clusters from the list" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2664 +msgid "You selected the following clusters:" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2671 +msgid "Requirements" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2684 +msgid "Packing" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2687 +msgid "Pack the VMs in the cluster nodes to reduce VM fragmentation" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2690 +msgid "Stripping" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2693 +msgid "Spread the VMs in the cluster nodes" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2696 +msgid "Load-aware" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2699 +msgid "Maximize the resources available to VMs in a node" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:2705 +msgid "Rank" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3054 +msgid "There are mandatory fields missing in the capacity section" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3245 +msgid "Update template properties" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3271 +#: ../public/js/plugins/vms-tab.js:2863 +msgid "Loading" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3434 +#: ../public/js/plugins/templates-tab.js:3510 +#: ../public/js/plugins/templates-tab.js:3586 +#: ../public/js/plugins/templates-tab.js:3635 +msgid " does not exists any more" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3771 +msgid "The following FILES: " +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3771 +#: ../public/js/plugins/templates-tab.js:3862 +msgid " do not exist any more" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3862 +msgid "The following HOSTs: [" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3906 +msgid "The following CLUSTERs: [" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3906 +msgid "do not exist any more" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3946 +msgid "Clone a template" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3953 +msgid "Clone Template" +msgstr "" + +#: ../public/js/plugins/templates-tab.js:3959 +msgid "Several templates are selected, please choose prefix to name the new copies" +msgstr "" + +#: ../public/js/plugins/users-tab.js:82 +msgid "Auth driver" +msgstr "" + +#: ../public/js/plugins/users-tab.js:86 +msgid "Group ID" +msgstr "" + +#: ../public/js/plugins/users-tab.js:98 +msgid "Tip: You can save any information in the user template, in the form of VAR=VAL." +msgstr "" + +#: ../public/js/plugins/users-tab.js:103 +msgid "Tip: SSH authentication method is not available for web UI access." +msgstr "" + +#: ../public/js/plugins/users-tab.js:112 +msgid "Create User" +msgstr "" + +#: ../public/js/plugins/users-tab.js:118 +msgid "Username" +msgstr "" + +#: ../public/js/plugins/users-tab.js:140 +msgid "Authentication" +msgstr "" + +#: ../public/js/plugins/users-tab.js:144 ../public/js/plugins/users-tab.js:547 +msgid "Core" +msgstr "" + +#: ../public/js/plugins/users-tab.js:146 ../public/js/plugins/users-tab.js:549 +msgid "x509" +msgstr "" + +#: ../public/js/plugins/users-tab.js:147 ../public/js/plugins/users-tab.js:550 +msgid "Public" +msgstr "" + +#: ../public/js/plugins/users-tab.js:168 +msgid "Update Password" +msgstr "" + +#: ../public/js/plugins/users-tab.js:174 +msgid "New password" +msgstr "" + +#: ../public/js/plugins/users-tab.js:185 +msgid "Change" +msgstr "" + +#: ../public/js/plugins/users-tab.js:401 +msgid "Change password successful" +msgstr "" + +#: ../public/js/plugins/users-tab.js:525 +#: ../public/js/plugins/users-tab.js:1108 +msgid "Change password" +msgstr "" + +#: ../public/js/plugins/users-tab.js:538 +msgid "This will change the main group of the selected users. Select the new group" +msgstr "" + +#: ../public/js/plugins/users-tab.js:543 +msgid "Change authentication" +msgstr "" + +#: ../public/js/plugins/users-tab.js:552 +msgid "Please choose the new type of authentication for the selected users" +msgstr "" + +#: ../public/js/plugins/users-tab.js:565 ../public/js/plugins/users-tab.js:743 +msgid "User information" +msgstr "" + +#: ../public/js/plugins/users-tab.js:573 ../public/js/plugins/users-tab.js:971 +msgid "Historical usages" +msgstr "" + +#: ../public/js/plugins/users-tab.js:588 +msgid "User info" +msgstr "" + +#: ../public/js/plugins/users-tab.js:761 +msgid "Authentication driver" +msgstr "" + +#: ../public/js/plugins/users-tab.js:772 +msgid "Configuration Attributes" +msgstr "" + +#: ../public/js/plugins/users-tab.js:974 +msgid "From / to" +msgstr "" + +#: ../public/js/plugins/users-tab.js:983 +msgid "Meters" +msgstr "" + +#: ../public/js/plugins/users-tab.js:1058 +msgid "Create user" +msgstr "" + +#: ../public/js/plugins/users-tab.js:1091 +msgid "User name and password must be filled in" +msgstr "" + +#: ../public/js/plugins/users-tab.js:1119 +msgid "Fill in a new password" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:79 ../public/js/plugins/vms-tab.js:1293 +msgid "Used CPU" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:80 ../public/js/plugins/vms-tab.js:1289 +msgid "Used Memory" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:82 +msgid "IPs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:83 +msgid "Start Time" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:84 ../public/js/plugins/vms-tab.js:2862 +msgid "VNC" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:93 +msgid "CPU, Memory and Start time are hidden columns by default. You can get monitoring graphs by clicking on the desired VM and visiting the monitoring information tab." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:96 +msgid "VNC console requires previous install of the noVNC addon. Check Sunstone documentation for more information." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:99 +msgid "You can hotplug and detach existing disks from running VMs from the Disks & Hotplugging tab in the VM information dialog." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:107 ../public/js/plugins/vms-tab.js:2740 +msgid "Create Virtual Machine" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:124 +msgid "Select template" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:668 ../public/js/plugins/vms-tab.js:679 +msgid "VirtualMachine updated correctly" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:719 +msgid "Deploy" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:720 +msgid "This will deploy the selected VMs on the chosen host" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:727 ../public/js/plugins/vms-tab.js:736 +msgid "Migrate" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:728 +msgid "This will migrate the selected VMs to the chosen host" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:737 +msgid "This will live-migrate the selected VMs to the chosen host" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:744 +msgid "Hold" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:745 +msgid "This will hold selected pending VMs from being deployed" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:750 +msgid "Release" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:752 +msgid "This will release held machines" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:756 +msgid "Suspend" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:758 +msgid "This will suspend selected machines" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:762 +msgid "Resume" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:764 +msgid "This will resume selected stopped or suspended VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:768 +msgid "Stop" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:770 +msgid "This will stop selected VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:776 +msgid "This will redeploy selected VMs (in UNKNOWN or BOOT state)" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:780 ../public/js/plugins/vms-tab.js:786 +msgid "Reboot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:782 +msgid "This will send a reboot action to running VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:788 +msgid "This will perform a hard reboot on selected VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:792 +msgid "Power Off" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:794 +msgid "This will send a power off signal to running VMs. They can be restarted later." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:798 ../public/js/plugins/vms-tab.js:804 +msgid "Shutdown" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:800 +msgid "This will initiate the shutdown process in the selected VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:806 +msgid "This will cancel selected VMs" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:811 ../public/js/plugins/vms-tab.js:817 +msgid "Destroy" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:813 +msgid "This will delete the selected VMs from the database" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:819 +msgid "This will resubmits VMs to PENDING state" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:991 ../public/js/plugins/vms-tab.js:1013 +#: ../public/js/plugins/vms-tab.js:1206 +msgid "SUSPENDED" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1003 +msgid "HOLD" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1012 +msgid "STOPPED" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1014 +msgid "POWEROFF" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1139 +msgid "#" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1141 +msgid "Reason" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1142 +msgid "Chg time" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1143 +msgid "Total time" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1144 +msgid "Prolog time" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1254 +msgid "LCM State" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1264 +msgid "Start time" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1269 +msgid "Deploy ID" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1277 +msgid "Monitoring information" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1281 +msgid "Net_TX" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1285 +msgid "Net_RX" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1297 +msgid "VNC Session" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1331 +msgid "Capacity" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1336 +msgid "Snapshots" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1344 +msgid "VM template" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1350 +msgid "Log" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1355 ../public/js/plugins/vms-tab.js:1431 +#: ../public/js/plugins/vms-tab.js:1790 ../public/js/plugins/vms-tab.js:2131 +#: ../public/js/plugins/vms-tab.js:2565 +msgid "Actions" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1420 +msgid "Schedule action" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1427 +msgid "ACTION" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1428 +msgid "TIME" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1429 +msgid "DONE" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1430 +msgid "MESSAGE" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1454 ../public/js/plugins/vms-tab.js:1477 +#: ../public/js/plugins/vms-tab.js:1584 +msgid "shutdown" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1455 ../public/js/plugins/vms-tab.js:1478 +#: ../public/js/plugins/vms-tab.js:1585 +msgid "hold" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1456 ../public/js/plugins/vms-tab.js:1479 +#: ../public/js/plugins/vms-tab.js:1586 +msgid "release" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1457 ../public/js/plugins/vms-tab.js:1480 +#: ../public/js/plugins/vms-tab.js:1587 +msgid "stop" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1458 ../public/js/plugins/vms-tab.js:1588 +msgid "cancel" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1459 ../public/js/plugins/vms-tab.js:1482 +#: ../public/js/plugins/vms-tab.js:1589 +msgid "suspend" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1460 ../public/js/plugins/vms-tab.js:1483 +#: ../public/js/plugins/vms-tab.js:1590 +msgid "resume" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1461 ../public/js/plugins/vms-tab.js:1591 +msgid "restart" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1462 ../public/js/plugins/vms-tab.js:1592 +msgid "resubmit" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1463 ../public/js/plugins/vms-tab.js:1486 +#: ../public/js/plugins/vms-tab.js:1593 +msgid "reboot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1464 ../public/js/plugins/vms-tab.js:1594 +msgid "reset" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1465 ../public/js/plugins/vms-tab.js:1488 +#: ../public/js/plugins/vms-tab.js:1595 +msgid "poweroff" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1466 ../public/js/plugins/vms-tab.js:1489 +#: ../public/js/plugins/vms-tab.js:1596 +msgid "snapshot-create" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1481 +msgid "shutdown-hard" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1484 +msgid "boot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1485 +msgid "destroy-recreate" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1487 +msgid "reboot-hard" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1719 +msgid "Date Time Picker" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1730 +msgid "Done" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1769 ../public/js/plugins/vms-tab.js:1772 +#: ../public/js/plugins/vms-tab.js:1996 +msgid "Attach new disk" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1787 +msgid "Image / Format-Size" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1789 +msgid "Save as" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1805 +msgid "No disks to show" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1823 +msgid "in progress" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1824 +msgid "deferred snapshot in progress" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1836 +msgid "hot snapshot in progress" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1848 +msgid "attach/detach in progress" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1856 ../public/js/plugins/vms-tab.js:1892 +#: ../public/js/plugins/vms-tab.js:2630 +msgid "Snapshot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1860 ../public/js/plugins/vms-tab.js:2170 +msgid "Detach" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1869 +msgid "YES" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1869 +msgid "NO" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1898 ../public/js/plugins/vms-tab.js:2002 +#: ../public/js/plugins/vms-tab.js:2263 ../public/js/plugins/vms-tab.js:2435 +#: ../public/js/plugins/vms-tab.js:2636 +msgid "Virtual Machine ID" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1909 +msgid "Disk ID" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1920 +msgid "Image name" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1931 +msgid "Snapshot type" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1935 +msgid "Deferred" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1936 +msgid "Hot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1940 +msgid "Sets the specified VM disk to be saved in a new Image." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1941 +msgid "Deferred: The Image is created immediately, but the contents are saved only if the VM is shut down gracefully (i.e., using Shutdown or Cancel; not Delete)" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1942 +msgid "Hot: The Image will be saved immediately." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1947 ../public/js/plugins/vms-tab.js:2546 +#: ../public/js/plugins/vms-tab.js:2549 ../public/js/plugins/vms-tab.js:2658 +msgid "Take snapshot" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:1962 +msgid "Please provide a name for the new image" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2014 ../public/js/plugins/vms-tab.js:2275 +msgid "Attach" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2109 ../public/js/plugins/vms-tab.js:2112 +#: ../public/js/plugins/vms-tab.js:2257 +msgid "Attach new nic" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2127 ../public/js/plugins/vnets-tab.js:246 +#: ../public/js/plugins/vnets-tab.js:777 +msgid "VLAN" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2130 +msgid "MAC" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2146 +msgid "No nics to show" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2194 +msgid "NET RX" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2207 +msgid "NET TX" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2360 ../public/js/plugins/vms-tab.js:2363 +#: ../public/js/plugins/vms-tab.js:2428 +msgid "Resize VM capacity" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2392 +msgid "REAL CPU" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2405 +msgid "REAL MEMORY" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2445 +msgid "Enforce" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2452 +msgid "If it is set to true, the host capacity will be checked. This will only affect oneadmin requests, regular users resize requests will always be enforced" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2460 +msgid "Resize" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2564 +msgid "Timestamp" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2580 +msgid "No snapshots to show" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2599 +msgid "Revert" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2647 +msgid "Snapshot name" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2764 +msgid "You have not selected a template" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2854 +msgid "VNC connection" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2871 +msgid "Canvas not supported." +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2928 +msgid "Open VNC Session" +msgstr "" + +#: ../public/js/plugins/vms-tab.js:2931 +msgid "VNC Disabled" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:72 ../public/js/plugins/vnets-tab.js:960 +msgid "Create Virtual Network" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:98 +msgid "Fixed network" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:101 +msgid "Ranged network" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:120 +msgid "MAC (opt):" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:136 ../public/js/plugins/vnets-tab.js:302 +msgid "Remove selected" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:156 +msgid "N. Address" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:166 +msgid "N. Mask" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:177 +msgid "Define a subnet by IP range" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:183 ../public/js/plugins/vnets-tab.js:858 +msgid "IP Start" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:193 ../public/js/plugins/vnets-tab.js:864 +msgid "IP End" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:207 +msgid "Network model" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:211 +msgid "Default" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:235 ../public/js/plugins/vnets-tab.js:782 +msgid "Physical device" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:250 +msgid "Yes" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:251 +msgid "No" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:259 ../public/js/plugins/vnets-tab.js:787 +msgid "VLAN ID" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:271 +msgid "Custom attributes" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:286 +msgid "Value" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:333 +msgid "Write the Virtual Network template here" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:352 +msgid "Please, choose and modify the virtual network you want to update" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:354 +msgid "Select a network" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:649 +msgid "Virtual network information" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:653 ../public/js/plugins/vnets-tab.js:813 +msgid "Lease management" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:853 +msgid "Leases information" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:870 +msgid "Network mask" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:878 +msgid "Hold lease" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:894 +msgid "No leases to show" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:943 +msgid "VM:" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:1046 +msgid "Please provide a lease IP" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:1112 +msgid "Virtual Network name missing!" +msgstr "" + +#: ../public/js/plugins/vnets-tab.js:1199 +msgid "There are missing network parameters" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:25 +msgid "Summary of virtual resources" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:35 +msgid "VM Instances" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:36 +msgid "total" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:37 +msgid "running" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:38 +msgid "failed" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:62 +msgid "Create new Virtual Machine" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:63 +msgid "Create new VM Template" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:64 +msgid "Create new Image" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:77 +#: ../public/js/plugins/vresources-tab.js:96 +msgid "Virtual Resources" +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:79 +msgid "The Virtual Resources menu allows management of Virtual Machine Templates, Instances and storage (Images)." +msgstr "" + +#: ../public/js/plugins/vresources-tab.js:80 +msgid "Virtual Machine templates can be instantiated as many times as you want. You can do it from the Templates tab or by creating a new VM in the VM tab. The second method allows you to customize the name and the number of VMs you want to launch." +msgstr "" + +#: ../public/js/sunstone-util.js:242 msgid "Submitted" msgstr "" -#: ../public/js/sunstone-util.js:227 +#: ../public/js/sunstone-util.js:259 msgid "Error" msgstr "" -#: ../public/js/sunstone-util.js:233 +#: ../public/js/sunstone-util.js:265 msgid "Info" msgstr "" -#: ../public/js/sunstone-util.js:365 +#: ../public/js/sunstone-util.js:391 msgid "Cannot contact server: is it running and reachable?" msgstr "" -#: ../public/js/sunstone-util.js:373 +#: ../public/js/sunstone-util.js:399 msgid "Network is unreachable: is OpenNebula running?" msgstr "" -#: ../public/js/sunstone-util.js:394 +#: ../public/js/sunstone-util.js:420 msgid "Unauthorized" msgstr "" -#: ../public/js/sunstone-util.js:730 +#: ../public/js/sunstone-util.js:626 ../public/js/sunstone-util.js:932 +msgid "Please select" +msgstr "" + +#: ../public/js/sunstone-util.js:854 msgid "Update template" msgstr "" -#: ../public/js/sunstone-util.js:1028 +#: ../public/js/sunstone-util.js:1138 msgid "Please select an element" msgstr "" + +#: ../public/js/sunstone-util.js:1957 +msgid "Ownership" +msgstr "" + +#: ../public/js/sunstone.js:797 +msgid "Previous action" +msgstr "" + +#: ../public/js/sunstone.js:861 ../public/js/sunstone.js:898 +msgid "Confirmation of action" +msgstr "" + +#: ../public/js/sunstone.js:868 ../public/js/sunstone.js:904 +msgid "Confirm" +msgstr "" + +#: ../public/js/sunstone.js:872 +msgid "You have to confirm this action." +msgstr "" + +#: ../public/js/sunstone.js:874 +msgid "Do you want to proceed?" +msgstr "" + +#: ../public/js/sunstone.js:878 ../public/js/sunstone.js:918 +msgid "OK" +msgstr "" + +#: ../public/js/sunstone.js:879 ../public/js/sunstone.js:919 +msgid "Cancel" +msgstr "" + +#: ../public/js/sunstone.js:909 +msgid "You need to select something." +msgstr "" + +#: ../public/js/sunstone.js:983 ../public/js/sunstone.js:1002 +#: ../public/js/sunstone.js:1005 +msgid "You have to confirm this action" +msgstr "" diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 4d0c1031bc..8960a91cb5 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -41,7 +41,7 @@ var acls_tab_content = '\ \ \
\ - \ + \
\
\
\ @@ -64,12 +64,6 @@ var acls_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("This table shows the ACLs rules broken down to easier the reading and meaning of each one. You can show the ACL original string by clicking on Show/Hide columns.")+'\ -

\ -
\ '; var create_acl_tmpl = diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 1702130036..45819743af 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -107,7 +107,7 @@ var create_cluster_tmpl ='
\ \
\
\ - \ + \
\ \
\ @@ -124,7 +124,7 @@ var create_cluster_tmpl ='
\ \
\
\ - \ + \
\
\
\ @@ -141,7 +141,7 @@ var create_cluster_tmpl ='
\ \
\
\ - \ + \
\
\
\ @@ -506,7 +506,7 @@ function popUpUpdateClusterDialog(){ if ( selected_nodes.length != 1 ) { - alert("Please select one (and just one) cluster to update."); + notifyError(tr("Please select one (and just one) cluster to update.")); return false; } @@ -877,7 +877,7 @@ var clusters_tab_content = '\
\ \
\ - \ + \
\ \ \ @@ -1345,8 +1345,6 @@ function updateClustersView (request,list){ updateView(list_array,dataTable_clusters); updateClusterSelect(); - //dependency with the infraestructure dashboard plugin - //updateInfraDashboard("clusters",list); }; diff --git a/src/sunstone/public/js/plugins/dashboard-tab.js b/src/sunstone/public/js/plugins/dashboard-tab.js index 948718dd1e..01812d0a4f 100644 --- a/src/sunstone/public/js/plugins/dashboard-tab.js +++ b/src/sunstone/public/js/plugins/dashboard-tab.js @@ -14,172 +14,6 @@ /* limitations under the License. */ /* -------------------------------------------------------------------------- */ -/* -var dashboard_tab_content = -'\ -\ -\ -\ -
\ -\ - \ - \ - \ - \ - \ - \ -
\ -
\ -

' + tr("Hosts") + '

\ -
\ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ -
' + tr("Total Hosts") + '' + tr("State") + '
\ -
' + tr("Global CPU Usage") + '
' + tr("Used vs. Max CPU") + '
\ -
\ -
' + tr("Used vs. Max Memory") + '
\ -
\ -
\ -\ -
\ -
\ -
\ -
\ -

' + tr("Clusters") + '

\ -
\ -\ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ -
' + tr("Allocated CPU per cluster") + '
' + tr("Allocated Memory per cluster") + '
\ -\ -
\ -
\ -
\ -
\ -\ - \ - \ - \ - \ - \ - \ -
\ -
\ -

' + tr("Virtual Machines") + '

\ -
\ - \ -\ - \ - \ - \ - \ -\ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ -
' + tr("Total VMs") + '' + tr("State") + '
\ -
' + tr("Bandwidth - Upload") + '' + tr("Bandwidth - Download") + '
' + tr("Global transfer rates") + '
\ -
\ -
\ -
\ -
\ -
\ -
\ -

' + tr("System Information") + '

\ -
\ - \ -\ - \ - \ - \ - \ -\ - \ - \ - \ - \ -\ - \ - \ - \ - \ - \ - \ - \ -\ -
' + tr("Total Users") + '' + tr("Total Groups") + '
' + tr("Users per group") + '
\ -
\ -
\ -
\ -
'; -*/ - var dashboard_tab_content = '\
\
\ diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index fbd2906890..bb902ddc98 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -40,7 +40,7 @@ var datastores_tab_content = '\
\
\
\ - \ + \
\
\
\ @@ -66,12 +66,6 @@ var datastores_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("Datatables are sets of images which share a common transfer driver. i.e. Images in a SSH datastore will be copied to the hosts using SSH when deploying a Virtual Machine.")+'\ -

\ -
\ '; var create_datastore_tmpl = diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index d8042f1a6c..7a317961be 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -40,7 +40,7 @@ var files_tab_content = '\ \ \
\ - \ + \
\ \ \ @@ -67,12 +67,6 @@ var files_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("Size and registration time are hidden colums. Note that persistent files can only be used by 1 VM. To change file datastore, please re-register the file.")+'\ -

\ -
\ '; var create_file_tmpl = diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index a246bbb280..767fa7afec 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -61,7 +61,7 @@ var groups_tab_content = '\ \ \
\ - \ + \
\
\
\ @@ -84,12 +84,6 @@ var groups_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("Tip: Refresh the list if it only shows user ids in the Users column.")+'\ -

\ -
\ '; var create_group_tmpl = diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index d33b352f0b..4856357237 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -44,7 +44,7 @@ var hosts_tab_content = '\ \ \
\ - \ + \
\
\
\ @@ -73,18 +73,6 @@ var hosts_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("CPU Use is calculated as the minimum between (total CPU - real CPU usage) and (allocated CPU). Real CPU usage is provided by the hosts monitoring driver. Available CPU is calculated using the information from the CPU setting of the VMs running on that host (allocated CPU)")+'\ -

\ -

\ -'+tr("Memory use is calculated according to the information provided by the host monitoring driver.")+'\ -

\ -

\ -'+tr("You can get monitoring graphs by clicking in the desired host and visiting the monitoring information tab. Note that oneacctd must be running for this information to be updated/available.")+'\ -

\ -
\ '; var create_host_tmpl = @@ -296,14 +284,14 @@ var host_actions = { var host_graphs = [ { monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU", - labels : "Allocated,Real,Total", + labels : tr("Allocated")+","+tr("Real")+","+tr("Total"), humanize_figures : false, div_graph : $("#host_cpu_graph"), div_legend : $("#host_cpu_legend") }, { monitor_resources : "HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM", - labels : "Allocated,Real,Total", + labels : tr("Allocated")+","+tr("Real")+","+tr("Total"), humanize_figures : true, div_graph : $("#host_mem_graph"), div_legend : $("#host_mem_legend") @@ -327,14 +315,14 @@ var host_actions = { var host_dashboard_graphs = [ { monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU", - labels : "Allocated,Real,Total", + labels : tr("Allocated")+","+tr("Real")+","+tr("Total"), humanize_figures : false, div_graph : $("#dash_host_cpu_graph", $dashboard) //div_legend : $("#dash_host_cpu_legend", $dashboard) }, { monitor_resources : "HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM", - labels : "Allocated,Real,Total", + labels : tr("Allocated")+","+tr("Real")+","+tr("Total"), humanize_figures : true, div_graph : $("#dash_host_mem_graph", $dashboard), div_legend : $("#dash_host_mem_legend", $dashboard) diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index c370ee252e..830d0d68d4 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -40,7 +40,7 @@ var images_tab_content = '\ \ \
\ - \ + \
\ \ \ @@ -67,12 +67,6 @@ var images_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("Size and registration time are hidden colums. Note that persistent images can only be used by 1 VM. To change image datastore, please re-register the image.")+'\ -

\ -
\ '; var create_image_tmpl = diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index cd7e590f15..2afcd1ced2 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -120,7 +120,7 @@ var marketplace_tab_content = '\ \ \
\ - \ + \
\ \ \ diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index ad439921e6..da43df0e36 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -39,7 +39,7 @@ var templates_tab_content = '\ \ \
\ - \ + \
\
\
\ @@ -63,15 +63,6 @@ var templates_tab_content = '\ \ \ \ -
\ - ?\ -

\ -'+tr("Clicking `instantiate` will create new Virtual Machines from the selected templates and name one-id. You will be able to assign a specific name to a new VM, or launch several instances at once if the template doesn't reference any persistent image.")+'\ -

\ -

\ -'+tr("You can clone a template to obtain a copy from an existing template. This copy will be owned by you.")+'\ -

\ -
\ '; @@ -98,8 +89,6 @@ var create_template_tmpl = '
'+ ''+ ''+ ''+ - //''+ - //''+ '
'+ '×'; @@ -755,17 +744,17 @@ function setup_capacity_tab_content(capacity_section) { function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ var html = '
'+ '
'+ - ' Image '+ + ' '+tr("Image")+ '
'+ '
'+ - ' Volatile Disk '+ + ' '+tr("Volatile Disk")+ '
'+ '
'+ '
'+ '
'+ '
'+ '
'+ - ''+ + ''+ '
'+ '
'+ ''+ @@ -792,7 +781,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
'+ '
'+ ''+tr("Please select an image from the list")+''+ - '
'+ @@ -1144,7 +1133,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ '
'+ '
'+ ''+tr("Please select an network from the list")+''+ - '
'+ @@ -1883,7 +1872,7 @@ function setupCreateTemplateDialog(){ '
'+ '
'+ ''+tr("Please select a Kernel from the list")+''+ - '
'+ '
'+ - '
'+ + '
'+ '
'+ '
'+ ''+ @@ -1376,10 +1376,13 @@ function updateTemplateInfo(request,template){ }; var template_tab = { title: tr("Template"), - content: '\ - '+ - prettyPrintJSON(template_info.TEMPLATE)+ - '
'+tr("Template")+'
' + content: '
\ +
\ + '+ + prettyPrintJSON(template_info.TEMPLATE)+'\ +
\ +
\ +
' }; $("#div_edit_rename_link").die(); @@ -1515,42 +1518,49 @@ function setupCreateTemplateDialog(){ var removeEmptyObjects = function(obj){ for (elem in obj){ var remove = false; - var value = obj[elem]; - if (value instanceof Array) - { - if (value.length == 0) - remove = true; - else if (value.length > 0) - { - value = jQuery.grep(value, function (n) { - var obj_length = 0; - for (e in n) - obj_length += 1; - - if (obj_length == 0) - return false; - - return true; - }); + if (elem == 'undefined') { + remove = true; + } + else { + var value = obj[elem]; + if (value instanceof Array) + { if (value.length == 0) - remove = true; - } - } - else if (value instanceof Object) - { - var obj_length = 0; - for (e in value) - obj_length += 1; - if (obj_length == 0) - remove = true; - } - else - { - value = String(value); - if (value.length == 0) - remove = true; + remove = true; + else if (value.length > 0) + { + value = jQuery.grep(value, function (n) { + var obj_length = 0; + for (e in n) + obj_length += 1; + + if (obj_length == 0) + return false; + + return true; + }); + + if (value.length == 0) + remove = true; + } + } + else if (value instanceof Object) + { + var obj_length = 0; + for (e in value) + obj_length += 1; + if (obj_length == 0) + remove = true; + } + else + { + value = String(value); + if (value.length == 0) + remove = true; + } } + if (remove) delete obj[elem]; } @@ -2324,37 +2334,45 @@ function setupCreateTemplateDialog(){ '
'+ ''+tr("SSH")+''+ '
'+ - '
'+ - ''+ + '
'+ + ''+ + '
'+ + '
'+ + ''+ + '
'+ + '
'+ + '
'+tr("Add an ssh public key to the context. If the Public Key textarea is empty then the user variable SSH_PUBLIC_KEY will be used.")+'
'+ '
'+ '
'+ - '
'+ '
'+ - '
'+ - ''+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ + '
'+ + ''+ '
'+ '
'+ + '
'+ + '\ - \
\
\
\ @@ -342,6 +342,7 @@ var create_vn_tmpl = \ \
\ + \ \ \ ×\ From 1bb10747aba99332f6f677732fd35b0eb8147f05 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 3 Apr 2013 16:36:50 +0200 Subject: [PATCH 34/82] Fix save_as dialog in Storage VM tab --- src/sunstone/public/js/plugins/vms-tab.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 55821acf53..71790a3c2c 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -2620,17 +2620,17 @@ function printSnapshots(vm_info){ return html; } -function setupSaveAsDialog(){ - dialogs_context.append('
'); - $save_as_dialog = $('#save_as_dialog',dialogs_context); - var dialog = $save_as_dialog; +function setupSnapshotDialog(){ + dialogs_context.append('
'); + $snapshot_dialog = $('#snapshot_dialog',dialogs_context); + var dialog = $snapshot_dialog; dialog.html('
\

\ '+tr("Snapshot")+'\

\
\ -
\ +\
\
\ \ @@ -2664,7 +2664,7 @@ function setupSaveAsDialog(){ dialog.addClass("reveal-modal"); setupTips(dialog); - $('#save_as_form',dialog).submit(function(){ + $('#snapshot_form',dialog).submit(function(){ var vm_id = $('#vm_id', this).val(); var snapshot_name = $('#snapshot_name', this).val(); @@ -2674,14 +2674,14 @@ function setupSaveAsDialog(){ Sunstone.runAction('VM.snapshot_create', vm_id, obj); - $save_as_dialog.trigger("reveal:close") + $snapshot_dialog.trigger("reveal:close") return false; }); }; function popUpSnapshotDialog(vm_id){ - $('#vm_id',$save_as_dialog).val(vm_id); - $save_as_dialog.reveal(); + $('#vm_id',$snapshot_dialog).val(vm_id); + $snapshot_dialog.reveal(); } @@ -2689,7 +2689,7 @@ function popUpSnapshotDialog(vm_id){ // Listeners to the disks operations (detach, saveas, attach) function setup_vm_snapshot_tab(){ - setupSaveAsDialog(); + setupSnapshotDialog(); $('a.snapshot_revert').live('click', function(){ var b = $(this); From bbe5ec52647ed156cf41fa35710add0480e7e501 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 3 Apr 2013 16:38:12 +0200 Subject: [PATCH 35/82] Remove Monitoring table from information VM tab --- src/sunstone/public/js/plugins/vms-tab.js | 27 ----------------------- 1 file changed, 27 deletions(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 71790a3c2c..8a1ebabe4a 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1272,33 +1272,6 @@ function updateVMInfo(request,vm){ \ \ \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
'+tr("Monitoring information")+'
'+tr("Net_TX")+''+vm_info.NET_TX+'
'+tr("Net_RX")+''+vm_info.NET_RX+'
'+tr("Used Memory")+''+humanize_size(vm_info.MEMORY)+'
'+tr("Used CPU")+''+vm_info.CPU+'
'+tr("VNC Session")+''+vncIcon(vm_info)+'
\
\
' + insert_permissions_table("VM", From 3ddbef0a18a3b022c1a89f995af64bc4b41b0c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 3 Apr 2013 16:43:02 +0200 Subject: [PATCH 36/82] Feature #1631: Use enum type in RM one.vm.action --- include/History.h | 4 +- src/rm/RequestManagerVirtualMachine.cc | 158 ++++++++++++++----------- 2 files changed, 88 insertions(+), 74 deletions(-) diff --git a/include/History.h b/include/History.h index 51e774ba91..744881bdbc 100644 --- a/include/History.h +++ b/include/History.h @@ -62,7 +62,7 @@ public: NONE_ACTION }; - string action_to_str(VMAction action) + static string action_to_str(VMAction action) { string st; @@ -133,7 +133,7 @@ public: return st; }; - int action_from_str(string& st, VMAction& action) + static int action_from_str(string& st, VMAction& action) { if (st == "migrate") { diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 66c9acb70d..b949438623 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -299,10 +299,10 @@ int RequestManagerVirtualMachine::add_history(VirtualMachine * vm, void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, RequestAttributes& att) { - string action = xmlrpc_c::value_string(paramList.getString(1)); - int id = xmlrpc_c::value_int(paramList.getInt(2)); + string action_st = xmlrpc_c::value_string(paramList.getString(1)); + int id = xmlrpc_c::value_int(paramList.getInt(2)); - int rc = -3; + int rc; Nebula& nd = Nebula::instance(); DispatchManager * dm = nd.get_dm(); @@ -310,8 +310,33 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, ostringstream oss; AuthRequest::Operation op = auth_op; + History::VMAction action; - if (action == "resched" || action == "unresched") + // Compatibility with 3.8 + if (action_st == "cancel") + { + action_st = "shutdown-hard"; + } + else if (action_st == "restart") + { + action_st = "boot"; + } + else if (action_st == "finalize") + { + action_st = "destroy"; + } + else if (action_st == "resubmit") + { + action_st = "destroy-recreate"; + } + else if (action_st == "reset") + { + action_st = "reboot-hard"; + } + + History::action_from_str(action_st, action); + + if (action == History::RESCHED_ACTION || action == History::UNRESCHED_ACTION) { op = AuthRequest::ADMIN; } @@ -321,73 +346,62 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, return; } - if (action == "shutdown") + switch (action) { - rc = dm->shutdown(id); - } - else if (action == "hold") - { - rc = dm->hold(id); - } - else if (action == "release") - { - rc = dm->release(id); - } - else if (action == "stop") - { - rc = dm->stop(id); - } - else if (action == "shutdown-hard" || action == "cancel") - { - rc = dm->cancel(id); - } - else if (action == "suspend") - { - rc = dm->suspend(id); - } - else if (action == "resume") - { - rc = dm->resume(id); - } - else if (action == "boot" || action == "restart") - { - rc = dm->restart(id); - } - else if (action == "destroy" || action == "finalize") - { - rc = dm->finalize(id); - } - else if (action == "destroy-recreate" || action == "resubmit") - { - rc = dm->resubmit(id); - } - else if (action == "reboot") - { - rc = dm->reboot(id); - } - else if (action == "resched") - { - rc = dm->resched(id, true); - } - else if (action == "unresched") - { - rc = dm->resched(id, false); - } - else if (action == "reboot-hard" || action == "reset") - { - rc = dm->reset(id); - } - else if (action == "poweroff") - { - rc = dm->poweroff(id); - } - else if (action == "undeploy") - { - rc = dm->undeploy(id, false); - } - else if (action == "undeploy-hard") - { - rc = dm->undeploy(id, true); + case History::SHUTDOWN_ACTION: + rc = dm->shutdown(id); + break; + case History::HOLD_ACTION: + rc = dm->hold(id); + break; + case History::RELEASE_ACTION: + rc = dm->release(id); + break; + case History::STOP_ACTION: + rc = dm->stop(id); + break; + case History::SHUTDOWN_HARD_ACTION: + rc = dm->cancel(id); + break; + case History::SUSPEND_ACTION: + rc = dm->suspend(id); + break; + case History::RESUME_ACTION: + rc = dm->resume(id); + break; + case History::BOOT_ACTION: + rc = dm->restart(id); + break; + case History::DESTROY_ACTION: + rc = dm->finalize(id); + break; + case History::DESTROY_RECREATE_ACTION: + rc = dm->resubmit(id); + break; + case History::REBOOT_ACTION: + rc = dm->reboot(id); + break; + case History::RESCHED_ACTION: + rc = dm->resched(id, true); + break; + case History::UNRESCHED_ACTION: + rc = dm->resched(id, false); + break; + case History::REBOOT_HARD_ACTION: + rc = dm->reset(id); + break; + case History::POWEROFF_ACTION: + rc = dm->poweroff(id); + break; + case History::UNDEPLOY_ACTION: + rc = dm->undeploy(id, false); + break; + case History::UNDEPLOY_HARD_ACTION: + rc = dm->undeploy(id, true); + break; + default: + rc = -3; + break; } switch (rc) @@ -401,14 +415,14 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, att); break; case -2: - oss << "Wrong state to perform action \"" << action << "\""; + oss << "Wrong state to perform action \"" << action_st << "\""; failure_response(ACTION, request_error(oss.str(),""), att); break; case -3: - oss << "Virtual machine action \"" << action + oss << "Virtual machine action \"" << action_st << "\" is not supported"; failure_response(ACTION, From 072716ef38704fbd3ebd1315246cd0617d429d2b Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 3 Apr 2013 16:57:09 +0200 Subject: [PATCH 37/82] Rename group columns name --- src/sunstone/public/js/plugins/groups-tab.js | 4 ++-- src/sunstone/public/js/plugins/hosts-tab.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 211e4636b7..9eebdf9109 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -77,8 +77,8 @@ var groups_tab_content = '\ '+tr("Name")+'\ '+tr("Users")+'\ '+tr("VMs")+'\ - '+tr("UMEM")+'\ - '+tr("UCPU")+'\ + '+tr("Memory")+'\ + '+tr("CPU")+'\ \ \ \ diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 0234a397af..565d79f128 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -86,7 +86,7 @@ var create_host_tmpl =
\
\
\ - \ + \
\
\ \ From e7d13c08033de14379e0c25ed780c11098871073 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 3 Apr 2013 17:23:37 +0200 Subject: [PATCH 38/82] bug #1838: states with vnc access are now consistent --- src/sunstone/OpenNebulaVNC.rb | 35 +++++++++++++++++++++++ src/sunstone/public/js/plugins/vms-tab.js | 10 +++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 59653d183d..051ba191d2 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -24,6 +24,41 @@ require 'opennebula' TOKEN_EXPIRE_SECONDS = 4 +VNC_STATES = [ + #0, #LCM_INIT + #1, #PROLOG + #2, #BOOT + 3, #RUNNING + 4, #MIGRATE + #5, #SAVE_STOP + #6, #SAVE_SUSPEND + #7, #SAVE_MIGRATE + #8, #PROLOG_MIGRATE + #9, #PROLOG_RESUME + #10, #EPILOG_STOP + #11, #EPILOG + 12, #SHUTDOWN + 13, #CANCEL + #14, #FAILURE + #15, #CLEANUP_RESUBMIT + 16, #UNKNOWN + 17, #HOTPLUG + 18, #SHUTDOWN_POWEROFF + #19, #BOOT_UNKNOWN + #20, #BOOT_POWEROFF + #21, #BOOT_SUSPENDED + #22, #BOOT_STOPPED + #23, #CLEANUP_DELETE + 24, #HOTPLUG_SNAPSHOT + 25, #HOTPLUG_NIC + 26, #HOTPLUG_SAVEAS + 27, #HOTPLUG_SAVEAS_POWEROFF + 28, #HOTPLUG_SAVEAS_SUSPENDED + 29 #SHUTDOWN_UNDEPLOY + #30, #EPILOG_UNDEPLOY + #31 #PROLOG_UNDEPLOY +] + class OpenNebulaVNC attr_reader :proxy_port diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 8a1ebabe4a..9cba9de762 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -24,7 +24,7 @@ function loadVNC(){ } loadVNC(); -var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE", "HOTPLUG_SNAPSHOT", "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", "HOTPLUG_SAVEAS_SUSPENDED"]; +var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE", "HOTPLUG_SNAPSHOT", "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", "HOTPLUG_SAVEAS_SUSPENDED", "SHUTDOWN_UNDEPLOY"]; //Permanent storage for last value of aggregated network usage //Used to calculate bandwidth @@ -1970,6 +1970,7 @@ function setupAttachDiskDialog(){ \
\ \ +
\
\
\ \ @@ -1982,7 +1983,8 @@ function setupAttachDiskDialog(){
\
' + generate_disk_tab_content("attach_disk", "attach_disk") + - '
\ + '
\ +
\
\ \ \ @@ -2231,6 +2233,7 @@ function setupAttachNicDialog(){ \
\ \ +
\
\
\ \ @@ -2243,7 +2246,8 @@ function setupAttachNicDialog(){
\
' + generate_nic_tab_content("attach_nic", "attach_nic") + - '
\ + '
\ +
\
\ \ \ From 72d3ea947173feda490dfd909936509375bc7d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 3 Apr 2013 17:38:06 +0200 Subject: [PATCH 39/82] Feature #1631: Change history reasons to be only 3: none, user, error --- include/History.h | 13 +++++-------- include/VirtualMachine.h | 6 +++--- src/lcm/LifeCycleActions.cc | 6 ++++-- src/lcm/LifeCycleStates.cc | 14 +++++++------- src/oca/ruby/opennebula/virtual_machine.rb | 6 ++---- src/ozones/Server/public/js/ozones.js | 4 +--- src/sunstone/public/js/opennebula.js | 4 +--- src/vm/History.cc | 2 +- 8 files changed, 24 insertions(+), 31 deletions(-) diff --git a/include/History.h b/include/History.h index 744881bdbc..9efdabe03f 100644 --- a/include/History.h +++ b/include/History.h @@ -28,16 +28,13 @@ using namespace std; class History:public ObjectSQL, public ObjectXML { public: - enum MigrationReason + enum EndReason { - NONE, /** < Normal termination in host */ - ERROR, /** < The VM was migrated because of an error */ - STOP_RESUME,/** < The VM was migrated because of a stop/resume request*/ - USER, /** < The VM was migrated because of an explicit request */ - CANCEL /** < The VM was migrated because of an explicit cancel */ + NONE, /** < History record is not closed yet */ + ERROR, /** < History record was closed because of an error */ + USER /** < History record was closed because of a user action */ }; - enum VMAction { MIGRATE_ACTION, @@ -292,7 +289,7 @@ private: time_t epilog_stime; time_t epilog_etime; - MigrationReason reason; + EndReason reason; VMAction action; diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 345eeb699a..e0bce0dce0 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -500,7 +500,7 @@ public: * Returns the reason that closed the history record in the previous host * @return the reason to close the history record in the previous host */ - const History::MigrationReason get_previous_reason() const + const History::EndReason get_previous_reason() const { return previous_history->reason; }; @@ -642,7 +642,7 @@ public: * Sets the reason that closed the history record * @param _reason reason to close the history record */ - void set_reason(History::MigrationReason _reason) + void set_reason(History::EndReason _reason) { history->reason=_reason; }; @@ -651,7 +651,7 @@ public: * Sets the reason that closed the history record in the previous host * @param _reason reason to close the history record in the previous host */ - void set_previous_reason(History::MigrationReason _reason) + void set_previous_reason(History::EndReason _reason) { previous_history->reason=_reason; }; diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 42574fd30b..f933274d64 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -48,12 +48,14 @@ void LifeCycleManager::deploy_action(int vid) if (vm->hasPreviousHistory()) { - if (vm->get_previous_reason() == History::STOP_RESUME) + if (vm->get_previous_history_action() == History::STOP_ACTION) { vm_state = VirtualMachine::PROLOG_RESUME; tm_action = TransferManager::PROLOG_RESUME; } - else if (vm->get_previous_reason() == History::NONE) + else if ( + vm->get_previous_history_action() == History::UNDEPLOY_ACTION || + vm->get_previous_history_action() == History::UNDEPLOY_HARD_ACTION) { vm_state = VirtualMachine::PROLOG_UNDEPLOY; tm_action = TransferManager::PROLOG_RESUME; diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 6429610102..139c12a805 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -93,7 +93,7 @@ void LifeCycleManager::save_success_action(int vid) vm->set_vm_info(); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::USER); vmpool->update_history(vm); @@ -121,7 +121,7 @@ void LifeCycleManager::save_success_action(int vid) vm->set_running_etime(the_time); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::USER); vmpool->update_history(vm); @@ -434,7 +434,7 @@ void LifeCycleManager::deploy_failure_action(int vid) vm->set_running_etime(the_time); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::ERROR); vmpool->update_history(vm); @@ -510,7 +510,7 @@ void LifeCycleManager::shutdown_success_action(int vid) vm->set_vm_info(); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::USER); vmpool->update_history(vm); @@ -720,7 +720,7 @@ void LifeCycleManager::prolog_failure_action(int vid) vm->set_vm_info(); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::ERROR); vmpool->update_history(vm); @@ -953,7 +953,7 @@ void LifeCycleManager::cancel_success_action(int vid) vmpool->update(vm); - vm->set_reason(History::CANCEL); + vm->set_reason(History::USER); vm->set_epilog_stime(the_time); @@ -1119,7 +1119,7 @@ void LifeCycleManager::monitor_suspend_action(int vid) vm->set_vm_info(); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::ERROR); vmpool->update_history(vm); diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 905a7e83e8..23bdf977b6 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -103,14 +103,12 @@ module OpenNebula "PROLOG_UNDEPLOY" => "prol" } - MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL} + MIGRATE_REASON=%w{NONE ERROR USER} SHORT_MIGRATE_REASON={ "NONE" => "none", "ERROR" => "erro", - "STOP_RESUME" => "stop", - "USER" => "user", - "CANCEL" => "canc" + "USER" => "user" } # Creates a VirtualMachine description with just its identifier diff --git a/src/ozones/Server/public/js/ozones.js b/src/ozones/Server/public/js/ozones.js index e8661caccd..ee70bb595c 100644 --- a/src/ozones/Server/public/js/ozones.js +++ b/src/ozones/Server/public/js/ozones.js @@ -125,9 +125,7 @@ var oZones = { case "vm_migrate_reason": state = tr(["NONE", "ERROR", - "STOP_RESUME", - "USER", - "CANCEL"][value]); + "USER"][value]); break; default: return value; diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 9b3d5dcb18..38d535d00a 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -133,9 +133,7 @@ var OpenNebula = { case "vm_migrate_reason": state = tr(["NONE", "ERROR", - "STOP_RESUME", - "USER", - "CANCEL"][value]); + "USER"][value]); break; default: return value; diff --git a/src/vm/History.cc b/src/vm/History.cc index 2509b5b6e7..5e2ba19dfe 100644 --- a/src/vm/History.cc +++ b/src/vm/History.cc @@ -352,7 +352,7 @@ int History::rebuild_attributes() rc += xpath(int_reason , "/HISTORY/REASON", 0); rc += xpath(int_action , "/HISTORY/ACTION", 0); - reason = static_cast(int_reason); + reason = static_cast(int_reason); action = static_cast(int_action); non_persistent_data(); From cf2f6d4b7214e04c921c23449c966148fbfd4468 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 3 Apr 2013 17:37:19 +0200 Subject: [PATCH 40/82] Bug in CLI network and context generation --- src/cli/one_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 7a094384d5..1ce49a1c73 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -729,8 +729,8 @@ EOT end end - if options[:net_context] && options[:network] - nets=options[:network].map {|n| parse_user_object(n).last } + if options[:net_context] && options[:nic] + nets=options[:nic].map {|n| parse_user_object(n).last } if nets!=nets.uniq STDERR.puts "Network context generation from command "<< @@ -789,8 +789,8 @@ EOT template< Date: Wed, 3 Apr 2013 17:37:48 +0200 Subject: [PATCH 41/82] Strip trailing spaces for every table line in CLI --- src/cli/cli_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/cli_helper.rb b/src/cli/cli_helper.rb index 1fbd83b1f1..2b32b97b3d 100644 --- a/src/cli/cli_helper.rb +++ b/src/cli/cli_helper.rb @@ -226,7 +226,7 @@ module CLIHelper str }.join(' ') - }.join("\n") + }.join("\n").gsub(/ *$/, '') rescue Errno::EPIPE end From b483b8bb2570fbddfe5efe33e17ac80a24ca103c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 3 Apr 2013 18:20:20 +0200 Subject: [PATCH 42/82] Feature #1631: Fix merge --- include/History.h | 8 ++++++++ src/lcm/LifeCycleActions.cc | 10 ++++++---- src/lcm/LifeCycleStates.cc | 2 +- src/rm/RequestManagerVirtualMachine.cc | 5 ++++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/History.h b/include/History.h index 9efdabe03f..5e79ace5a8 100644 --- a/include/History.h +++ b/include/History.h @@ -56,6 +56,7 @@ public: RESCHED_ACTION, UNRESCHED_ACTION, POWEROFF_ACTION, + POWEROFF_HARD_ACTION, NONE_ACTION }; @@ -122,6 +123,9 @@ public: case POWEROFF_ACTION: st = "poweroff"; break; + case POWEROFF_HARD_ACTION: + st = "poweroff-hard"; + break; case NONE_ACTION: st = "none"; break; @@ -208,6 +212,10 @@ public: { action = POWEROFF_ACTION; } + else if (st == "poweroff-hard") + { + action = POWEROFF_HARD_ACTION; + } else { action = NONE_ACTION; diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 51174bce2e..95516cd110 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -463,22 +463,24 @@ void LifeCycleManager::poweroff_action(int vid, bool hard) vmpool->update(vm); - vm->set_history_action(History::POWEROFF_ACTION); - - vmpool->update_history(vm); - vm->log("LCM",Log::INFO,"New VM state is SHUTDOWN_POWEROFF"); //---------------------------------------------------- if (hard) { + vm->set_history_action(History::POWEROFF_HARD_ACTION); + vmm->trigger(VirtualMachineManager::CANCEL,vid); } else { + vm->set_history_action(History::POWEROFF_ACTION); + vmm->trigger(VirtualMachineManager::SHUTDOWN,vid); } + + vmpool->update_history(vm); } else { diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index b4528e071b..26ba3576a0 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -1010,7 +1010,7 @@ void LifeCycleManager::cancel_success_action(int vid) vm->set_vm_info(); - vm->set_reason(History::STOP_RESUME); + vm->set_reason(History::NONE); vmpool->update_history(vm); diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index b949438623..638019728f 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -391,7 +391,10 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, rc = dm->reset(id); break; case History::POWEROFF_ACTION: - rc = dm->poweroff(id); + rc = dm->poweroff(id, false); + break; + case History::POWEROFF_HARD_ACTION: + rc = dm->poweroff(id, true); break; case History::UNDEPLOY_ACTION: rc = dm->undeploy(id, false); From 3e99db4a03f69621100db2e90f586858186244e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 3 Apr 2013 18:24:09 +0200 Subject: [PATCH 43/82] Feature #1631: Set USER reason for any operation initiated by the user --- src/lcm/LifeCycleStates.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 26ba3576a0..58eff2d1b4 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -534,7 +534,7 @@ void LifeCycleManager::shutdown_success_action(int vid) vm->set_running_etime(the_time); - vm->set_reason(History::NONE); + vm->set_reason(History::USER); vmpool->update_history(vm); @@ -753,7 +753,7 @@ void LifeCycleManager::prolog_failure_action(int vid) vm->set_vm_info(); - vm->set_reason(History::NONE); + vm->set_reason(History::ERROR); vmpool->update_history(vm); @@ -984,7 +984,7 @@ void LifeCycleManager::cancel_success_action(int vid) vm->set_running_etime(the_time); - vm->set_reason(History::NONE); + vm->set_reason(History::USER); vmpool->update_history(vm); @@ -1010,7 +1010,7 @@ void LifeCycleManager::cancel_success_action(int vid) vm->set_vm_info(); - vm->set_reason(History::NONE); + vm->set_reason(History::USER); vmpool->update_history(vm); From dd516424ccb54b61c2fa3f8e81cb7eddd5382d69 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 3 Apr 2013 20:03:21 +0200 Subject: [PATCH 44/82] Add new undeploy action to Sunstone --- .../OpenNebulaJSON/VirtualMachineJSON.rb | 11 ++- src/sunstone/public/js/opennebula.js | 23 ++++++- src/sunstone/public/js/plugins/vms-tab.js | 66 +++++++++++++++--- src/sunstone/public/js/sunstone.js | 68 ++++++++++++++----- 4 files changed, 139 insertions(+), 29 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index f8a6e28aad..cb2ac8ecb0 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -61,7 +61,7 @@ module OpenNebulaJSON 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 + when "poweroff" then self.poweroff(action_hash['params']) when "resubmit" then self.resubmit when "chown" then self.chown(action_hash['params']) when "chmod" then self.chmod_octet(action_hash['params']) @@ -72,6 +72,7 @@ module OpenNebulaJSON when "detachnic" then self.detachnic(action_hash['params']) when "update" then self.update(action_hash['params']) when "rename" then self.rename(action_hash['params']) + when "undeploy" then self.undeploy(action_hash['params']) else error_msg = "#{action_hash['perform']} action not " << " available for this resource" @@ -87,6 +88,14 @@ module OpenNebulaJSON super(params['host_id']) end + def undeploy(params=Hash.new) + super(params['hard']) + end + + def poweroff(params=Hash.new) + super(params['hard']) + end + def migrate(params=Hash.new, live=false, enforce=false) # TODO add enforce parameter super(params['host_id'], live) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 9b3d5dcb18..0c14195973 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -83,7 +83,8 @@ var OpenNebula = { "SUSPENDED", "DONE", "FAILED", - "POWEROFF"][value]); + "POWEROFF", + "UNDEPLOYED"][value]); break; case "VM_LCM": case "vm_lcm": @@ -115,7 +116,10 @@ var OpenNebula = { "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", - "HOTPLUG_SAVEAS_SUSPENDED"][value]); + "HOTPLUG_SAVEAS_SUSPENDED", + "SHUTDOWN_UNDEPLOY", + "EPILOG_UNDEPLOY", + "PROLOG_UNDEPLOY"][value]); break; case "IMAGE": case "image": @@ -664,7 +668,20 @@ var OpenNebula = { OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"resubmit"); }, "poweroff" : function(params){ - OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"poweroff"); + var action_obj = {"hard": false}; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"poweroff", action_obj); + }, + "poweroff_hard" : function(params){ + var action_obj = {"hard": true}; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"poweroff", action_obj); + }, + "undeploy" : function(params){ + var action_obj = {"hard": false}; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"undeploy", action_obj); + }, + "undeploy_hard" : function(params){ + var action_obj = {"hard": true}; + OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"undeploy", action_obj); }, "reboot" : function(params){ OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"reboot"); diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 9cba9de762..dfa400ef92 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -371,6 +371,33 @@ var vm_actions = { notify: true }, + "VM.poweroff_hard" : { + type: "multiple", + call: OpenNebula.VM.poweroff_hard, + callback: vmShow, + elements: vmElements, + error: onError, + notify: true + }, + + "VM.undeploy" : { + type: "multiple", + call: OpenNebula.VM.undeploy, + callback: vmShow, + elements: vmElements, + error: onError, + notify: true + }, + + "VM.undeploy_hard" : { + type: "multiple", + call: OpenNebula.VM.undeploy_hard, + callback: vmShow, + elements: vmElements, + error: onError, + notify: true + }, + "VM.saveas" : { type: "single", call: OpenNebula.VM.saveas, @@ -754,45 +781,63 @@ var vm_buttons = { "VM.suspend" : { type: "confirm", text: tr("Suspend"), - layout: "vmsstopresume_buttons", + layout: "vmspause_buttons", tip: tr("This will suspend selected machines") }, "VM.resume" : { type: "confirm", - text: tr("Resume"), - layout: "vmsstopresume_buttons", + text: '', + layout: "vmsplay_buttons", tip: tr("This will resume selected stopped or suspended VMs") }, "VM.stop" : { type: "confirm", text: tr("Stop"), - layout: "vmsstopresume_buttons", + layout: "vmsstop_buttons", tip: tr("This will stop selected VMs") }, "VM.restart" : { type: "confirm", text: tr("Boot"), - layout: "vmsoneoff_buttons", + layout: "vmsplanification_buttons", tip: tr("This will redeploy selected VMs (in UNKNOWN or BOOT state)") }, "VM.reboot" : { type : "confirm", text: tr("Reboot"), - layout: "vmsoneoff_buttons", + layout: "vmsrepeat_buttons", tip: tr("This will send a reboot action to running VMs") }, "VM.reset" : { type: "confirm", text: tr("Reboot") + ' hard', - layout: "vmsoneoff_buttons", + layout: "vmsrepeat_buttons", tip: tr("This will perform a hard reboot on selected VMs") }, "VM.poweroff" : { type : "confirm", text: tr("Power Off"), - layout: "vmsoneoff_buttons", + layout: "vmspause_buttons", tip: tr("This will send a power off signal to running VMs. They can be restarted later.") }, + "VM.poweroff_hard" : { + type : "confirm", + text: tr("Power Off") + ' hard', + layout: "vmspause_buttons", + tip: tr("This will send a power off signal to running VMs. They can be restarted later.") + }, + "VM.undeploy" : { + type : "confirm", + text: tr("Undeploy"), + layout: "vmsstop_buttons", + tip: tr("Shuts down the given VM. The VM is saved in the system Datastore.") + }, + "VM.undeploy_hard" : { + type : "confirm", + text: tr("Undeploy") + ' hard', + layout: "vmsstop_buttons", + tip: tr("Shuts down the given VM. The VM is saved in the system Datastore.") + }, "VM.shutdown" : { type: "confirm", text: tr("Shutdown"), @@ -815,7 +860,7 @@ var vm_buttons = { "VM.resubmit" : { type: "confirm", text: tr("Destroy") + ' recreate', - layout: "vmsdelete_buttons", + layout: "vmsrepeat_buttons", tip: tr("This will resubmits VMs to PENDING state") }, @@ -1459,6 +1504,9 @@ function printActionsTable(vm_info) \ \ \ + \ + \ + \ \ \ \ diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 0069a7c118..7a49b5f844 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -582,19 +582,21 @@ function insertButtonsInTab(tab_name){ "
"+ '
'+ '
    '+ - '
  • '+ + '
  • '+ "
    "+ ""+ "
    "+ '
  • '+ - '
  • '+ + '
'+ + '
    '+ + '
  • '+ "
    "+ ""+ @@ -609,15 +611,34 @@ function insertButtonsInTab(tab_name){ "
    "+ "
"+ ''+ - '
  • '+ + ''+ + '
      '+ + '
    • '+ + "
      "+ + "
      "+ + "
      "+ + "
      "+ + '
    • '+ + '
    • '+ "
      "+ ""+ "
      "+ '
    • '+ + '
    • '+ + "
      "+ + ""+ + "
      "+ + '
    • '+ + '
    '+ + '
      '+ '
    • '+ "
      "+ "
        "+ @@ -703,13 +724,24 @@ function insertButtonsInTab(tab_name){ str_class.push("secondary", "button", "small", "radius"); button_code = '
      • '; break; - case "vmsstopresume_buttons": - context = $("#vmsstopresume_buttons ul", buttons_row); + case "vmsplay_buttons": + context = $("#vmsplay_buttons", buttons_row); + text = button.text; + str_class.push("secondary", "button", "small", "radius"); + button_code = ''; + break; + case "vmspause_buttons": + context = $("#vmspause_buttons ul", buttons_row); text = button.text; button_code = '
      • '+text+'
      • '; break; - case "vmsplanification_buttons": - context = $("#vmsplanification_buttons ul", buttons_row); + case "vmsstop_buttons": + context = $("#vmsstop_buttons ul", buttons_row); + text = button.text; + button_code = '
      • '+text+'
      • '; + break; + case "vmsrepeat_buttons": + context = $("#vmsrepeat_buttons ul", buttons_row); text = button.text; button_code = '
      • '+text+'
      • '; break; @@ -718,8 +750,8 @@ function insertButtonsInTab(tab_name){ text = button.text; button_code = '
      • '+text+'
      • '; break; - case "vmsoneoff_buttons": - context = $("#vmsoneoff_buttons ul", buttons_row); + case "vmsplanification_buttons": + context = $("#vmsplanification_buttons ul", buttons_row); text = button.text; button_code = '
      • '+text+'
      • '; break; @@ -769,12 +801,16 @@ function insertButtonsInTab(tab_name){ $("#vmsdelete_buttons", action_block).remove() } - if ($("#vmsoneoff_buttons ul li", action_block).length == 0 ) { - $("#vmsoneoff_buttons", action_block).remove() + if ($("#vmsstop_buttons ul li", action_block).length == 0 ) { + $("#vmsstop_buttons", action_block).remove() } - if ($("#vmsstopresume_buttons ul li", action_block).length == 0 ) { - $("#vmsstopresume_buttons", action_block).remove() + if ($("#vmspause_buttons ul li", action_block).length == 0 ) { + $("#vmspause_buttons", action_block).remove() + } + + if ($("#vmsrepeat_buttons ul li", action_block).length == 0 ) { + $("#vmsrepeat_buttons", action_block).remove() } if ($("#user_buttons ul li", action_block).length == 0 ) { From 4095acb7cc3864468b4d109edc4cba5381cfb6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 11:34:20 +0200 Subject: [PATCH 45/82] Feature #1631: Fix history reason for migrate. --- include/VirtualMachine.h | 3 +-- src/lcm/LifeCycleActions.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index e0bce0dce0..3caa17335e 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -669,12 +669,11 @@ public: * Sets the action that closed the history record in the previous host * @param action that closed the history record in the previous host */ -/* void set_previous_history_action(History::VMAction action) { previous_history->action = action; }; -*/ + // ------------------------------------------------------------------------ // Template // ------------------------------------------------------------------------ diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 95516cd110..0ef0f49511 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -225,7 +225,7 @@ void LifeCycleManager::migrate_action(int vid) vm->set_stime(time(0)); - vm->set_history_action(History::MIGRATE_ACTION); + vm->set_previous_history_action(History::MIGRATE_ACTION); vmpool->update_history(vm); From 07e08deb43c53b05310e88af15c197fa62193d50 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 4 Apr 2013 11:45:15 +0200 Subject: [PATCH 46/82] Fix login error message --- src/sunstone/public/css/app.css | 73 +++++++++++++------------- src/sunstone/public/css/login.css | 52 ++++++++++++++---- src/sunstone/public/js/login.js | 8 +-- src/sunstone/public/sass/app.scss | 3 +- src/sunstone/views/_login_standard.erb | 7 +-- src/sunstone/views/_login_x509.erb | 11 ++-- 6 files changed, 93 insertions(+), 61 deletions(-) diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index 8ec1dc2f7a..88ba623478 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -3734,7 +3734,6 @@ ul.tabs-content.contained.vertical > li { div.alert-box { display: block; padding: 6px 7px 7px; - font-weight: bold; font-size: 14px; color: white; background-color: #2ba6cb; @@ -3747,6 +3746,7 @@ div.alert-box { border-radius: 3px; text-shadow: 0 -1px rgba(0, 0, 0, 0.3); position: relative; + font-family: Arial, Helvetica, sans-serif; } /* line 29, ../../../../../../../.rbenv/versions/1.9.3-p392/lib/ruby/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_ui.scss */ div.alert-box.success { @@ -6655,40 +6655,41 @@ small { /* line 616, ../sass/app.scss */ .button.dropdown.small::after { - border-color: #2f2f2f transparent transparent transparent; + border-color: #9f9f9f transparent transparent transparent; + border-width: 4px; } -/* line 620, ../sass/app.scss */ +/* line 621, ../sass/app.scss */ .footer-opennebula { font-size: 10px; color: #b6b6b6 !important; } -/* line 625, ../sass/app.scss */ +/* line 626, ../sass/app.scss */ a.footer.button { margin: 5px; } -/* line 630, ../sass/app.scss */ +/* line 631, ../sass/app.scss */ .user-login { float: right; } -/* line 634, ../sass/app.scss */ +/* line 635, ../sass/app.scss */ .user-login i.header-icon { color: #6f6f6f; font-weight: 300; font-size: 23px; } -/* line 640, ../sass/app.scss */ +/* line 641, ../sass/app.scss */ .user-login .button { color: #6f6f6f; font-size: 60%; line-height: 0; } -/* line 646, ../sass/app.scss */ +/* line 647, ../sass/app.scss */ .user-login .button.secondary { background: #f2f2f2; border: 0px; @@ -6696,88 +6697,88 @@ a.footer.button { font-weight: 300; } -/* line 654, ../sass/app.scss */ +/* line 655, ../sass/app.scss */ .user-login .button.secondary:hover, .user-login .button.secondary:focus { background-color: #d0d0d0; color: #6f6f6f; } -/* line 659, ../sass/app.scss */ +/* line 660, ../sass/app.scss */ .user-login .button.dropdown.tiny::after { border: solid 5px; border-color: #b6b6b6 transparent transparent transparent; right: 7px; } -/* line 665, ../sass/app.scss */ +/* line 666, ../sass/app.scss */ .header-resource { text-align: center; } -/* line 669, ../sass/app.scss */ +/* line 670, ../sass/app.scss */ .header-resource { float: left; } -/* line 673, ../sass/app.scss */ +/* line 674, ../sass/app.scss */ .header { text-align: center; } -/* line 677, ../sass/app.scss */ +/* line 678, ../sass/app.scss */ .button.dropdown.tiny ul.no-hover.show-dropdown { top: 34px !important; } -/* line 681, ../sass/app.scss */ +/* line 682, ../sass/app.scss */ .graph_legend { text-align: center; } -/* line 685, ../sass/app.scss */ +/* line 686, ../sass/app.scss */ .graph_legend table { background: inherit; border: 0px; width: 100%; } -/* line 691, ../sass/app.scss */ +/* line 692, ../sass/app.scss */ .graph_legend h3 { margin-top: 0px; } -/* line 695, ../sass/app.scss */ +/* line 696, ../sass/app.scss */ .graph_legend .subheader { margin-bottom: 5px; } -/* line 699, ../sass/app.scss */ +/* line 700, ../sass/app.scss */ .dashboard hr { margin: 0; margin-bottom: 8px; } -/* line 704, ../sass/app.scss */ +/* line 705, ../sass/app.scss */ .graph { margin-bottom: 15px !important; } -/* line 708, ../sass/app.scss */ +/* line 709, ../sass/app.scss */ .dashboard-panel { height: 450px; } -/* line 712, ../sass/app.scss */ +/* line 713, ../sass/app.scss */ .vm_log_error { color: #ff8d81; } -/* line 716, ../sass/app.scss */ +/* line 717, ../sass/app.scss */ .noUiSlider { margin: 10px; } -/* line 720, ../sass/app.scss */ +/* line 721, ../sass/app.scss */ .log-tab { background: #6f6f6f; color: #f2f2f2; @@ -6785,12 +6786,12 @@ a.footer.button { padding: 20px; } -/* line 727, ../sass/app.scss */ +/* line 728, ../sass/app.scss */ .reveal-modal ul.tabs-content { margin: 0 0 0px; } -/* line 731, ../sass/app.scss */ +/* line 732, ../sass/app.scss */ .reveal-body { max-height: 360px; overflow-y: auto; @@ -6798,7 +6799,7 @@ a.footer.button { padding: 5px; } -/* line 741, ../sass/app.scss */ +/* line 742, ../sass/app.scss */ div.time-picker { position: absolute; height: 191px; @@ -6811,20 +6812,20 @@ div.time-picker { margin: 0; } -/* line 751, ../sass/app.scss */ +/* line 752, ../sass/app.scss */ div.time-picker-12hours { width: 6em; /* needed for IE */ } -/* line 755, ../sass/app.scss */ +/* line 756, ../sass/app.scss */ div.time-picker ul { list-style-type: none; margin: 0; padding: 0; } -/* line 760, ../sass/app.scss */ +/* line 761, ../sass/app.scss */ div.time-picker li { cursor: pointer; height: 20px; @@ -6832,36 +6833,36 @@ div.time-picker li { padding: 4px 3px; } -/* line 766, ../sass/app.scss */ +/* line 767, ../sass/app.scss */ div.time-picker li.selected { background: #0063CE; color: #fff; } -/* line 772, ../sass/app.scss */ +/* line 773, ../sass/app.scss */ .timepicker { float: left; width: 50px !important; } -/* line 777, ../sass/app.scss */ +/* line 778, ../sass/app.scss */ .jdpicker { float: left; width: 90px !important; } -/* line 782, ../sass/app.scss */ +/* line 783, ../sass/app.scss */ .columns { line-height: 2; } -/* line 786, ../sass/app.scss */ +/* line 787, ../sass/app.scss */ .transparent_table, .transparent_table tr { background: none !important; border: 0px !important; } -/* line 791, ../sass/app.scss */ +/* line 792, ../sass/app.scss */ form { margin: 0 !important; } diff --git a/src/sunstone/public/css/login.css b/src/sunstone/public/css/login.css index a91e7d89a5..58e2d30dd1 100644 --- a/src/sunstone/public/css/login.css +++ b/src/sunstone/public/css/login.css @@ -150,16 +150,6 @@ div#login input#login_btn:hover { background: url(../images/login_over.png) no-repeat center ; } -.error_message { - display: none; - position: relative; - width:400px; - margin-left: auto; - margin-right: auto; - top: 80px; - font-size:1.0em; - padding: 2px 15px; -} #login_spinner { left: 22px; @@ -187,3 +177,45 @@ div#login input#login_btn:hover { margin-top: 35px; margin-left:0px; } + +div.alert-box { + display: block; + padding: 6px 7px 7px; + font-size: 14px; + color: white; + background-color: #2ba6cb; + border: 1px solid rgba(0, 0, 0, 0.1); + margin-bottom: 12px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + text-shadow: 0 -1px rgba(0, 0, 0, 0.3); + position: relative; + font-family: Arial, Helvetica, sans-serif; +} + +div.alert-box.alert { + background-color: #c0392b; + color: #fff; + text-shadow: 0 -1px rgba(0, 0, 0, 0.3); +} + +div.alert-box a.close { + color: #333; + position: absolute; + right: 4px; + top: -1px; + font-size: 17px; + opacity: 0.2; + padding: 4px; +} +/* line 34, ../../../../../../../.rbenv/versions/1.9.3-p392/lib/ruby/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_ui.scss */ +div.alert-box a.close:hover, div.alert-box a.close:focus { + opacity: 0.4; +} + +#error_box { + margin-top:70px; +} \ No newline at end of file diff --git a/src/sunstone/public/js/login.js b/src/sunstone/public/js/login.js index 645c6207fe..b681add977 100644 --- a/src/sunstone/public/js/login.js +++ b/src/sunstone/public/js/login.js @@ -24,16 +24,16 @@ function auth_error(req, error){ switch (status){ case 401: - $("#error_box").text("Invalid username or password"); + $("#error_message").text("Invalid username or password"); break; case 500: - $("#error_box").text("OpenNebula is not running or there was a server exception. Please check the server logs."); + $("#error_message").text("OpenNebula is not running or there was a server exception. Please check the server logs."); break; case 0: - $("#error_box").text("No answer from server. Is it running?"); + $("#error_message").text("No answer from server. Is it running?"); break; default: - $("#error_box").text("Unexpected error. Status "+status+". Check the server logs."); + $("#error_message").text("Unexpected error. Status "+status+". Check the server logs."); }; $("#error_box").fadeIn("slow"); $("#login_spinner").hide(); diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index e69d9d6d3e..d9a893949e 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -614,7 +614,8 @@ small { .button.dropdown.small::after { - border-color: #2f2f2f transparent transparent transparent; + border-color: #9f9f9f transparent transparent transparent; + border-width: 4px; } .footer-opennebula { diff --git a/src/sunstone/views/_login_standard.erb b/src/sunstone/views/_login_standard.erb index da26dc91da..50af211cfe 100644 --- a/src/sunstone/views/_login_standard.erb +++ b/src/sunstone/views/_login_standard.erb @@ -2,8 +2,7 @@
        -
        -
        +
        @@ -17,8 +16,10 @@ retrieving -
        +
  • diff --git a/src/sunstone/views/_login_x509.erb b/src/sunstone/views/_login_x509.erb index 96150cd191..1e19ba1582 100644 --- a/src/sunstone/views/_login_x509.erb +++ b/src/sunstone/views/_login_x509.erb @@ -2,13 +2,6 @@
    -
    - Invalid username or password -
    -
    - OpenNebula is not running -
    -
    @@ -17,6 +10,10 @@
    +
    From 1f3505f20b6166dd3de4577323950a59ba4f4546 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 4 Apr 2013 12:00:21 +0200 Subject: [PATCH 47/82] bug #1862: Fix model field in vm template creation form --- src/sunstone/public/js/plugins/templates-tab.js | 8 ++++---- src/sunstone/public/js/sunstone.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 9436f989b3..906283fc94 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1150,7 +1150,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ '
    '+ ''+ '
    '+ - '
    '+ + '
    '+ ''+ '
    '+ '
    '+ @@ -1163,7 +1163,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ '
    '+ ''+ '
    '+ - '
    '+ + '
    '+ ''+ '
    '+ '
    '+ @@ -1193,7 +1193,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ ''+ '
    '+ '
    '+ - '
    '+tr("A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000")+'
    '+ + '
    '+tr("A list of ports separated by commas or a ranges separated by semicolons, e.g.: 22,80,5900:6000")+'
    '+ '
    '+ '
    '+ '
    '+ @@ -1218,7 +1218,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ ''+ '
    '+ '
    '+ - '
    '+tr("A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000")+'
    '+ + '
    '+tr("A list of ports separated by commas or a ranges separated by semicolons, e.g.: 22,80,5900:6000")+'
    '+ '
    '+ '
    '+ ''+ diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 7a49b5f844..5f55039387 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -916,7 +916,7 @@ function setupConfirmDialogs(){
    \
    \ \ - \ + \
    \ ×\ '); @@ -956,7 +956,7 @@ function setupConfirmDialogs(){
    \
    \ \ - \ + \
    \ ×\ '); From ce61d6ee17f0e28684f050ad4257bff194df1dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 12:12:30 +0200 Subject: [PATCH 48/82] Feature #1631: Add history close action to onevm show and oneacct output --- src/cli/etc/oneacct.yaml | 5 +++++ src/cli/one_helper.rb | 12 ++++++++++++ src/cli/one_helper/oneacct_helper.rb | 6 +++++- src/cli/one_helper/onevm_helper.rb | 20 ++++++++++++-------- src/oca/ruby/opennebula/virtual_machine.rb | 9 +++++++++ 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/cli/etc/oneacct.yaml b/src/cli/etc/oneacct.yaml index 0e79bf3db1..d7e487aa83 100644 --- a/src/cli/etc/oneacct.yaml +++ b/src/cli/etc/oneacct.yaml @@ -12,6 +12,11 @@ :size: 15 :left: true +:ACTION: + :desc: VM state change action + :size: 16 + :left: true + :REASON: :desc: VM state change reason :size: 4 diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 1ce49a1c73..093fd285b8 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -608,6 +608,18 @@ EOT end end + def OpenNebulaHelper.short_period_to_str(time, print_seconds=true) + seconds=time.to_i + minutes, seconds=seconds.divmod(60) + hours, minutes=minutes.divmod(60) + + if print_seconds + "%3dh%02dm%02ds" % [hours, minutes, seconds] + else + "%3dh%02dm" % [hours, minutes] + end + end + BinarySufix = ["K", "M", "G", "T" ] def OpenNebulaHelper.unit_to_str(value, options, unit="K") diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb index 385c1f7921..f5c78b99a6 100644 --- a/src/cli/one_helper/oneacct_helper.rb +++ b/src/cli/one_helper/oneacct_helper.rb @@ -112,6 +112,10 @@ class AcctHelper < OpenNebulaHelper::OneHelper d["HOSTNAME"] end + column :"ACTION", "VM state change action", :left, :size=>16 do |d| + VirtualMachine.get_history_action d["ACTION"] + end + column :REASON, "VM state change reason", :left, :size=>4 do |d| VirtualMachine.get_reason d["REASON"] end @@ -142,7 +146,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.unit_to_str(d["VM"]["NET_TX"].to_i / 1024.0, {}) end - default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX + default :VID, :HOSTNAME, :ACTION, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX end def self.print_start_end_time_header(start_time, end_time) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index db06cedb50..b40a147c34 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -531,15 +531,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper def format_history(vm) table=CLIHelper::ShowTable.new(nil, self) do - column :SEQ, "Sequence number", :size=>4 do |d| + column :SEQ, "Sequence number", :size=>3 do |d| d["SEQ"] end - column :HOST, "Host name of the VM container", :left, :size=>20 do |d| + column :HOST, "Host name of the VM container", :left, :size=>15 do |d| d["HOSTNAME"] end - column :REASON, "VM state change reason", :left, :size=>6 do |d| + column :"ACTION", "VM state change action", :left, :size=>16 do |d| + VirtualMachine.get_history_action d["ACTION"] + end + + column :REASON, "VM state change reason", :left, :size=>4 do |d| VirtualMachine.get_reason d["REASON"] end @@ -547,14 +551,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.time_to_str(d['STIME']) end - column :TIME, "Total time in this state", :size=>15 do |d| + column :TIME, "Total time in this state", :size=>11 do |d| stime = d["STIME"].to_i etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i dtime = etime-stime - OpenNebulaHelper.period_to_str(dtime) + OpenNebulaHelper.period_to_str(dtime, false) end - column :PROLOG_TIME, "Prolog time for this state", :size=>15 do |d| + column :PROLOG, "Prolog time for this state", :size=>10 do |d| stime = d["PSTIME"].to_i if d["PSTIME"]=="0" etime=0 @@ -562,10 +566,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper etime = d["PETIME"]=="0" ? Time.now.to_i: d["PETIME"].to_i end dtime = etime-stime - OpenNebulaHelper.period_to_str(dtime) + OpenNebulaHelper.short_period_to_str(dtime) end - default :SEQ, :HOST, :REASON, :START, :TIME, :PROLOG_TIME + default :SEQ, :HOST, :ACTION, :REASON, :START, :TIME, :PROLOG end vm_hash=vm.to_hash diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 06538cee7e..37f27c76a0 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -111,6 +111,11 @@ module OpenNebula "USER" => "user" } + HISTORY_ACTION=%w{migrate migrate-live shutdown shutdown-hard undeploy + undeploy-hard hold release stop suspend resume boot destroy + destroy-recreate reboot reboot-hard resched unresched poweroff + poweroff-hard none} + # Creates a VirtualMachine description with just its identifier # this method should be used to create plain VirtualMachine objects. # +id+ the id of the vm @@ -135,6 +140,10 @@ module OpenNebula reason_str end + def VirtualMachine.get_history_action(action) + return HISTORY_ACTION[action.to_i] + end + # Class constructor def initialize(xml, client) super(xml,client) From 2cca4c56764c267ed9d39cc6d6bd1b9c50597fb0 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 4 Apr 2013 12:33:44 +0200 Subject: [PATCH 49/82] feature #1859: start/stop/restart actions for scheduler --- share/pkgs/CentOS/opennebula | 33 ++++++++++++++++ share/pkgs/Debian/opennebula | 26 +++++++++++++ share/pkgs/Ubuntu/opennebula | 26 +++++++++++++ share/scripts/one | 75 +++++++++++++++++++++++++----------- 4 files changed, 138 insertions(+), 22 deletions(-) diff --git a/share/pkgs/CentOS/opennebula b/share/pkgs/CentOS/opennebula index 65f9a1147c..6727ddbbf9 100755 --- a/share/pkgs/CentOS/opennebula +++ b/share/pkgs/CentOS/opennebula @@ -63,11 +63,41 @@ stop() { return $RETVAL } +start-sched() { + echo -n $"Starting OpenNebula scheduler: " + daemon --user oneadmin $ONE_BIN start-sched + RETVAL=$? + + [ $RETVAL -eq 0 ] && success || failure + echo + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE + + return $RETVAL +} + +stop-sched() { + echo -n $"Stopping OpenNebula scheduler: " + daemon --user oneadmin $ONE_BIN stop-sched + RETVAL=$? + + [ $RETVAL -eq 0 ] && success || failure + echo + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE + + return $RETVAL +} + restart() { stop start } +restart-sched() { + stop-sched + sleep 1 + start-sched +} + case "$1" in start) @@ -79,6 +109,9 @@ stop) restart) restart ;; +restart-sched) + restart-sched + ;; status) status $prog RETVAL=$? diff --git a/share/pkgs/Debian/opennebula b/share/pkgs/Debian/opennebula index 2d98d6ceb8..36a34e56e1 100755 --- a/share/pkgs/Debian/opennebula +++ b/share/pkgs/Debian/opennebula @@ -47,6 +47,16 @@ do_stop() su oneadmin -s /bin/sh -c 'one stop' } +do_start_sched() +{ + su oneadmin -s /bin/sh -c 'one start-sched' +} + +do_stop_sched() +{ + su oneadmin -s /bin/sh -c 'one stop-sched' +} + case "$1" in start) [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" @@ -87,6 +97,22 @@ case "$1" in # Failed to stop log_end_msg 1 ;; + restart-sched) + log_daemon_msg "Restarting scheduler" + do_stop_sched + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; esac ;; *) diff --git a/share/pkgs/Ubuntu/opennebula b/share/pkgs/Ubuntu/opennebula index 2d98d6ceb8..36a34e56e1 100755 --- a/share/pkgs/Ubuntu/opennebula +++ b/share/pkgs/Ubuntu/opennebula @@ -47,6 +47,16 @@ do_stop() su oneadmin -s /bin/sh -c 'one stop' } +do_start_sched() +{ + su oneadmin -s /bin/sh -c 'one start-sched' +} + +do_stop_sched() +{ + su oneadmin -s /bin/sh -c 'one stop-sched' +} + case "$1" in start) [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" @@ -87,6 +97,22 @@ case "$1" in # Failed to stop log_end_msg 1 ;; + restart-sched) + log_daemon_msg "Restarting scheduler" + do_stop_sched + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; esac ;; *) diff --git a/share/scripts/one b/share/scripts/one index 503cec61c6..9625b64a84 100755 --- a/share/scripts/one +++ b/share/scripts/one @@ -74,6 +74,13 @@ setup() # Function that stops the daemons #------------------------------------------------------------------------------ stop() +{ + stop_oned + + stop_sched +} + +stop_oned() { if [ -f $ONE_PID ]; then PID=$(cat $ONE_PID) @@ -91,7 +98,10 @@ stop() rm -f $ONE_PID > /dev/null 2>&1 fi +} +stop_sched() +{ if [ -f $ONE_SCHEDPID ]; then kill `cat $ONE_SCHEDPID` > /dev/null 2>&1 rm -f $ONE_SCHEDPID > /dev/null 2>&1 @@ -130,30 +140,10 @@ start() fi # Start the one daemon - $ONED -f 2>&1 & - - LASTRC=$? - LASTPID=$! - - if [ $LASTRC -ne 0 ]; then - echo "Error executing $ONED" - exit 1 - else - echo $LASTPID > $ONE_PID - fi + start_oned # Start the scheduler - $ONE_SCHEDULER& - - LASTRC=$? - LASTPID=$! - - if [ $LASTRC -ne 0 ]; then - echo "Error executing $ONE_SCHEDULER" - exit 1 - else - echo $LASTPID > $ONE_SCHEDPID - fi + start_sched # Wait for the daemons to warm up sleep 2 @@ -180,6 +170,36 @@ start() fi } +start_oned() +{ + $ONED -f 2>&1 & + + LASTRC=$? + LASTPID=$! + + if [ $LASTRC -ne 0 ]; then + echo "Error executing $ONED" + exit 1 + else + echo $LASTPID > $ONE_PID + fi +} + +start_sched() +{ + $ONE_SCHEDULER& + + LASTRC=$? + LASTPID=$! + + if [ $LASTRC -ne 0 ]; then + echo "Error executing $ONE_SCHEDULER" + exit 1 + else + echo $LASTPID > $ONE_SCHEDPID + fi +} + #------------------------------------------------------------------------------ #------------------------------------------------------------------------------ @@ -197,6 +217,17 @@ case "$1" in stop echo "oned and scheduler stopped" ;; + start-sched) + start_sched + ;; + stop-sched) + stop_sched + ;; + restart-sched) + stop_sched + sleep 1 + start_sched + ;; *) echo "Usage: one [-f] {start|stop}" >&2 echo "Options:" >&2 From b1273baec978f16612ced116423444e63e521d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 14:44:20 +0200 Subject: [PATCH 50/82] Feature #1631: Add migrator to 4.0.0 --- install.sh | 1 + src/onedb/3.9.80_to_4.0.0.rb | 99 ++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 src/onedb/3.9.80_to_4.0.0.rb diff --git a/install.sh b/install.sh index ed3207a5b5..9b13e86262 100755 --- a/install.sh +++ b/install.sh @@ -1026,6 +1026,7 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/3.8.2_to_3.8.3.rb \ src/onedb/3.8.3_to_3.8.4.rb \ src/onedb/3.8.4_to_3.9.80.rb \ + src/onedb/3.9.80_to_4.0.0.rb \ src/onedb/fsck.rb \ src/onedb/onedb.rb \ src/onedb/onedb_backend.rb" diff --git a/src/onedb/3.9.80_to_4.0.0.rb b/src/onedb/3.9.80_to_4.0.0.rb new file mode 100644 index 0000000000..2aa9a717e8 --- /dev/null +++ b/src/onedb/3.9.80_to_4.0.0.rb @@ -0,0 +1,99 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +require "rexml/document" +include REXML + +module Migrator + def db_version + "4.0.0" + end + + def one_version + "OpenNebula 4.0.0" + end + + def up + + ######################################################################## + # Feature #1631: Add ACTION to history entries + ######################################################################## + + @db.run "ALTER TABLE vm_pool RENAME TO old_vm_pool;" + @db.run "CREATE TABLE vm_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, last_poll INTEGER, state INTEGER, lcm_state INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER);" + + @db.fetch("SELECT * FROM old_vm_pool") do |row| + doc = Document.new(row[:body]) + + doc.root.each_element("HISTORY_RECORDS/HISTORY") do |e| + update_history(e) + end + + @db[:vm_pool].insert( + :oid => row[:oid], + :name => row[:name], + :body => doc.root.to_s, + :uid => row[:uid], + :gid => row[:gid], + :last_poll => row[:last_poll], + :state => row[:state], + :lcm_state => row[:lcm_state], + :owner_u => row[:owner_u], + :group_u => row[:group_u], + :other_u => row[:other_u]) + end + + @db.run "DROP TABLE old_vm_pool;" + + @db.run "ALTER TABLE history RENAME TO old_history;" + @db.run "CREATE TABLE history (vid INTEGER, seq INTEGER, body MEDIUMTEXT, stime INTEGER, etime INTEGER,PRIMARY KEY(vid,seq));" + + @db.fetch("SELECT * FROM old_history") do |row| + doc = Document.new(row[:body]) + + doc.root.each_element("/HISTORY") do |e| + update_history(e) + end + + @db[:history].insert( + :vid => row[:vid], + :seq => row[:seq], + :body => doc.root.to_s, + :stime => row[:stime], + :etime => row[:etime]) + end + + @db.run "DROP TABLE old_history;" + + + return true + end + + def update_history(history_elem) + history_elem.add_element("ACTION").text = "20" # NONE_ACTION + + # History reason enum has changed from + # NONE, ERROR, STOP_RESUME, USER, CANCEL to + # NONE, ERROR, USER + history_elem.each_element("REASON") do |reason_e| + reason = reason_e.text.to_i + + if reason > 1 # STOP_RESUME, USER, CANCEL + reason_e.text = "2" # USER + end + end + end +end From 4abedb3dd9eabcc1330c0cf2261af76411d0186c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 15:06:14 +0200 Subject: [PATCH 51/82] Feature #1631: Add new action element to xsd files --- share/doc/xsd/acct.xsd | 33 ++++++++++++++++++++++++++++----- share/doc/xsd/vm.xsd | 33 ++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd index f7c7d29381..4273d8c84d 100644 --- a/share/doc/xsd/acct.xsd +++ b/share/doc/xsd/acct.xsd @@ -31,14 +31,37 @@ + + + diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd index fa5babf322..511b6f74f3 100644 --- a/share/doc/xsd/vm.xsd +++ b/share/doc/xsd/vm.xsd @@ -118,13 +118,36 @@ + + + From 002ec7e915a1177a8fe3ec4539e7a57fff2c169a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 15:28:35 +0200 Subject: [PATCH 52/82] Feature #1631: Rearrange History Actions so NONE is 0 --- include/History.h | 4 +-- include/Nebula.h | 2 +- share/doc/xsd/acct.xsd | 42 +++++++++++----------- share/doc/xsd/vm.xsd | 42 +++++++++++----------- src/oca/ruby/opennebula/virtual_machine.rb | 6 ++-- src/onedb/3.9.80_to_4.0.0.rb | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/History.h b/include/History.h index 5e79ace5a8..ce852c3a32 100644 --- a/include/History.h +++ b/include/History.h @@ -37,6 +37,7 @@ public: enum VMAction { + NONE_ACTION, MIGRATE_ACTION, LIVE_MIGRATE_ACTION, SHUTDOWN_ACTION, @@ -56,8 +57,7 @@ public: RESCHED_ACTION, UNRESCHED_ACTION, POWEROFF_ACTION, - POWEROFF_HARD_ACTION, - NONE_ACTION + POWEROFF_HARD_ACTION }; static string action_to_str(VMAction action) diff --git a/include/Nebula.h b/include/Nebula.h index ddcf3c41e1..9c8df5539d 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -345,7 +345,7 @@ public: static string db_version() { - return "3.9.80"; + return "4.0.0"; } /** diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd index 4273d8c84d..04241e57ab 100644 --- a/share/doc/xsd/acct.xsd +++ b/share/doc/xsd/acct.xsd @@ -38,27 +38,27 @@ diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd index 511b6f74f3..f35f1296d4 100644 --- a/share/doc/xsd/vm.xsd +++ b/share/doc/xsd/vm.xsd @@ -125,27 +125,27 @@ diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 37f27c76a0..dd20814372 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -111,10 +111,10 @@ module OpenNebula "USER" => "user" } - HISTORY_ACTION=%w{migrate migrate-live shutdown shutdown-hard undeploy - undeploy-hard hold release stop suspend resume boot destroy + HISTORY_ACTION=%w{none migrate migrate-live shutdown shutdown-hard + undeploy undeploy-hard hold release stop suspend resume boot destroy destroy-recreate reboot reboot-hard resched unresched poweroff - poweroff-hard none} + poweroff-hard} # Creates a VirtualMachine description with just its identifier # this method should be used to create plain VirtualMachine objects. diff --git a/src/onedb/3.9.80_to_4.0.0.rb b/src/onedb/3.9.80_to_4.0.0.rb index 2aa9a717e8..5c38ad50d3 100644 --- a/src/onedb/3.9.80_to_4.0.0.rb +++ b/src/onedb/3.9.80_to_4.0.0.rb @@ -83,7 +83,7 @@ module Migrator end def update_history(history_elem) - history_elem.add_element("ACTION").text = "20" # NONE_ACTION + history_elem.add_element("ACTION").text = "0" # NONE_ACTION # History reason enum has changed from # NONE, ERROR, STOP_RESUME, USER, CANCEL to From 68e48b0d1f5e1763d7436cccabc5a61e1bd0a196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 15:47:24 +0200 Subject: [PATCH 53/82] Feature #1631: Fix change made for testing --- include/Nebula.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Nebula.h b/include/Nebula.h index 9c8df5539d..ddcf3c41e1 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -345,7 +345,7 @@ public: static string db_version() { - return "4.0.0"; + return "3.9.80"; } /** From e53d97a5ad5e4b64f8d271590405589e5a149117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 16:07:10 +0200 Subject: [PATCH 54/82] Feature #1797: The action to wake up a poweroff VM is now 'resume' --- share/doc/states/states-complete.dot | 6 +++--- share/doc/states/states-simple.dot | 2 +- src/cli/onevm | 6 +++--- src/dm/DispatchManagerActions.cc | 16 +++++++++++----- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/share/doc/states/states-complete.dot b/share/doc/states/states-complete.dot index e34c972deb..ed5dafa4a5 100644 --- a/share/doc/states/states-complete.dot +++ b/share/doc/states/states-complete.dot @@ -91,6 +91,9 @@ digraph OpenNebula { suspended -> boot_suspended [label="resume"]; boot_suspended -> running [style="dashed"]; + poweroff -> boot_poweroff [label="resume"]; + boot_poweroff -> running [style="dashed"]; + # destroy ANY -> done [label="destroy"]; @@ -101,10 +104,7 @@ digraph OpenNebula { boot -> boot [label="boot"]; boot_suspended -> boot_suspended [label="boot"]; boot_stopped -> boot_stopped [label="boot"]; - - poweroff -> boot_poweroff [label="boot"]; boot_poweroff -> boot_poweroff [label="boot"]; - boot_poweroff -> running [style="dashed"]; unknown -> boot_unknown [label="boot"]; boot_unknown -> boot_unknown [label="boot"]; diff --git a/share/doc/states/states-simple.dot b/share/doc/states/states-simple.dot index f3ac7e7e69..65a567e25e 100644 --- a/share/doc/states/states-simple.dot +++ b/share/doc/states/states-simple.dot @@ -69,6 +69,7 @@ digraph OpenNebula { # resume stopped -> pending [label="resume"]; suspended -> boot [label="resume"]; + poweroff -> boot [label="resume"]; # delete ANY -> done [label="destroy"]; @@ -76,7 +77,6 @@ digraph OpenNebula { # restart unknown -> boot [label="boot"]; boot -> boot [label="boot"]; - poweroff -> boot [label="boot"]; # reboot running -> running [label="reboot"]; diff --git a/src/cli/onevm b/src/cli/onevm index eb3f0ad6d4..02de1522fb 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -344,7 +344,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do poweroff_desc = <<-EOT.unindent Powers off the given VM. The VM will remain in the poweroff state, and - can be powered on with the 'onevm boot' command. + can be powered on with the 'onevm resume' command. States: RUNNING EOT @@ -432,7 +432,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do boot_desc = <<-EOT.unindent Boots the given VM. - States: UNKNOWN, BOOT, POWEROFF + States: UNKNOWN, BOOT EOT command :boot, boot_desc, [:range,:vmid_list], @@ -487,7 +487,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do resume_desc = <<-EOT.unindent Resumes the execution of the a saved VM - States: STOPPED, SUSPENDED + States: STOPPED, SUSPENDED, UNDEPLOYED, POWEROFF EOT command :resume, resume_desc, [:range,:vmid_list], diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 35e2d2a11d..4c6fdeaebb 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -572,12 +572,19 @@ int DispatchManager::resume( Nebula& nd = Nebula::instance(); LifeCycleManager * lcm = nd.get_lcm(); - vmpool->update(vm); - vm->log("DiM", Log::INFO, "New VM state is ACTIVE."); lcm->trigger(LifeCycleManager::RESTORE,vid); } + else if (vm->get_state() == VirtualMachine::POWEROFF) + { + Nebula& nd = Nebula::instance(); + LifeCycleManager * lcm = nd.get_lcm(); + + vm->log("DiM", Log::INFO, "New VM state is ACTIVE."); + + lcm->trigger(LifeCycleManager::RESTART,vid); + } else { goto error; @@ -614,14 +621,13 @@ int DispatchManager::restart(int vid) oss << "Restarting VM " << vid; NebulaLog::log("DiM",Log::DEBUG,oss); - if ((vm->get_state() == VirtualMachine::ACTIVE && + if (vm->get_state() == VirtualMachine::ACTIVE && (vm->get_lcm_state() == VirtualMachine::UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT || vm->get_lcm_state() == VirtualMachine::BOOT_UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT_POWEROFF || vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED || vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED)) - || vm->get_state() == VirtualMachine::POWEROFF ) { Nebula& nd = Nebula::instance(); LifeCycleManager * lcm = nd.get_lcm(); @@ -914,7 +920,7 @@ int DispatchManager::resubmit(int vid) { case VirtualMachine::POWEROFF: NebulaLog::log("DiM",Log::ERROR, - "Cannot resubmit a powered off VM. Restart it first"); + "Cannot resubmit a powered off VM. Resume it first"); rc = -2; break; From 3281cae4f6d6e55f7013fd62390aab6b27346db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 16:42:53 +0200 Subject: [PATCH 55/82] onevm show now lists the hostname for vms in poweroff --- src/cli/one_helper/onevm_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index db06cedb50..83fcf5d143 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -247,7 +247,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper puts str % ["RESCHED", OpenNebulaHelper.boolean_to_str(vm['RESCHED'])] puts str % ["HOST", vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if - %w{ACTIVE SUSPENDED}.include? vm.state_str + %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str puts str % ["START TIME", OpenNebulaHelper.time_to_str(vm['/VM/STIME'])] puts str % ["END TIME", From 24a4aeb6ff716565c7b6999c20d167c3ef4a13cd Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 4 Apr 2013 17:38:33 +0200 Subject: [PATCH 56/82] feature #1643: add IPv6 support to RPM context packages --- .../base_deb/etc/one-context.d/00-network | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/share/scripts/context-packages/base_deb/etc/one-context.d/00-network b/share/scripts/context-packages/base_deb/etc/one-context.d/00-network index 0a5fbd2f5e..92ff47eab3 100755 --- a/share/scripts/context-packages/base_deb/etc/one-context.d/00-network +++ b/share/scripts/context-packages/base_deb/etc/one-context.d/00-network @@ -103,7 +103,6 @@ upcase() { gen_iface_conf() { cat < Date: Thu, 4 Apr 2013 17:29:16 +0200 Subject: [PATCH 57/82] Feature #1839: Add new state BOOT_UNDEPLOY to handle a deploy failure from UNDEPLOYED --- include/VirtualMachine.h | 3 +- src/dm/DispatchManagerActions.cc | 3 +- src/lcm/LifeCycleActions.cc | 7 ++-- src/lcm/LifeCycleStates.cc | 35 ++++++++++++++++++- .../opennebula/client/vm/VirtualMachine.java | 3 +- src/oca/ruby/opennebula/virtual_machine.rb | 6 ++-- src/sunstone/OpenNebulaVNC.rb | 3 +- src/sunstone/public/js/opennebula.js | 3 +- 8 files changed, 53 insertions(+), 10 deletions(-) diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 0a51e86d05..3791f0fbe9 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -98,7 +98,8 @@ public: HOTPLUG_SAVEAS_SUSPENDED = 28, SHUTDOWN_UNDEPLOY = 29, EPILOG_UNDEPLOY = 30, - PROLOG_UNDEPLOY = 31 + PROLOG_UNDEPLOY = 31, + BOOT_UNDEPLOY = 32 }; // ------------------------------------------------------------------------- diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 4c6fdeaebb..8187b57906 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -627,7 +627,8 @@ int DispatchManager::restart(int vid) vm->get_lcm_state() == VirtualMachine::BOOT_UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT_POWEROFF || vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED || - vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED)) + vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED || + vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY)) { Nebula& nd = Nebula::instance(); LifeCycleManager * lcm = nd.get_lcm(); diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index a247ecec55..d4b86f79d1 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -584,7 +584,8 @@ void LifeCycleManager::restart_action(int vid) vm->get_lcm_state() == VirtualMachine::BOOT_UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT_POWEROFF || vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED || - vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED)) + vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED || + vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY)) ||vm->get_state() == VirtualMachine::POWEROFF) { Nebula& nd = Nebula::instance(); @@ -599,7 +600,8 @@ void LifeCycleManager::restart_action(int vid) vm->get_lcm_state() == VirtualMachine::BOOT_UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT_POWEROFF || vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED || - vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED)) + vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED || + vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY)) { vm->log("LCM", Log::INFO, "Sending BOOT command to VM again"); } @@ -845,6 +847,7 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag case VirtualMachine::BOOT_POWEROFF: case VirtualMachine::BOOT_SUSPENDED: case VirtualMachine::BOOT_STOPPED: + case VirtualMachine::BOOT_UNDEPLOY: case VirtualMachine::RUNNING: case VirtualMachine::UNKNOWN: case VirtualMachine::SHUTDOWN: diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index f08d759ec1..79cbdfabf0 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -290,7 +290,8 @@ void LifeCycleManager::deploy_success_action(int vid) vm->get_lcm_state() == VirtualMachine::BOOT_POWEROFF || vm->get_lcm_state() == VirtualMachine::BOOT_UNKNOWN || vm->get_lcm_state() == VirtualMachine::BOOT_SUSPENDED|| - vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED ) + vm->get_lcm_state() == VirtualMachine::BOOT_STOPPED || + vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY ) { vm->set_state(VirtualMachine::RUNNING); @@ -440,6 +441,34 @@ void LifeCycleManager::deploy_failure_action(int vid) tm->trigger(TransferManager::EPILOG_STOP,vid); } + else if (vm->get_lcm_state() == VirtualMachine::BOOT_UNDEPLOY) + { + Nebula& nd = Nebula::instance(); + TransferManager * tm = nd.get_tm(); + time_t the_time = time(0); + + //---------------------------------------------------- + // EPILOG_UNDEPLOY STATE FROM BOOT + //---------------------------------------------------- + + vm->set_state(VirtualMachine::EPILOG_UNDEPLOY); + + vmpool->update(vm); + + vm->set_epilog_stime(the_time); + + vm->set_running_etime(the_time); + + vm->set_reason(History::ERROR); + + vmpool->update_history(vm); + + vm->log("LCM", Log::INFO, "Fail to boot VM. New VM state is EPILOG_UNDEPLOY"); + + //---------------------------------------------------- + + tm->trigger(TransferManager::EPILOG_STOP,vid); + } else { vm->log("LCM",Log::ERROR,"deploy_failure_action, VM in a wrong state"); @@ -641,6 +670,10 @@ void LifeCycleManager::prolog_success_action(int vid) { vm->set_state(VirtualMachine::BOOT_STOPPED); } + else if ( lcm_state == VirtualMachine::PROLOG_UNDEPLOY ) + { + vm->set_state(VirtualMachine::BOOT_UNDEPLOY); + } else // PROLOG || PROLOG_MIGRATE { vm->set_state(VirtualMachine::BOOT); diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index b8e941b532..5781b9a214 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -107,7 +107,8 @@ public class VirtualMachine extends PoolElement{ "HOTPLUG_SAVEAS_SUSPENDED", "SHUTDOWN_UNDEPLOY", "EPILOG_UNDEPLOY", - "PROLOG_UNDEPLOY" }; + "PROLOG_UNDEPLOY", + "BOOT_UNDEPLOY" }; private static final String[] SHORT_LCM_STATES = { diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 52a98b00f9..1b65e5c5b1 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -54,7 +54,8 @@ module OpenNebula SHUTDOWN CANCEL FAILURE CLEANUP_RESUBMIT UNKNOWN HOTPLUG SHUTDOWN_POWEROFF BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE HOTPLUG_SNAPSHOT HOTPLUG_NIC HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF - HOTPLUG_SAVEAS_SUSPENDED SHUTDOWN_UNDEPLOY EPILOG_UNDEPLOY PROLOG_UNDEPLOY} + HOTPLUG_SAVEAS_SUSPENDED SHUTDOWN_UNDEPLOY EPILOG_UNDEPLOY + PROLOG_UNDEPLOY BOOT_UNDEPLOY} SHORT_VM_STATES={ "INIT" => "init", @@ -100,7 +101,8 @@ module OpenNebula "HOTPLUG_SAVEAS_SUSPENDED" => "hotp", "SHUTDOWN_UNDEPLOY" => "shut", "EPILOG_UNDEPLOY" => "epil", - "PROLOG_UNDEPLOY" => "prol" + "PROLOG_UNDEPLOY" => "prol", + "BOOT_UNDEPLOY" => "boot" } MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL} diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 051ba191d2..1219c0b46a 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -56,7 +56,8 @@ VNC_STATES = [ 28, #HOTPLUG_SAVEAS_SUSPENDED 29 #SHUTDOWN_UNDEPLOY #30, #EPILOG_UNDEPLOY - #31 #PROLOG_UNDEPLOY + #31, #PROLOG_UNDEPLOY + #32 #BOOT_UNDEPLOY ] class OpenNebulaVNC diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 0c14195973..233296bf19 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -119,7 +119,8 @@ var OpenNebula = { "HOTPLUG_SAVEAS_SUSPENDED", "SHUTDOWN_UNDEPLOY", "EPILOG_UNDEPLOY", - "PROLOG_UNDEPLOY"][value]); + "PROLOG_UNDEPLOY", + "BOOT_UNDEPLOY"][value]); break; case "IMAGE": case "image": From 98c8f9fb6c6eb3f37a2421219ac22429e79476e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 17:58:20 +0200 Subject: [PATCH 58/82] Feature #1839: Document new state BOOT_UNDEPLOY --- share/doc/states/states-complete.dot | 23 +++++++++++++++++++---- share/doc/states/states-simple.dot | 14 ++++++++++---- share/doc/xsd/acct.xsd | 7 ++++++- share/doc/xsd/vm.xsd | 7 ++++++- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/share/doc/states/states-complete.dot b/share/doc/states/states-complete.dot index ed5dafa4a5..62835d80e2 100644 --- a/share/doc/states/states-complete.dot +++ b/share/doc/states/states-complete.dot @@ -19,14 +19,13 @@ digraph OpenNebula { "ANY \\ {suspended,poweroff,done}" [ shape="box" ]; subgraph { rank = min; user} - subgraph { rank = same; boot; boot_stopped boot_suspended; boot_unknown; boot_poweroff; unknown; color="white"} + subgraph { rank = same; boot; boot_stopped; boot_undeploy; boot_suspended; boot_unknown; boot_poweroff; unknown; color="white"} subgraph { rank = same; pending; hold; color="white"} subgraph { rank = same; prolog; prolog_resume; prolog_migrate; color="white" } // subgraph { rank = same; prolog; prolog_resume; prolog_migrate; save_migrate; color="white" } subgraph { rank = max; suspended; done; failure; - stopped; poweroff; ANY; color="white" } -// stopped; poweroff; color="white" } + stopped; undeployed; poweroff; ANY; color="white" } # create user -> pending [label="create"]; @@ -35,6 +34,9 @@ digraph OpenNebula { pending -> prolog_resume [label="deploy\n(from stopped)"]; prolog_resume -> boot_stopped [style="dashed"]; + pending -> prolog_undeploy [label="deploy\n(from undeployed)"]; + prolog_undeploy -> boot_undeploy [style="dashed"]; + pending -> prolog [label="deploy"]; prolog -> boot [style="dashed"]; boot -> running [style="dashed"]; @@ -52,7 +54,7 @@ digraph OpenNebula { cancel -> running [style="dotted"]; # poweroff - running -> shutdown_poweroff [label="poweroff"]; + running -> shutdown_poweroff [label="poweroff [--hard]"]; shutdown_poweroff -> poweroff [style="dashed"]; shutdown_poweroff -> running [style="dotted"]; @@ -79,6 +81,12 @@ digraph OpenNebula { save_stop -> running [style="dotted"]; epilog_stop -> stopped [style="dashed"]; +# undeploy + running -> shutdown_undeploy [label="undeploy [--hard]"]; + shutdown_undeploy -> epilog_undeploy [style="dashed"]; + shutdown_undeploy -> running [style="dotted"]; + epilog_undeploy -> undeployed [style="dashed"]; + # suspend running -> save_suspend [label="suspend"]; save_suspend -> suspended [style="dashed"]; @@ -88,6 +96,9 @@ digraph OpenNebula { stopped -> pending [label="resume"]; boot_stopped -> running [style="dashed"]; + undeployed -> pending [label="resume"]; + boot_undeploy -> running [style="dashed"]; + suspended -> boot_suspended [label="resume"]; boot_suspended -> running [style="dashed"]; @@ -105,6 +116,7 @@ digraph OpenNebula { boot_suspended -> boot_suspended [label="boot"]; boot_stopped -> boot_stopped [label="boot"]; boot_poweroff -> boot_poweroff [label="boot"]; + boot_undeploy -> boot_undeploy [label="boot"]; unknown -> boot_unknown [label="boot"]; boot_unknown -> boot_unknown [label="boot"]; @@ -138,16 +150,19 @@ digraph OpenNebula { # failures and misc. epilog_stop -> failure [style="dotted"]; epilog -> failure [style="dotted"]; + epilog_undeploy -> failure [style="dotted"]; prolog -> failure [style="dotted"]; prolog_migrate -> failure [style="dotted"]; prolog_resume -> stopped [style="dotted"]; + prolog_undeploy -> undeployed [style="dotted"]; boot -> failure [style="dotted"]; boot_poweroff -> poweroff [style="dotted"]; boot_unknown -> unknown [style="dotted"]; boot_suspended -> suspended [style="dotted"]; boot_stopped -> epilog_stop [style="dotted"]; + boot_undeploy -> epilog_undeploy [style="dotted"]; running -> failure [style="dotted"]; unknown -> failure [style="dotted"]; diff --git a/share/doc/states/states-simple.dot b/share/doc/states/states-simple.dot index 65a567e25e..25ba06bf1a 100644 --- a/share/doc/states/states-simple.dot +++ b/share/doc/states/states-simple.dot @@ -19,11 +19,11 @@ digraph OpenNebula { "ANY \\ {suspended,poweroff,done}" [ shape="box" ]; subgraph { rank = min; user} -# subgraph { rank = same; pending; hold; color="white"} - subgraph { rank = same; prolog; boot; color="white" } + subgraph { rank = same; pending; hold; color="white"} +# subgraph { rank = same; prolog; boot; color="white" } subgraph { rank = same; migrate; save; shutdown; unknown; hotplug; snapshot; color="white" } - subgraph { rank = max; suspended; done; failure; stopped; poweroff; color="white" } + subgraph { rank = max; suspended; done; failure; stopped; poweroff; undeployed; color="white" } # create user -> pending [label="create"]; @@ -36,7 +36,7 @@ digraph OpenNebula { # shutdown running -> shutdown [label="shutdown"]; shutdown -> epilog [label="shutdown", style="dashed"]; - epilog -> done [style="dashed"]; + epilog -> done [label="shutdown", style="dashed"]; # poweroff running -> shutdown [label="poweroff"]; @@ -62,12 +62,18 @@ digraph OpenNebula { save -> epilog [label="stop", style="dashed"]; epilog -> stopped [label="stop", style="dashed"]; +# undeploy + running -> shutdown [label="undeploy"]; + shutdown -> epilog [label="undeploy", style="dashed"]; + epilog -> undeployed [label="undeploy", style="dashed"]; + # suspend running -> save [label="suspend"]; save -> suspended [label="suspend", style="dashed"]; # resume stopped -> pending [label="resume"]; + undeployed -> pending [label="resume"]; suspended -> boot [label="resume"]; poweroff -> boot [label="resume"]; diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd index f7c7d29381..31b90573e2 100644 --- a/share/doc/xsd/acct.xsd +++ b/share/doc/xsd/acct.xsd @@ -77,6 +77,7 @@ DONE = 6 FAILED = 7 POWEROFF = 8 + UNDEPLOYED = 9 --> @@ -111,7 +112,11 @@ HOTPLUG_NIC = 25, HOTPLUG_SAVEAS = 26, HOTPLUG_SAVEAS_POWEROFF = 27, - HOTPLUG_SAVEAS_SUSPENDED = 28 + HOTPLUG_SAVEAS_SUSPENDED = 28, + SHUTDOWN_UNDEPLOY = 29, + EPILOG_UNDEPLOY = 30, + PROLOG_UNDEPLOY = 31, + BOOT_UNDEPLOY = 32 --> diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd index fa5babf322..a6e6d2dcdd 100644 --- a/share/doc/xsd/vm.xsd +++ b/share/doc/xsd/vm.xsd @@ -39,6 +39,7 @@ DONE = 6 FAILED = 7 POWEROFF = 8 + UNDEPLOYED = 9 --> @@ -73,7 +74,11 @@ HOTPLUG_NIC = 25, HOTPLUG_SAVEAS = 26, HOTPLUG_SAVEAS_POWEROFF = 27, - HOTPLUG_SAVEAS_SUSPENDED = 28 + HOTPLUG_SAVEAS_SUSPENDED = 28, + SHUTDOWN_UNDEPLOY = 29, + EPILOG_UNDEPLOY = 30, + PROLOG_UNDEPLOY = 31, + BOOT_UNDEPLOY = 32 --> From 735cb7722303f43ce656397d36f5ce28964f7aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 4 Apr 2013 18:01:17 +0200 Subject: [PATCH 59/82] Feature #1839: Add missing states to java OCA --- .../java/src/org/opennebula/client/vm/VirtualMachine.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index 5781b9a214..6e02efa24e 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -140,7 +140,11 @@ public class VirtualMachine extends PoolElement{ "hotp", "hotp", "hotp", - "hotp" }; + "hotp", + "shut", + "epil", + "prol", + "boot" }; /** * Creates a new VM representation. From 0a23c534542025b062c2a56690a3847ed434e698 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 4 Apr 2013 19:06:17 +0200 Subject: [PATCH 60/82] feature #1643: add IPv6 context variables to CLI --- src/cli/one_helper.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 1ce49a1c73..aa6aa5a4f6 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -745,6 +745,9 @@ EOT lines<<"ETH#{index}_MASK = \"$NETWORK[NETWORK_MASK, NETWORK=\\\"#{name}\\\"]\"" lines<<"ETH#{index}_GATEWAY = \"$NETWORK[GATEWAY, NETWORK=\\\"#{name}\\\"]\"" lines<<"ETH#{index}_DNS = \"$NETWORK[DNS, NETWORK=\\\"#{name}\\\"]\"" + lines<<"ETH#{index}_IPV6 = \"$NIC[IP6_GLOBAL, NETWORK=\\\"#{name}\\\"]\"" + lines<<"ETH#{index}_GATEWAY6 = \"$NETWORK[GATEWAY6, NETWORK=\\\"#{name}\\\"]\"" + lines<<"ETH#{index}_CONTEXT_FORCE_IPV4 = \"$NETWORK[CONTEXT_FORCE_IPV4, NETWORK=\\\"#{name}\\\"]\"" end end From 85eeb4b240881f1918b37ab2ee7c201e311cd474 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 4 Apr 2013 21:34:43 +0200 Subject: [PATCH 61/82] Feature #1068: Fix unnecessary use of sudo in the Ceph drivers --- src/datastore_mad/remotes/ceph/cp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp index e72268c6a7..93f6d862e3 100755 --- a/src/datastore_mad/remotes/ceph/cp +++ b/src/datastore_mad/remotes/ceph/cp @@ -110,7 +110,7 @@ http://*|https://*) ;; esac -exec_and_log "eval $DUMP | $SSH $DST_HOST $SUDO $DD of=$TMP_DST bs=64k" \ +exec_and_log "eval $DUMP | $SSH $DST_HOST $DD of=$TMP_DST bs=64k" \ "Error dumping $SRC to $DST_HOST:$TMP_DST" REGISTER_CMD=$(cat < Date: Thu, 4 Apr 2013 23:17:55 +0200 Subject: [PATCH 62/82] feautr #1631: Renamed to life-migrate. --- include/History.h | 4 ++-- include/VirtualMachine.h | 6 +++--- src/lcm/LifeCycleActions.cc | 31 +++++++++++++++---------------- src/lcm/LifeCycleStates.cc | 6 +++--- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/include/History.h b/include/History.h index ce852c3a32..b0253c4548 100644 --- a/include/History.h +++ b/include/History.h @@ -70,7 +70,7 @@ public: st = "migrate"; break; case LIVE_MIGRATE_ACTION: - st = "migrate-live"; + st = "live-migrate"; break; case SHUTDOWN_ACTION: st = "shutdown"; @@ -140,7 +140,7 @@ public: { action = MIGRATE_ACTION; } - else if (st == "migrate-live") + else if (st == "live-migrate") { action = LIVE_MIGRATE_ACTION; } diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 3caa17335e..fa452ffe52 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -509,7 +509,7 @@ public: * Returns the action that closed the history record in the previous host * @return the action that closed the history record in the previous host */ - const History::VMAction get_previous_history_action() const + const History::VMAction get_previous_action() const { return previous_history->action; }; @@ -660,7 +660,7 @@ public: * Sets the action that closed the history record * @param action that closed the history record */ - void set_history_action(History::VMAction action) + void set_action(History::VMAction action) { history->action = action; }; @@ -669,7 +669,7 @@ public: * Sets the action that closed the history record in the previous host * @param action that closed the history record in the previous host */ - void set_previous_history_action(History::VMAction action) + void set_previous_action(History::VMAction action) { previous_history->action = action; }; diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 0ef0f49511..5c95a6f866 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -48,14 +48,13 @@ void LifeCycleManager::deploy_action(int vid) if (vm->hasPreviousHistory()) { - if (vm->get_previous_history_action() == History::STOP_ACTION) + if (vm->get_previous_action() == History::STOP_ACTION) { vm_state = VirtualMachine::PROLOG_RESUME; tm_action = TransferManager::PROLOG_RESUME; } - else if ( - vm->get_previous_history_action() == History::UNDEPLOY_ACTION || - vm->get_previous_history_action() == History::UNDEPLOY_HARD_ACTION) + else if (vm->get_previous_action() == History::UNDEPLOY_ACTION || + vm->get_previous_action() == History::UNDEPLOY_HARD_ACTION) { vm_state = VirtualMachine::PROLOG_UNDEPLOY; tm_action = TransferManager::PROLOG_RESUME; @@ -122,7 +121,7 @@ void LifeCycleManager::suspend_action(int vid) vmpool->update(vm); - vm->set_history_action(History::SUSPEND_ACTION); + vm->set_action(History::SUSPEND_ACTION); vmpool->update_history(vm); @@ -172,7 +171,7 @@ void LifeCycleManager::stop_action(int vid) vmpool->update(vm); - vm->set_history_action(History::STOP_ACTION); + vm->set_action(History::STOP_ACTION); vmpool->update_history(vm); @@ -225,7 +224,7 @@ void LifeCycleManager::migrate_action(int vid) vm->set_stime(time(0)); - vm->set_previous_history_action(History::MIGRATE_ACTION); + vm->set_previous_action(History::MIGRATE_ACTION); vmpool->update_history(vm); @@ -283,7 +282,7 @@ void LifeCycleManager::live_migrate_action(int vid) vm->set_stime(time(0)); - vm->set_history_action(History::LIVE_MIGRATE_ACTION); + vm->set_action(History::LIVE_MIGRATE_ACTION); vmpool->update_history(vm); @@ -337,7 +336,7 @@ void LifeCycleManager::shutdown_action(int vid) vmpool->update(vm); - vm->set_history_action(History::SHUTDOWN_ACTION); + vm->set_action(History::SHUTDOWN_ACTION); vmpool->update_history(vm); @@ -393,13 +392,13 @@ void LifeCycleManager::undeploy_action(int vid, bool hard) if (hard) { - vm->set_history_action(History::UNDEPLOY_HARD_ACTION); + vm->set_action(History::UNDEPLOY_HARD_ACTION); vmm->trigger(VirtualMachineManager::CANCEL,vid); } else { - vm->set_history_action(History::UNDEPLOY_ACTION); + vm->set_action(History::UNDEPLOY_ACTION); vmm->trigger(VirtualMachineManager::SHUTDOWN,vid); } @@ -469,13 +468,13 @@ void LifeCycleManager::poweroff_action(int vid, bool hard) if (hard) { - vm->set_history_action(History::POWEROFF_HARD_ACTION); + vm->set_action(History::POWEROFF_HARD_ACTION); vmm->trigger(VirtualMachineManager::CANCEL,vid); } else { - vm->set_history_action(History::POWEROFF_ACTION); + vm->set_action(History::POWEROFF_ACTION); vmm->trigger(VirtualMachineManager::SHUTDOWN,vid); } @@ -578,7 +577,7 @@ void LifeCycleManager::cancel_action(int vid) vmpool->update(vm); - vm->set_history_action(History::SHUTDOWN_HARD_ACTION); + vm->set_action(History::SHUTDOWN_HARD_ACTION); vmpool->update_history(vm); @@ -843,12 +842,12 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag if (dispose) { vm->set_state(VirtualMachine::CLEANUP_DELETE); - vm->set_history_action(History::DESTROY_ACTION); + vm->set_action(History::DESTROY_ACTION); } else { vm->set_state(VirtualMachine::CLEANUP_RESUBMIT); - vm->set_history_action(History::DESTROY_RECREATE_ACTION); + vm->set_action(History::DESTROY_RECREATE_ACTION); } vm->set_resched(false); diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 58eff2d1b4..8a6363cef8 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -222,7 +222,7 @@ void LifeCycleManager::save_failure_action(int vid) vmpool->update(vm); - vm->set_history_action(History::NONE_ACTION); + vm->set_action(History::NONE_ACTION); vmpool->update_history(vm); @@ -581,7 +581,7 @@ void LifeCycleManager::shutdown_failure_action(int vid) vmpool->update(vm); - vm->set_history_action(History::NONE_ACTION); + vm->set_action(History::NONE_ACTION); vmpool->update_history(vm); @@ -1055,7 +1055,7 @@ void LifeCycleManager::cancel_failure_action(int vid) vmpool->update(vm); - vm->set_history_action(History::NONE_ACTION); + vm->set_action(History::NONE_ACTION); vmpool->update_history(vm); From f1bd884fd6527565aaf9a86ad08c1451f790662e Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 5 Apr 2013 00:05:47 +0200 Subject: [PATCH 63/82] Fix TEMPLATE_NAME in USER_TEMPLATE --- src/vm/VirtualMachine.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 5109fd3e3c..c7e43283a2 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -274,16 +274,20 @@ int VirtualMachine::insert(SqlDB * db, string& error_str) user_obj_template->get("NAME",name); user_obj_template->erase("NAME"); + user_obj_template->get("TEMPLATE_NAME", prefix); + user_obj_template->erase("TEMPLATE_NAME"); + + if (prefix.empty()) + { + prefix = "one"; + } + else + { + obj_template->add("TEMPLATE_NAME", prefix); + } + if (name.empty() == true) { - user_obj_template->get("TEMPLATE_NAME", prefix); - user_obj_template->erase("TEMPLATE_NAME"); - - if (prefix.empty()) - { - prefix = "one"; - } - oss.str(""); oss << prefix << "-" << oid; name = oss.str(); From afaa90ec735ecae35cc4b65e2eba38ec5338d335 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 5 Apr 2013 12:50:49 +0200 Subject: [PATCH 64/82] feature #1643: add IPv6 support to RPM context packages --- .../base_rpm/etc/one-context.d/00-network | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network index 92e630b645..6886d538f7 100755 --- a/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network +++ b/share/scripts/context-packages/base_rpm/etc/one-context.d/00-network @@ -103,10 +103,6 @@ upcase() { gen_iface_conf() { cat < /etc/sysconfig/network-scripts/ifcfg-${DEV} + IPV6=$(get_iface_var "IPV6") + GATEWAY6=$(get_iface_var "GATEWAY6") + CONTEXT_FORCE_IPV4=$(get_iface_var "CONTEXT_FORCE_IPV4") + + ( + cat < /etc/sysconfig/network-scripts/ifcfg-${DEV} done } From 7fdb30508e236a31b6f6f3065388dadf53b266dd Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 5 Apr 2013 13:09:32 +0200 Subject: [PATCH 65/82] feature #1643: packages version bump --- share/scripts/context-packages/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/scripts/context-packages/generate.sh b/share/scripts/context-packages/generate.sh index 3033859003..4111894bf4 100755 --- a/share/scripts/context-packages/generate.sh +++ b/share/scripts/context-packages/generate.sh @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -VERSION=${VERSION:-3.8.1} +VERSION=${VERSION:-3.9.80} MAINTAINER=${MAINTAINER:-C12G Labs } LICENSE=${LICENSE:-Apache 2.0} PACKAGE_NAME=${PACKAGE_NAME:-one-context} From 588b3c5e34ef37b8a86749aabbd8eda7b2db8070 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 5 Apr 2013 13:11:45 +0200 Subject: [PATCH 66/82] feature #1643: enable /root/.ssh in selinux (for SSH_PUBLIC_KEY) --- .../context-packages/base_rpm/etc/one-context.d/03-selinux-ssh | 1 + 1 file changed, 1 insertion(+) create mode 100755 share/scripts/context-packages/base_rpm/etc/one-context.d/03-selinux-ssh diff --git a/share/scripts/context-packages/base_rpm/etc/one-context.d/03-selinux-ssh b/share/scripts/context-packages/base_rpm/etc/one-context.d/03-selinux-ssh new file mode 100755 index 0000000000..164d1c10e0 --- /dev/null +++ b/share/scripts/context-packages/base_rpm/etc/one-context.d/03-selinux-ssh @@ -0,0 +1 @@ +restorecon -R -v /root/.ssh From 561f4b37e87e5991679655f3eca2c0dc1bc067ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 5 Apr 2013 15:01:06 +0200 Subject: [PATCH 67/82] Update xsd files, add tests for accounting xsd --- share/doc/xsd/acct.xsd | 2 + share/doc/xsd/oned.conf | 516 ++++++++++++++++++++++++++++++++++ share/doc/xsd/test.sh | 31 +- share/doc/xsd/test/template.1 | 5 +- share/doc/xsd/vm.xsd | 1 + 5 files changed, 551 insertions(+), 4 deletions(-) create mode 100644 share/doc/xsd/oned.conf diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd index bf09e3e64e..a34fbebf51 100644 --- a/share/doc/xsd/acct.xsd +++ b/share/doc/xsd/acct.xsd @@ -22,6 +22,7 @@ + @@ -159,6 +160,7 @@ + diff --git a/share/doc/xsd/oned.conf b/share/doc/xsd/oned.conf new file mode 100644 index 0000000000..2e22dca0bf --- /dev/null +++ b/share/doc/xsd/oned.conf @@ -0,0 +1,516 @@ +#******************************************************************************* +# OpenNebula Configuration file +#******************************************************************************* + +#******************************************************************************* +# Daemon configuration attributes +#------------------------------------------------------------------------------- +# MANAGER_TIMER: Time in seconds the core uses to evaluate periodical functions. +# MONITORING_INTERVAL cannot have a smaller value than MANAGER_TIMER. +# +# MONITORING_INTERVAL: Time in seconds between host and VM monitorization. +# +# HOST_PER_INTERVAL: Number of hosts monitored in each interval. +# HOST_MONITORING_EXPIRATION_TIME: Time, in seconds, to expire monitoring +# information. Use 0 to disable HOST monitoring recording. +# +# VM_PER_INTERVAL: Number of VMs monitored in each interval. +# VM_MONITORING_EXPIRATION_TIME: Time, in seconds, to expire monitoring +# information. Use 0 to disable VM monitoring recording. +# +# SCRIPTS_REMOTE_DIR: Remote path to store the monitoring and VM management +# scripts. +# +# PORT: Port where oned will listen for xmlrpc calls. +# +# DB: Configuration attributes for the database backend +# backend : can be sqlite or mysql (default is sqlite) +# server : (mysql) host name or an IP address for the MySQL server +# port : (mysql) port for the connection to the server. +# If set to 0, the default port is used. +# user : (mysql) user's MySQL login ID +# passwd : (mysql) the password for user +# db_name : (mysql) the database name +# +# VNC_BASE_PORT: VNC ports for VMs can be automatically set to VNC_BASE_PORT + +# VMID +# +# LOG: Configuration for the logging system +# system: defines the logging system: +# file to log in the oned.log file +# syslog to use the syslog facilities +# debug_level: 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG +# +# VM_SUBMIT_ON_HOLD: Forces VMs to be created on hold state instead of pending. +# Values: YES or NO. +#******************************************************************************* + +LOG = [ + system = "file", + debug_level = 3 +] + +MANAGER_TIMER = 2 + +MONITORING_INTERVAL = 2 + +#HOST_PER_INTERVAL = 15 +#HOST_MONITORING_EXPIRATION_TIME = 86400 + +#VM_PER_INTERVAL = 5 +#VM_MONITORING_EXPIRATION_TIME = 86400 + +SCRIPTS_REMOTE_DIR=/var/tmp/one + +PORT = 2633 + +DB = [ backend = "sqlite" ] + +# Sample configuration for MySQL +# DB = [ backend = "mysql", +# server = "localhost", +# port = 0, +# user = "oneadmin", +# passwd = "oneadmin", +# db_name = "opennebula" ] + +VNC_BASE_PORT = 5900 + +#VM_SUBMIT_ON_HOLD = "NO" + +#******************************************************************************* +# Physical Networks configuration +#******************************************************************************* +# NETWORK_SIZE: Here you can define the default size for the virtual networks +# +# MAC_PREFIX: Default MAC prefix to be used to create the auto-generated MAC +# addresses is defined here (this can be overrided by the Virtual Network +# template) +#******************************************************************************* + +NETWORK_SIZE = 254 + +MAC_PREFIX = "02:00" + +#******************************************************************************* +# DataStore Configuration +#******************************************************************************* +# DATASTORE_LOCATION: *Default* Path for Datastores in the hosts. It IS the +# same for all the hosts in the cluster. DATASTORE_LOCATION IS ONLY FOR THE +# HOSTS AND *NOT* THE FRONT-END. It defaults to /var/lib/one/datastores (or +# $ONE_LOCATION/var/datastores in self-contained mode) +# +# You can define a different DATASTORE_LOCATION in each cluster by updating +# its properties with onecluster update. +# +# DEFAULT_IMAGE_TYPE: This can take values +# OS Image file holding an operating system +# CDROM Image file holding a CDROM +# DATABLOCK Image file holding a datablock, +# always created as an empty block +# DEFAULT_DEVICE_PREFIX: This can be set to +# hd IDE prefix +# sd SCSI +# xvd XEN Virtual Disk +# vd KVM virtual disk +#******************************************************************************* + +#DATASTORE_LOCATION = /var/lib/one/datastores + +DEFAULT_IMAGE_TYPE = "OS" +DEFAULT_DEVICE_PREFIX = "hd" + +#******************************************************************************* +# Information Driver Configuration +#******************************************************************************* +# You can add more information managers with different configurations but make +# sure it has different names. +# +# name : name for this information manager +# +# executable: path of the information driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# +# arguments : for the driver executable, usually a probe configuration file, +# can be an absolute path or relative to $ONE_LOCATION/etc (or +# /etc/one/ if OpenNebula was installed in /) +#******************************************************************************* + +#------------------------------------------------------------------------------- +# KVM Information Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +#------------------------------------------------------------------------------- +IM_MAD = [ + name = "kvm", + executable = "one_im_ssh", + arguments = "-r 0 -t 15 kvm" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# XEN Information Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +#------------------------------------------------------------------------------- +#IM_MAD = [ +# name = "xen", +# executable = "one_im_ssh", +# arguments = "xen" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# VMware Information Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +#------------------------------------------------------------------------------- +#IM_MAD = [ +# name = "vmware", +# executable = "one_im_sh", +# arguments = "-c -t 15 -r 0 vmware" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# EC2 Information Driver Manager Configuration +#------------------------------------------------------------------------------- +#IM_MAD = [ +# name = "ec2", +# executable = "one_im_ec2", +# arguments = "im_ec2/im_ec2.conf" ] +#------------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Ganglia Information Driver Manager Configuration +#----------------------------------------------------------------------------- +#IM_MAD = [ +# name = "ganglia", +# executable = "one_im_sh", +# arguments = "ganglia" ] +#----------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Dummy Information Driver Manager Configuration +#------------------------------------------------------------------------------- +IM_MAD = [ name="dummy", executable="one_im_dummy"] +#------------------------------------------------------------------------------- + +#******************************************************************************* +# Virtualization Driver Configuration +#******************************************************************************* +# You can add more virtualization managers with different configurations but +# make sure it has different names. +# +# name : name of the virtual machine manager driver +# +# executable: path of the virtualization driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# +# arguments : for the driver executable +# +# default : default values and configuration parameters for the driver, can +# be an absolute path or relative to $ONE_LOCATION/etc (or +# /etc/one/ if OpenNebula was installed in /) +# +# type : driver type, supported drivers: xen, kvm, xml +#******************************************************************************* + +#------------------------------------------------------------------------------- +# KVM Virtualization Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +# -l actions executed locally, command can be +# overridden for each action. +# Valid actions: deploy, shutdown, cancel, save, restore, migrate, poll +# An example: "-l migrate,poll=poll_ganglia,save" +#------------------------------------------------------------------------------- +VM_MAD = [ + name = "kvm", + executable = "one_vmm_exec", + arguments = "-t 15 -r 0 kvm", + default = "vmm_exec/vmm_exec_kvm.conf", + type = "kvm" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# XEN Virtualization Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +# -l actions executed locally, command can be +# overridden for each action. +# Valid actions: deploy, shutdown, cancel, save, restore, migrate, poll +# An example: "-l migrate,poll=poll_ganglia,save" +#------------------------------------------------------------------------------- + +# Driver for Xen 3.x +#VM_MAD = [ +# name = "xen", +# executable = "one_vmm_exec", +# arguments = "-t 15 -r 0 xen3", +# default = "vmm_exec/vmm_exec_xen3.conf", +# type = "xen" ] + +# Driver for Xen 4.x +#VM_MAD = [ +# name = "xen", +# executable = "one_vmm_exec", +# arguments = "-t 15 -r 0 xen4", +# default = "vmm_exec/vmm_exec_xen4.conf", +# type = "xen" ] + +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# VMware Virtualization Driver Manager Configuration +# -r number of retries when monitoring a host +# -t number of threads, i.e. number of hosts monitored at the same time +#------------------------------------------------------------------------------- +#VM_MAD = [ +# name = "vmware", +# executable = "one_vmm_sh", +# arguments = "-t 15 -r 0 vmware -s sh", +# default = "vmm_exec/vmm_exec_vmware.conf", +# type = "vmware" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# EC2 Virtualization Driver Manager Configuration +# arguments: default values for the EC2 driver, can be an absolute path or +# relative to $ONE_LOCATION/etc (or /etc/one/ if OpenNebula was +# installed in /). +#------------------------------------------------------------------------------- +#VM_MAD = [ +# name = "ec2", +# executable = "one_vmm_ec2", +# arguments = "vmm_ec2/vmm_ec2.conf", +# type = "xml" ] +#------------------------------------------------------------------------------- + +#------------------------------------------------------------------------------- +# Dummy Virtualization Driver Configuration +#------------------------------------------------------------------------------- +VM_MAD = [ name="dummy", executable="one_vmm_dummy", type="xml" ] +#------------------------------------------------------------------------------- + +#******************************************************************************* +# Transfer Manager Driver Configuration +#******************************************************************************* +# You can add more transfer managers with different configurations but make +# sure it has different names. +# name : name for this transfer driver +# +# executable: path of the transfer driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# arguments : +# -t: number of threads, i.e. number of transfers made at the same time +# -d: list of transfer drivers separated by commas, if not defined all the +# drivers available will be enabled +#******************************************************************************* + +TM_MAD = [ + executable = "one_tm", + arguments = "-t 15 -d dummy,lvm,shared,qcow2,ssh,vmfs,iscsi,ceph" ] + +#******************************************************************************* +# Datastore Driver Configuration +#******************************************************************************* +# Drivers to manage the datastores, specialized for the storage backend +# executable: path of the transfer driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# +# arguments : for the driver executable +# -t number of threads, i.e. number of repo operations at the same time +# -d datastore mads separated by commas +#******************************************************************************* + +DATASTORE_MAD = [ + executable = "one_datastore", + arguments = "-t 15 -d fs,vmware,vmfs,iscsi,lvm,ceph" +] + +#******************************************************************************* +# Hook Manager Configuration +#******************************************************************************* +# The Driver (HM_MAD) +# ----------------------------------------------- +# +# Used to execute the Hooks: +# executable: path of the hook driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# +# arguments : for the driver executable, can be an absolute path or relative +# to $ONE_LOCATION/etc (or /etc/one/ if OpenNebula was installed +# in /) +# +# Virtual Machine Hooks (VM_HOOK) +# ------------------------------- +# +# Defined by: +# name : for the hook, useful to track the hook (OPTIONAL) +# on : when the hook should be executed, +# - CREATE, when the VM is created (onevm create) +# - PROLOG, when the VM is in the prolog state +# - RUNNING, after the VM is successfully booted +# - UNKNOWN, when the VM is in the unknown state +# - SHUTDOWN, after the VM is shutdown +# - STOP, after the VM is stopped (including VM image transfers) +# - DONE, after the VM is deleted or shutdown +# - FAILED, when the VM enters the failed state +# command : path is relative to $ONE_LOCATION/var/remotes/hook +# (self-contained) or to /var/lib/one/remotes/hook (system-wide). +# That directory will be copied on the hosts under +# SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist +# on the target host +# arguments : for the hook. You can access to VM information with $ +# - $ID, the ID of the virtual machine +# - $TEMPLATE, the VM template in xml and base64 encoded +# remote : values, +# - YES, The hook is executed in the host where the VM was +# allocated +# - NO, The hook is executed in the OpenNebula server (default) +# +# Host Hooks (HOST_HOOK) +# ------------------------------- +# +# Defined by: +# name : for the hook, useful to track the hook (OPTIONAL) +# on : when the hook should be executed, +# - CREATE, when the Host is created (onehost create) +# - ERROR, when the Host enters the error state +# - DISABLE, when the Host is disabled +# command : path is relative to $ONE_LOCATION/var/remotes/hook +# (self-contained) or to /var/lib/one/remotes/hook (system-wide). +# That directory will be copied on the hosts under +# SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist +# on the target host. +# arguments : for the hook. You can use the following Host information: +# - $ID, the ID of the host +# - $TEMPLATE, the Host template in xml and base64 encoded +# remote : values, +# - YES, The hook is executed in the host +# - NO, The hook is executed in the OpenNebula server (default) +# +# Virtual Network (VNET_HOOK) +# User (USER_HOOK) +# Group (GROUP_HOOK) +# Image (IMAGE_HOOK) +# ------------------------------- +# +# These hooks are executed when one of the referring entities are created or +# removed. Each hook is defined by: +# name : for the hook, useful to track the hook (OPTIONAL) +# on : when the hook should be executed, +# - CREATE, when the vnet is created +# - REMOVE, when the vnet is removed +# command : path is relative to $ONE_LOCATION/var/remotes/hook +# (self-contained) or to /var/lib/one/remotes/hook (system-wide). +# That directory will be copied on the hosts under +# SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist +# on the target host. +# arguments : for the hook. You can use the following Host information: +# - $ID, the ID of the host +# - $TEMPLATE, the vnet template in xml and base64 encoded +#------------------------------------------------------------------------------- +HM_MAD = [ + executable = "one_hm" ] + +#******************************************************************************* +# Fault Tolerance Hooks +#******************************************************************************* +# This hook is used to perform recovery actions when a host fails. +# Script to implement host failure tolerance +# It can be set to +# -r recreate VMs running in the host +# -d delete VMs running in the host +# Additional flags +# -f force resubmission of suspended VMs +# -p avoid resubmission if host comes +# back after n monitoring cycles +#******************************************************************************* +# +#HOST_HOOK = [ +# name = "error", +# on = "ERROR", +# command = "ft/host_error.rb", +# arguments = "$ID -r", +# remote = "no" ] +#------------------------------------------------------------------------------- +# These two hooks can be used to automatically delete or resubmit VMs that reach +# the "failed" state. This way, the administrator doesn't have to interact +# manually to release its resources or retry the deployment. +# +# +# Only one of them should be uncommented. +#------------------------------------------------------------------------------- +# +#VM_HOOK = [ +# name = "on_failure_delete", +# on = "FAILED", +# command = "/usr/bin/env onevm destroy", +# arguments = "$ID" ] +# +#VM_HOOK = [ +# name = "on_failure_recreate", +# on = "FAILED", +# command = "/usr/bin/env onevm destroy --recreate", +# arguments = "$ID" ] +#------------------------------------------------------------------------------- + +#******************************************************************************* +# Auth Manager Configuration +#******************************************************************************* +# AUTH_MAD: The Driver that will be used to authenticate (authn) and +# authorize (authz) OpenNebula requests. If defined OpenNebula will use the +# built-in auth policies. +# +# executable: path of the auth driver executable, can be an +# absolute path or relative to $ONE_LOCATION/lib/mads (or +# /usr/lib/one/mads/ if OpenNebula was installed in /) +# +# authn : list of authentication modules separated by commas, if not +# defined all the modules available will be enabled +# authz : list of authentication modules separated by commas +# +# SESSION_EXPIRATION_TIME: Time in seconds to keep an authenticated token as +# valid. During this time, the driver is not used. Use 0 to disable session +# caching +# +# ENABLE_OTHER_PERMISSIONS: Whether or not users can set the permissions for +# 'other', so publishing or sharing resources with others. Users in the oneadmin +# group will still be able to change these permissions. Values: YES or NO. +# +# DEFAULT_UMASK: Similar to Unix umask, sets the default resources permissions. +# Its format must be 3 octal digits. For example a umask of 137 will set +# the new object's permissions to 640 "um- u-- ---" +#******************************************************************************* + +AUTH_MAD = [ + executable = "one_auth_mad", + authn = "ssh,x509,ldap,server_cipher,server_x509" +] + +SESSION_EXPIRATION_TIME = 900 + +#ENABLE_OTHER_PERMISSIONS = "YES" + +DEFAULT_UMASK = 177 + +#******************************************************************************* +# Restricted Attributes Configuration +#******************************************************************************* +# The following attributes are restricted to users outside the oneadmin group +#******************************************************************************* + +VM_RESTRICTED_ATTR = "CONTEXT/FILES" +VM_RESTRICTED_ATTR = "NIC/MAC" +VM_RESTRICTED_ATTR = "NIC/VLAN_ID" + +#VM_RESTRICTED_ATTR = "RANK" +#VM_RESTRICTED_ATTR = "SCHED_RANK" +#VM_RESTRICTED_ATTR = "REQUIREMENTS" +#VM_RESTRICTED_ATTR = "SCHED_REQUIREMENTS" + +IMAGE_RESTRICTED_ATTR = "SOURCE" diff --git a/share/doc/xsd/test.sh b/share/doc/xsd/test.sh index ad1622f166..e9bedbd477 100755 --- a/share/doc/xsd/test.sh +++ b/share/doc/xsd/test.sh @@ -25,6 +25,7 @@ mkdir -p samples/vmtemplate samples/vmtemplate_pool mkdir -p samples/user samples/user_pool mkdir -p samples/vm samples/vm_pool mkdir -p samples/vnet samples/vnet_pool +mkdir -p samples/vnet samples/acct @@ -79,7 +80,25 @@ onetemplate list -x > samples/vmtemplate_pool/2.xml # VM -onetemplate instantiate 0 +onetemplate instantiate 0 -m 2 +onetemplate instantiate 1 -m 2 + +for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do + onevm deploy $i host01 +done + +sleep 5 + +onevm migrate --live 0 0 +onevm destroy 1 +onevm poweroff 2 + +sleep 5 + +onevm suspend 0 +onevm resume 2 + +sleep 5 for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do onevm show $i -x > samples/vm/$i.xml @@ -144,8 +163,6 @@ done onegroup list -x > samples/group_pool/0.xml - - for i in cluster datastore group host image vmtemplate user vm vnet do POOL_NAME="$i""_pool" @@ -158,4 +175,12 @@ do xmllint --noout --schema $POOL_NAME.xsd samples/$POOL_NAME/* done + +# Accounting +oneacct -x > samples/acct/0.xml + +sed -i "s%%%" samples/acct/*.xml + +xmllint --noout --schema acct.xsd samples/acct/* + exit 0 diff --git a/share/doc/xsd/test/template.1 b/share/doc/xsd/test/template.1 index 464d29f63f..e3f07e3246 100644 --- a/share/doc/xsd/test/template.1 +++ b/share/doc/xsd/test/template.1 @@ -1 +1,4 @@ -NAME = template1 \ No newline at end of file +NAME = template1 +CPU = 0.45 +VCPU = 1 +MEMORY = 512 \ No newline at end of file diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd index 65ad2d5f4c..072f194288 100644 --- a/share/doc/xsd/vm.xsd +++ b/share/doc/xsd/vm.xsd @@ -114,6 +114,7 @@ + From 6db5aa6c20c2e62f40aef604cc6e988df34b6f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 5 Apr 2013 16:01:32 +0200 Subject: [PATCH 68/82] Feature #1631: Rename life-migrate in cli; fix live-migration action --- src/lcm/LifeCycleActions.cc | 2 +- src/oca/ruby/opennebula/virtual_machine.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 96f30db2dc..cba4ff7dab 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -282,7 +282,7 @@ void LifeCycleManager::live_migrate_action(int vid) vm->set_stime(time(0)); - vm->set_action(History::LIVE_MIGRATE_ACTION); + vm->set_previous_action(History::LIVE_MIGRATE_ACTION); vmpool->update_history(vm); diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index dabb1cf10f..3084a7819a 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -113,7 +113,7 @@ module OpenNebula "USER" => "user" } - HISTORY_ACTION=%w{none migrate migrate-live shutdown shutdown-hard + HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard undeploy undeploy-hard hold release stop suspend resume boot destroy destroy-recreate reboot reboot-hard resched unresched poweroff poweroff-hard} From 7c02cbe692ece1552393c8160096481639d02a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 5 Apr 2013 16:44:53 +0200 Subject: [PATCH 69/82] Feature #1631: Add history action to sunstone --- src/sunstone/public/js/opennebula.js | 24 +++++++++++++++++++++++ src/sunstone/public/js/plugins/vms-tab.js | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index b39e679910..42e5d9bc82 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -140,6 +140,30 @@ var OpenNebula = { "ERROR", "USER"][value]); break; + case "VM_MIGRATE_ACTION": + case "vm_migrate_action": + state = tr(["none", + "migrate", + "live-migrate", + "shutdown", + "shutdown-hard", + "undeploy", + "undeploy-hard", + "hold", + "release", + "stop", + "suspend", + "resume", + "boot", + "destroy", + "destroy-recreate", + "reboot", + "reboot-hard", + "resched", + "unresched", + "poweroff", + "poweroff-hard"][value]); + break; default: return value; } diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index dfa400ef92..f893725272 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1183,6 +1183,7 @@ function generatePlacementTable(vm){ \ '+tr("#")+'\ '+tr("Host")+'\ + '+tr("Action")+'\ '+tr("Reason")+'\ '+tr("Chg time")+'\ '+tr("Total time")+'\ @@ -1225,9 +1226,10 @@ function generatePlacementTable(vm){ html += ' \ - '+history[i].SEQ+'\ + '+history[i].SEQ+'\ '+history[i].HOSTNAME+'\ - '+OpenNebula.Helper.resource_state("VM_MIGRATE_REASON",parseInt(history[i].REASON, 10))+'\ + '+OpenNebula.Helper.resource_state("VM_MIGRATE_ACTION",parseInt(history[i].ACTION, 10))+'\ + '+OpenNebula.Helper.resource_state("VM_MIGRATE_REASON",parseInt(history[i].REASON, 10))+'\ '+pretty_time(history[i].STIME)+'\ '+pretty_time_runtime(dtime)+'\ '+pretty_time_runtime(dtime2)+'\ From edd5ab1756cb47590bc8e54a38bccf0003cd1458 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 5 Apr 2013 11:38:20 +0200 Subject: [PATCH 70/82] Fix dialogs height --- src/sunstone/public/css/app.css | 314 ++++++++++-------- src/sunstone/public/js/layout.js | 4 +- src/sunstone/public/js/plugins/acls-tab.js | 9 +- .../public/js/plugins/clusters-tab.js | 13 +- src/sunstone/public/js/plugins/config-tab.js | 7 +- .../public/js/plugins/datastores-tab.js | 12 +- src/sunstone/public/js/plugins/groups-tab.js | 6 +- src/sunstone/public/js/plugins/hosts-tab.js | 11 +- src/sunstone/public/js/plugins/images-tab.js | 14 +- .../public/js/plugins/templates-tab.js | 14 +- src/sunstone/public/js/plugins/users-tab.js | 6 +- src/sunstone/public/js/plugins/vms-tab.js | 36 +- src/sunstone/public/js/plugins/vnets-tab.js | 18 +- src/sunstone/public/js/sunstone-util.js | 2 +- src/sunstone/public/sass/app.scss | 55 ++- .../jquery_layout/layout-default-latest.css | 2 +- src/sunstone/views/index.erb | 5 +- 17 files changed, 314 insertions(+), 214 deletions(-) diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index 88ba623478..271bd2bd06 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -3734,6 +3734,7 @@ ul.tabs-content.contained.vertical > li { div.alert-box { display: block; padding: 6px 7px 7px; + font-weight: bold; font-size: 14px; color: white; background-color: #2ba6cb; @@ -3746,7 +3747,6 @@ div.alert-box { border-radius: 3px; text-shadow: 0 -1px rgba(0, 0, 0, 0.3); position: relative; - font-family: Arial, Helvetica, sans-serif; } /* line 29, ../../../../../../../.rbenv/versions/1.9.3-p392/lib/ruby/gems/1.9.1/gems/zurb-foundation-3.2.5/scss/foundation/components/modules/_ui.scss */ div.alert-box.success { @@ -6147,12 +6147,11 @@ div.button-bar { /* line 158, ../sass/app.scss */ #logo { font-weight: bold; - margin: 10%; margin-top: 15%; margin-bottom: 10%; } -/* line 165, ../sass/app.scss */ +/* line 164, ../sass/app.scss */ #login-info { text-align: center; overflow: visible; @@ -6169,42 +6168,42 @@ div.button-bar { visibility: visible; } -/* line 186, ../sass/app.scss */ +/* line 185, ../sass/app.scss */ #links { padding-top: 4px; margin-right: 40px; float: right; } -/* line 192, ../sass/app.scss */ +/* line 191, ../sass/app.scss */ #login-info, #login-info a, #links, #links a { color: #555; } -/* line 196, ../sass/app.scss */ +/* line 195, ../sass/app.scss */ #login-info, #login-info a { font-weight: bold; } -/* line 199, ../sass/app.scss */ +/* line 198, ../sass/app.scss */ .sunstone-color { color: #2ba6cb; } -/* line 203, ../sass/app.scss */ +/* line 202, ../sass/app.scss */ #logo-wrapper { float: right; margin-top: 0px; margin-right: 20px; } -/* line 209, ../sass/app.scss */ +/* line 208, ../sass/app.scss */ .menu-nav { height: 70%; overflow: overlay; } -/* line 214, ../sass/app.scss */ +/* line 213, ../sass/app.scss */ #menu { padding-right: 0; padding-left: 0; @@ -6212,29 +6211,29 @@ div.button-bar { overflow: hidden; } -/* line 221, ../sass/app.scss */ +/* line 220, ../sass/app.scss */ #tabs_content { box-shadow: -8px -8px 11px -11px black; z-index: 2 !important; } -/* line 226, ../sass/app.scss */ +/* line 225, ../sass/app.scss */ #navigation { - margin: 8%; + margin: 0 8%; box-shadow: 0 0 1px 0px black; } -/* line 231, ../sass/app.scss */ +/* line 230, ../sass/app.scss */ .tabs.vertical li { border-left: none; } -/* line 235, ../sass/app.scss */ +/* line 234, ../sass/app.scss */ .tabs.vertical li.active { border-top: none; } -/* line 240, ../sass/app.scss */ +/* line 239, ../sass/app.scss */ #navigation > li:not(.subTab).navigation-active-li > a, #navigation > li:not(.subTab).active > a { background: #f2f2f2; @@ -6242,12 +6241,12 @@ div.button-bar { color: #555; } -/* line 250, ../sass/app.scss */ +/* line 249, ../sass/app.scss */ #navigation i { margin-right: 3px; } -/* line 255, ../sass/app.scss */ +/* line 254, ../sass/app.scss */ #navigation li.subTab > a { background: #fdfdfd; color: #555; @@ -6255,33 +6254,43 @@ div.button-bar { padding: 7px 11px 7px 25px; } -/* line 262, ../sass/app.scss */ +/* line 261, ../sass/app.scss */ #navigation li.subsubTab { padding-left: 15px; } -/* line 266, ../sass/app.scss */ +/* line 265, ../sass/app.scss */ #navigation li:not(subTab) { - border-left: 5px solid #f2f2f2 !important; + border-left: 5px solid #f2f2f2; } -/* line 270, ../sass/app.scss */ +/* line 269, ../sass/app.scss */ +#navigation li:not(subTab):hover { + border-left: 5px solid #e2e2e2; +} + +/* line 273, ../sass/app.scss */ #navigation li.subTab:not(.navigation-active-li) { - border-left: 5px solid #fdfdfd !important; + border-left: 5px solid #fdfdfd; } -/* line 274, ../sass/app.scss */ -#navigation li:hover { - font-weight: bold; +/* line 277, ../sass/app.scss */ +#navigation li.subTab:not(.navigation-active-li):hover { + border-left: 5px solid #e2e2e2; } -/* line 278, ../sass/app.scss */ +/* line 281, ../sass/app.scss */ +#navigation a:hover { + background: #e2e2e2 !important; +} + +/* line 285, ../sass/app.scss */ #navigation .navigation-active-li { border-left: 5px solid #555 !important; } /* top menu css */ -/* line 285, ../sass/app.scss */ +/* line 293, ../sass/app.scss */ #menutop_container { margin: 0px 171px; color: #FFFFFF; @@ -6289,14 +6298,14 @@ div.button-bar { font-weight: bold; } -/* line 291, ../sass/app.scss */ +/* line 299, ../sass/app.scss */ #menutop_navbar { float: left; height: 25px; font-size: 13px; } -/* line 296, ../sass/app.scss */ +/* line 304, ../sass/app.scss */ #menutop_navbar ul { float: left; height: 25px; @@ -6305,12 +6314,12 @@ div.button-bar { padding-left: 1px; } -/* line 303, ../sass/app.scss */ +/* line 311, ../sass/app.scss */ #menutop_navbar ul { background-color: #4d4d4d; } -/* line 306, ../sass/app.scss */ +/* line 314, ../sass/app.scss */ #menutop_navbar ul li { float: left; min-width: 72px; @@ -6327,255 +6336,255 @@ div.button-bar { color: white; } -/* line 322, ../sass/app.scss */ +/* line 330, ../sass/app.scss */ #menutop_navbar ul li:hover { background-color: #ffffff; } /* end top menu css */ -/* line 333, ../sass/app.scss */ +/* line 341, ../sass/app.scss */ .ui-layout-pane { border: none; } -/* line 338, ../sass/app.scss */ +/* line 346, ../sass/app.scss */ .button.small { font-size: 12px; box-shadow: none; height: 28px; } -/* line 344, ../sass/app.scss */ +/* line 352, ../sass/app.scss */ .button { box-shadow: none; } -/* line 348, ../sass/app.scss */ +/* line 356, ../sass/app.scss */ .button.tiny { box-shadow: none; } -/* line 352, ../sass/app.scss */ +/* line 360, ../sass/app.scss */ .panel { padding: 0px; background: #f2f2f2; } -/* line 357, ../sass/app.scss */ +/* line 365, ../sass/app.scss */ .tabs.vertical li a { padding: 15px 11px; } -/* line 361, ../sass/app.scss */ +/* line 369, ../sass/app.scss */ input[type="text"] { height: 28px !important; } -/* line 365, ../sass/app.scss */ +/* line 373, ../sass/app.scss */ .right { float: right !important; } -/* line 369, ../sass/app.scss */ +/* line 377, ../sass/app.scss */ .ui-layout-pane { background: #fdfdfd; } -/* line 376, ../sass/app.scss */ +/* line 384, ../sass/app.scss */ tr.odd:hover td { background-color: #2ba6cb !important; cursor: pointer; color: #FFF !important; } -/* line 382, ../sass/app.scss */ +/* line 390, ../sass/app.scss */ tr.even:hover td { background-color: #2ba6cb !important; cursor: pointer; color: #FFF !important; } -/* line 388, ../sass/app.scss */ +/* line 396, ../sass/app.scss */ tr { border-bottom: 1px solid #e6e6e6; } -/* line 394, ../sass/app.scss */ +/* line 402, ../sass/app.scss */ table thead tr th, table tfoot tr td { padding: 5px 10px 5px; line-height: 16px; } -/* line 399, ../sass/app.scss */ +/* line 407, ../sass/app.scss */ table { border-collapse: collapse; border-spacing: 0; } /* Growl */ -/* line 405, ../sass/app.scss */ +/* line 413, ../sass/app.scss */ .jGrowl-notification h1 { font-size: 1.2em; } -/* line 409, ../sass/app.scss */ +/* line 417, ../sass/app.scss */ .jGrowl-notification, .jGrowl-notify-submit { border: 2px #444444 solid; background-color: #f3f3f3 !important; color: #666666; } -/* line 415, ../sass/app.scss */ +/* line 423, ../sass/app.scss */ .jGrowl-notify-error { border: 2px #660000 solid; background-color: #f39999 !important; color: #660000; } -/* line 421, ../sass/app.scss */ +/* line 429, ../sass/app.scss */ .jGrowl-notify-error table td.key_error { text-transform: capitalize; width: 100%; font-weight: bold; } -/* line 427, ../sass/app.scss */ +/* line 435, ../sass/app.scss */ .jGrowl-notify-error table td.key_error:after { content: ":"; } -/* line 434, ../sass/app.scss */ +/* line 442, ../sass/app.scss */ .markrow { background-color: #cdebf5 !important; } -/* line 435, ../sass/app.scss */ +/* line 443, ../sass/app.scss */ .markrowselected { background-color: #2ba6cb !important; color: #FFF; } -/* line 436, ../sass/app.scss */ +/* line 444, ../sass/app.scss */ .markrowchecked { background-color: #cdebf5; } -/* line 439, ../sass/app.scss */ +/* line 447, ../sass/app.scss */ .hidden { display: none; } -/* line 448, ../sass/app.scss */ +/* line 456, ../sass/app.scss */ #navigation li.topTab span.plusIcon, #navigation li.subTab span.plusIcon { display: none; float: right; } -/* line 453, ../sass/app.scss */ +/* line 461, ../sass/app.scss */ span.plusIcon { color: #d0d0d0; } -/* line 457, ../sass/app.scss */ +/* line 465, ../sass/app.scss */ span.plusIcon:hover { color: #555; } -/* line 464, ../sass/app.scss */ +/* line 472, ../sass/app.scss */ table.extended_table tbody tr td { padding: 3px 10px; } -/* line 471, ../sass/app.scss */ +/* line 479, ../sass/app.scss */ .reveal-modal { top: 50px; } -/* line 476, ../sass/app.scss */ +/* line 484, ../sass/app.scss */ .ui-layout-resizer-open-hover, .ui-layout-resizer-dragging { background: #EEE; } -/* line 481, ../sass/app.scss */ +/* line 489, ../sass/app.scss */ .reveal-modal .panel { margin-left: -30px; margin-right: -30px; margin-bottom: 15px; } -/* line 487, ../sass/app.scss */ +/* line 495, ../sass/app.scss */ .reveal-modal.xlarge { padding-top: 0px; width: 80%; margin-left: -40%; } -/* line 493, ../sass/app.scss */ +/* line 501, ../sass/app.scss */ .reveal-modal { padding-top: 0px; } -/* line 497, ../sass/app.scss */ +/* line 505, ../sass/app.scss */ .reveal-modal h3 { margin-left: 30px; margin-bottom: 7px !important; } -/* line 502, ../sass/app.scss */ +/* line 510, ../sass/app.scss */ .reveal-modal .close-reveal-modal:not(.button) { top: 13px; } -/* line 506, ../sass/app.scss */ +/* line 514, ../sass/app.scss */ .reveal-modal .close-reveal-modal:not(.button):hover { color: #222; } -/* line 510, ../sass/app.scss */ +/* line 518, ../sass/app.scss */ fieldset { margin: 0px 10px; } -/* line 516, ../sass/app.scss */ +/* line 524, ../sass/app.scss */ .graph_table table { border: 0px; margin: 0px; } -/* line 521, ../sass/app.scss */ +/* line 529, ../sass/app.scss */ .graph_table table tr { border: 0px; } -/* line 526, ../sass/app.scss */ +/* line 534, ../sass/app.scss */ .ui-layout-pane { padding: 0px; overflow: overlay; } -/* line 531, ../sass/app.scss */ +/* line 539, ../sass/app.scss */ .reveal-modal .columns { padding: 0 8px; } -/* line 535, ../sass/app.scss */ +/* line 543, ../sass/app.scss */ select { width: auto; } -/* line 540, ../sass/app.scss */ +/* line 548, ../sass/app.scss */ form.creation { padding: 5px; } -/* line 544, ../sass/app.scss */ +/* line 552, ../sass/app.scss */ #dialog input { margin: 0px; } -/* line 549, ../sass/app.scss */ +/* line 557, ../sass/app.scss */ .progress-container { position: relative; width: 100%; @@ -6583,7 +6592,7 @@ form.creation { background: #FFF; } -/* line 556, ../sass/app.scss */ +/* line 564, ../sass/app.scss */ .progress { position: absolute; width: 100%; @@ -6591,7 +6600,7 @@ form.creation { background: #FFF; } -/* line 563, ../sass/app.scss */ +/* line 571, ../sass/app.scss */ .progress-text { position: absolute; width: 100%; @@ -6599,53 +6608,53 @@ form.creation { color: #000 !important; } -/* line 570, ../sass/app.scss */ +/* line 578, ../sass/app.scss */ .meter { background: #cdebf5 !important; } -/* line 574, ../sass/app.scss */ +/* line 582, ../sass/app.scss */ .dashboard .subheader { text-align: center; } -/* line 578, ../sass/app.scss */ +/* line 586, ../sass/app.scss */ .dashboard h2.subheader { margin-bottom: 0; margin-top: 0; } -/* line 583, ../sass/app.scss */ +/* line 591, ../sass/app.scss */ .dashboard h6.subheader { margin-top: 0; } -/* line 587, ../sass/app.scss */ +/* line 595, ../sass/app.scss */ .dashboard h3.subheader { margin-top: 0; } -/* line 591, ../sass/app.scss */ +/* line 599, ../sass/app.scss */ ul.button-group { margin-bottom: 0; } -/* line 595, ../sass/app.scss */ +/* line 603, ../sass/app.scss */ .value_td { text-overflow: ellipsis; } -/* line 599, ../sass/app.scss */ +/* line 607, ../sass/app.scss */ small { color: #b6b6b6 !important; } -/* line 603, ../sass/app.scss */ +/* line 611, ../sass/app.scss */ .header-dashboard { margin-top: -5px; } -/* line 607, ../sass/app.scss */ +/* line 615, ../sass/app.scss */ .span-dashboard { background: #fcfcfc; color: #6f6f6f; @@ -6653,43 +6662,43 @@ small { box-shadow: 0 0 2px 0px #6f6f6f; } -/* line 616, ../sass/app.scss */ +/* line 624, ../sass/app.scss */ .button.dropdown.small::after { border-color: #9f9f9f transparent transparent transparent; border-width: 4px; } -/* line 621, ../sass/app.scss */ +/* line 629, ../sass/app.scss */ .footer-opennebula { font-size: 10px; color: #b6b6b6 !important; } -/* line 626, ../sass/app.scss */ +/* line 634, ../sass/app.scss */ a.footer.button { margin: 5px; } -/* line 631, ../sass/app.scss */ +/* line 639, ../sass/app.scss */ .user-login { float: right; } -/* line 635, ../sass/app.scss */ +/* line 643, ../sass/app.scss */ .user-login i.header-icon { color: #6f6f6f; font-weight: 300; font-size: 23px; } -/* line 641, ../sass/app.scss */ +/* line 649, ../sass/app.scss */ .user-login .button { color: #6f6f6f; font-size: 60%; line-height: 0; } -/* line 647, ../sass/app.scss */ +/* line 655, ../sass/app.scss */ .user-login .button.secondary { background: #f2f2f2; border: 0px; @@ -6697,88 +6706,88 @@ a.footer.button { font-weight: 300; } -/* line 655, ../sass/app.scss */ +/* line 663, ../sass/app.scss */ .user-login .button.secondary:hover, .user-login .button.secondary:focus { background-color: #d0d0d0; color: #6f6f6f; } -/* line 660, ../sass/app.scss */ +/* line 668, ../sass/app.scss */ .user-login .button.dropdown.tiny::after { border: solid 5px; border-color: #b6b6b6 transparent transparent transparent; right: 7px; } -/* line 666, ../sass/app.scss */ -.header-resource { - text-align: center; -} - -/* line 670, ../sass/app.scss */ -.header-resource { - float: left; -} - /* line 674, ../sass/app.scss */ -.header { +.header-resource { text-align: center; } /* line 678, ../sass/app.scss */ -.button.dropdown.tiny ul.no-hover.show-dropdown { - top: 34px !important; +.header-resource { + float: left; } /* line 682, ../sass/app.scss */ -.graph_legend { +.header { text-align: center; } /* line 686, ../sass/app.scss */ +.button.dropdown.tiny ul.no-hover.show-dropdown { + top: 34px !important; +} + +/* line 690, ../sass/app.scss */ +.graph_legend { + text-align: center; +} + +/* line 694, ../sass/app.scss */ .graph_legend table { background: inherit; border: 0px; width: 100%; } -/* line 692, ../sass/app.scss */ +/* line 700, ../sass/app.scss */ .graph_legend h3 { margin-top: 0px; } -/* line 696, ../sass/app.scss */ +/* line 704, ../sass/app.scss */ .graph_legend .subheader { margin-bottom: 5px; } -/* line 700, ../sass/app.scss */ +/* line 708, ../sass/app.scss */ .dashboard hr { margin: 0; margin-bottom: 8px; } -/* line 705, ../sass/app.scss */ +/* line 713, ../sass/app.scss */ .graph { margin-bottom: 15px !important; } -/* line 709, ../sass/app.scss */ +/* line 717, ../sass/app.scss */ .dashboard-panel { height: 450px; } -/* line 713, ../sass/app.scss */ +/* line 721, ../sass/app.scss */ .vm_log_error { color: #ff8d81; } -/* line 717, ../sass/app.scss */ +/* line 725, ../sass/app.scss */ .noUiSlider { margin: 10px; } -/* line 721, ../sass/app.scss */ +/* line 729, ../sass/app.scss */ .log-tab { background: #6f6f6f; color: #f2f2f2; @@ -6786,20 +6795,40 @@ a.footer.button { padding: 20px; } -/* line 728, ../sass/app.scss */ +/* line 736, ../sass/app.scss */ .reveal-modal ul.tabs-content { margin: 0 0 0px; } -/* line 732, ../sass/app.scss */ +/* line 740, ../sass/app.scss */ .reveal-body { - max-height: 360px; - overflow-y: auto; + height: 80%; + overflow-y: overlay; overflow-x: hidden; - padding: 5px; + padding: 5px 20px; } -/* line 742, ../sass/app.scss */ +/* line 747, ../sass/app.scss */ +.reveal-footer { + position: absolute; + bottom: 20px; + width: 90%; +} + +/* line 753, ../sass/app.scss */ +.max-height { + max-height: 85%; + position: absolute; + height: 100%; +} + +/* line 759, ../sass/app.scss */ +.ui-layout-content { + overflow-y: overlay; + overflow-x: hidden; +} + +/* line 766, ../sass/app.scss */ div.time-picker { position: absolute; height: 191px; @@ -6812,20 +6841,20 @@ div.time-picker { margin: 0; } -/* line 752, ../sass/app.scss */ +/* line 776, ../sass/app.scss */ div.time-picker-12hours { width: 6em; /* needed for IE */ } -/* line 756, ../sass/app.scss */ +/* line 780, ../sass/app.scss */ div.time-picker ul { list-style-type: none; margin: 0; padding: 0; } -/* line 761, ../sass/app.scss */ +/* line 785, ../sass/app.scss */ div.time-picker li { cursor: pointer; height: 20px; @@ -6833,36 +6862,51 @@ div.time-picker li { padding: 4px 3px; } -/* line 767, ../sass/app.scss */ +/* line 791, ../sass/app.scss */ div.time-picker li.selected { background: #0063CE; color: #fff; } -/* line 773, ../sass/app.scss */ +/* line 797, ../sass/app.scss */ .timepicker { float: left; width: 50px !important; } -/* line 778, ../sass/app.scss */ +/* line 802, ../sass/app.scss */ .jdpicker { float: left; width: 90px !important; } -/* line 783, ../sass/app.scss */ +/* line 807, ../sass/app.scss */ .columns { line-height: 2; } -/* line 787, ../sass/app.scss */ +/* line 811, ../sass/app.scss */ .transparent_table, .transparent_table tr { background: none !important; border: 0px !important; } -/* line 792, ../sass/app.scss */ +/* line 816, ../sass/app.scss */ form { margin: 0 !important; } + +/* line 820, ../sass/app.scss */ +#template_create_tabs { + width: 180px; +} + +/* line 825, ../sass/app.scss */ +.dataTables_scrollHead { + height: 30px; +} + +/* line 829, ../sass/app.scss */ +.dataTables_scrollBody { + margin-top: -3px; +} diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js index 3fc6a89edf..d88012b94d 100644 --- a/src/sunstone/public/js/layout.js +++ b/src/sunstone/public/js/layout.js @@ -142,7 +142,7 @@ $(document).ready(function () { applyDefaultStyles: false , center__paneSelector: ".outer-center" , west__paneSelector: ".outer-west" - , west__size: 245 + , west__size: 260 , north__size: 26 , south__size: 26 , spacing_open: 0 // ALL panes @@ -159,7 +159,7 @@ $(document).ready(function () { , west__resizable: false }); - var factor = 0.6; + var factor = 0.5; var dialog_height = Math.floor($(".outer-center").height()*factor); innerLayout = $('div.outer-center').layout({ diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index d28a4af0c5..96894721d1 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -72,8 +72,8 @@ var create_acl_tmpl = '+tr("Create ACL")+'\ \
    \ -
    \
    \ +\
    \
    \ \ @@ -150,14 +150,17 @@ var create_acl_tmpl =
    \
    \
    \ + \ ×\ -
    '; +\ +
    '; var acl_actions = { "Acl.create" : { @@ -430,7 +433,7 @@ function setupCreateAclDialog(){ // width: 650, // height: height //}); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); //Default selected options $('#res_subgroup_all',dialog).attr('checked','checked'); diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index a79ad93996..4116dad15c 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -72,15 +72,14 @@ var datastore_datatable_table_tmpl='\ ' -var create_cluster_tmpl ='
    \ -
    \ +var create_cluster_tmpl ='
    \

    \ '+tr("Create Cluster")+'\ '+tr("Update Cluster")+'\

    \
    \
    \ -
    \ + \
    \
    \
    \ @@ -153,17 +152,17 @@ var create_cluster_tmpl ='
    \
    \ \ \ -
    \ \
    \ + '; +
    \ + ×'; // Common utils for datatatables // Holds the selected items @@ -184,7 +183,7 @@ function setupCreateClusterDialog(){ dialog.html(create_cluster_tmpl); var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); // ------- Create the dialog datatables ------------ dataTable_cluster_hosts = $("#datatable_cluster_hosts", dialog).dataTable({ diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index e5b9c9377d..59455884ab 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -21,7 +21,7 @@ var config_tab_content = '+tr("Configuration")+'\ \
    \ -
    \ +
    \
    \
    \
    \ @@ -57,10 +57,13 @@ var config_tab_content =
    \
    \
    \ +
    \ + \ ×'; var config_actions = { @@ -80,7 +83,7 @@ function setupConfigDialog() { var dialog = $config_dialog; dialog.html(config_tab_content); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); setupTips(dialog); diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index fc49ff969d..4361325d04 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -69,14 +69,13 @@ var datastores_tab_content = '\ '; var create_datastore_tmpl = -'
    \ -
    \ +'
    \

    \ '+tr("Create Datastore")+'\

    \
    \ -
    \
    \ + \
    \
    \ \ @@ -265,15 +264,16 @@ var create_datastore_tmpl =
    \
    \
    \ + \ ×\ -
    \ -
    '; + '; var datastore_image_table_tmpl='\ \ @@ -763,7 +763,7 @@ function setupCreateDatastoreDialog(){ var dialog = $create_datastore_dialog; dialog.html(create_datastore_tmpl); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); setupTips(dialog); diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 9eebdf9109..7c384b15c6 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -265,14 +265,16 @@ var group_quotas_tmpl = '
    \
    \
    \
    \ -
    \ + \ ×\ -'; +\ +
    '; var group_actions = { diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 565d79f128..2de13c46b2 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -76,14 +76,13 @@ var hosts_tab_content = '\ '; var create_host_tmpl = -'
    \ -
    \ +'
    \

    \ '+tr("Create Host")+'\

    \
    \ -
    \
    \ + \
    \
    \ \ @@ -180,14 +179,16 @@ var create_host_tmpl =
    \
    \
    \ + \ ×\ -
    '; +'; var hosts_select=""; var dataTable_hosts; @@ -935,7 +936,7 @@ function setupCreateHostDialog(){ // modal: true, // width: 500 //}); - dialog.addClass("reveal-modal"); + dialog.addClass("reveal-modal max-height"); //$('button',dialog).button(); diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index a1feabf057..cc43bc9252 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -70,10 +70,10 @@ var images_tab_content = '\ '; var create_image_tmpl = -'
    \ -
    \ + '
    \

    '+tr("Create Image")+'

    \
    \ +
    \
    \
    \
    '+tr("Wizard")+'
    \ @@ -81,7 +81,6 @@ var create_image_tmpl =
    \
      \
    • \ -
      \
      \
      \
      \ @@ -254,13 +253,14 @@ var create_image_tmpl =
      \
      \
      \ -
      \ -
      \ + \
    • \
    • \
      \ @@ -270,12 +270,14 @@ var create_image_tmpl = \ \
      \ + \
    • \
    \ ×\ @@ -826,7 +828,7 @@ function setupCreateImageDialog(){ // width: 520, // height: height //}); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); $('.advanced',dialog).hide(); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 906283fc94..f8d3e6e06c 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -69,9 +69,9 @@ var templates_tab_content = '\ var create_template_tmpl = '
    '+ '

    '+tr("Create VM Template")+'

    '+ '
    '+ + '
    '+ ''+ - '
    '+ - '
    '+ + '
    '+ '
    '+ '
    '+ '
    '+ @@ -81,8 +81,7 @@ var create_template_tmpl = '
    '+ ''+ '
    '+ '
    '+ - '
    '+ - '
    '+ + ''; var update_template_tmpl = @@ -2997,7 +2997,7 @@ function setupCreateTemplateDialog(){ // width: 'auto', // height: height //}); - dialog.addClass("reveal-modal xlarge") + dialog.addClass("reveal-modal xlarge max-height") var tabs = $( "#template_create_tabs", dialog)//.tabs().addClass("ui-tabs-vertical"); @@ -4157,8 +4157,6 @@ $(document).ready(function(){ "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, { "sWidth": "35px", "aTargets": [0,1] }, - { "sWidth": "150px", "aTargets": [5] }, - { "sWidth": "100px", "aTargets": [2,3] } ] }); diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index f60d01c634..06a60ec234 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -339,14 +339,16 @@ var user_quotas_tmpl = '
    \
    \
    \
    \ -
    \ + \ ×\ -'; +\ +
    '; var user_actions = { diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index f893725272..78aeb7d70f 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1360,8 +1360,7 @@ function updateVMInfo(request,vm){ var template_tab = { title: tr("Template"), content: - '\ - '+ + '
    '+tr("VM template")+'
    '+ prettyPrintJSON(vm_info.TEMPLATE)+ '
    ' }; @@ -2019,8 +2018,8 @@ function setupAttachDiskDialog(){ '+tr("Attach new disk")+'\ \
    \ -
    \
    \ + \
    \
    \ \ @@ -2033,16 +2032,17 @@ function setupAttachDiskDialog(){
    \
    ' + generate_disk_tab_content("attach_disk", "attach_disk") + - '
    \ + '\ ×\ -
    ') +
    ') - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); setupTips(dialog); setup_disk_tab_content(dialog, "attach_disk", "attach_disk") @@ -2282,8 +2282,8 @@ function setupAttachNicDialog(){ '+tr("Attach new nic")+'\ \
    \ -
    \
    \ + \
    \
    \ \ @@ -2296,16 +2296,17 @@ function setupAttachNicDialog(){
    \
    ' + generate_nic_tab_content("attach_nic", "attach_nic") + - '
    \ + '\ ×\ -
    ') +
    ') - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); setupTips(dialog); setup_nic_tab_content(dialog, "attach_nic", "attach_nic") @@ -2455,6 +2456,7 @@ function setupResizeCapacityDialog(){ '+tr("Resize VM capacity")+'\ \
    \ +
    \
    \
    \
    \ @@ -2482,15 +2484,17 @@ function setupResizeCapacityDialog(){
    \
    ' + generate_capacity_tab_content() + - '
    \ + '\ ×\ -
    ') +
    ') - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); setupTips(dialog); $("#template_name_form", dialog).hide(); @@ -2894,9 +2898,11 @@ function setupVNC(){ \ \ \ +
    \ \ '+tr("Canvas not supported.")+'\ \ +
    \ ×\ \ '); @@ -2909,7 +2915,7 @@ function setupVNC(){ // resizable:true, // closeOnEscape: false //}); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); $('#sendCtrlAltDelButton',dialog).click(function(){ rfb.sendCtrlAltDel(); @@ -2991,7 +2997,7 @@ $(document).ready(function(){ }); $('#vms_search').keyup(function(){ - dataTable_templates.fnFilter( $(this).val() ); + dataTable_vMachines.fnFilter( $(this).val() ); }) //addElement([ diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index b53a3d2d1a..625632e40f 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -66,12 +66,12 @@ var vnets_tab_content = '\ '; var create_vn_tmpl = -'
    \ -
    \ +'
    \

    \ '+tr("Create Virtual Network")+'\

    \
    \ +
    \
    \
    '+tr("Wizard")+'
    \
    '+tr("Advanced mode")+'
    \ @@ -79,7 +79,6 @@ var create_vn_tmpl =
      \
    • \
      \ -
      \
      \
      \ \ @@ -317,7 +316,7 @@ var create_vn_tmpl =
      \ \
      \ -
      \ + \
      \
    • \
    • \
      \ -
      \

      '+tr("Write the Virtual Network template here")+'

      \ \ -
      \ + \
      \
    • \
    \ - ×\ -
    '; +
    \ + ×'; var update_vnet_tmpl = '
    \ @@ -972,7 +972,7 @@ function setupCreateVNetDialog() { // width: 475, // height: height //}); - dialog.addClass("reveal-modal large"); + dialog.addClass("reveal-modal large max-height"); //Make the tabs look nice for the creation mode //$('#vn_tabs',dialog).tabs(); diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 364daf2c12..79ab8b4d27 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -1112,7 +1112,7 @@ function setupQuotasDialog(dialog){ // width: 740, // height: height //}); - dialog.addClass("reveal-modal xlarge") + dialog.addClass("reveal-modal xlarge max-height") //$('button',dialog).button(); $('#vm_quota,#datastore_quota,#image_quota,#network_quota',dialog).hide(); diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index d9a893949e..4d2d101361 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -157,7 +157,6 @@ div.button-bar { #logo { font-weight: bold; - margin:10%; margin-top: 15%; margin-bottom: 10%; } @@ -224,7 +223,7 @@ div.button-bar { } #navigation { - margin: 8%;; + margin: 0 8%; box-shadow: 0 0 1px 0px black; } @@ -264,15 +263,23 @@ div.button-bar { } #navigation li:not(subTab) { - border-left: 5px solid #f2f2f2 !important; + border-left: 5px solid #f2f2f2; +} + +#navigation li:not(subTab):hover { + border-left: 5px solid #e2e2e2 ; } #navigation li.subTab:not(.navigation-active-li) { - border-left: 5px solid #fdfdfd !important; + border-left: 5px solid #fdfdfd; } -#navigation li:hover { - font-weight: bold; +#navigation li.subTab:not(.navigation-active-li):hover { + border-left: 5px solid #e2e2e2 ; +} + +#navigation a:hover { + background: #e2e2e2 !important; } #navigation .navigation-active-li { @@ -281,6 +288,7 @@ div.button-bar { + /* top menu css */ #menutop_container{ margin:0px 171px; @@ -730,12 +738,28 @@ a.footer.button { } .reveal-body { - max-height: 360px; - overflow-y: auto; + height:80%; + overflow-y: overlay; overflow-x: hidden; - padding: 5px; + padding: 5px 20px; } +.reveal-footer { + position: absolute; + bottom: 20px; + width: 90%; +} + +.max-height{ + max-height: 85%; + position: absolute; + height: 100%; +} + +.ui-layout-content { + overflow-y: overlay; + overflow-x: hidden; +} // time-picker @@ -791,4 +815,17 @@ div.time-picker li.selected { form { margin: 0 !important; +} + +#template_create_tabs { + //position: fixed; + width: 180px; +} + +.dataTables_scrollHead { + height: 30px; +} + +.dataTables_scrollBody { + margin-top: -3px; } \ No newline at end of file diff --git a/src/sunstone/public/vendor/4.0/jquery_layout/layout-default-latest.css b/src/sunstone/public/vendor/4.0/jquery_layout/layout-default-latest.css index 14e507b51d..ba4df7fffd 100644 --- a/src/sunstone/public/vendor/4.0/jquery_layout/layout-default-latest.css +++ b/src/sunstone/public/vendor/4.0/jquery_layout/layout-default-latest.css @@ -42,7 +42,7 @@ body { .ui-layout-content { padding: 10px; position: relative; /* contain floated or positioned elements */ - overflow: auto; /* add scrolling to content-div */ + overflow: overlay; /* add scrolling to content-div */ } /* diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 51eb7d924c..ccd1eac86c 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -86,7 +86,9 @@
    \ \ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 2e9ddf8e77..98059592c0 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -27,7 +27,7 @@ var images_tab_content = '\ \ \ '+tr("TOTAL")+' \ - '+tr("SIZE")+'\ + '+tr("USED")+'\ \ \ diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index c3c0f8560f..d61b859df9 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -2958,11 +2958,13 @@ function vncIcon(vm){ if (graphics && graphics.TYPE.toLowerCase() == "vnc" && $.inArray(state, VNCstates)!=-1){ gr_icon = ''; - gr_icon += '\"'+tr("Open'; + gr_icon += ''; } else { - gr_icon = '\"'+tr("VNC'; + gr_icon = ''; } + + gr_icon += '' return gr_icon; } diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 6886eb60ee..d60ca2e962 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -27,7 +27,7 @@ var vnets_tab_content = '\ \ \ '+tr("TOTAL")+' \ - '+tr("ADDRESSES")+'\ + '+tr("USED IPs")+'\ \ \ From 7195eb6b0cea1c055a0bbd10ae4d5a36be56a9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 5 Apr 2013 17:43:44 +0200 Subject: [PATCH 73/82] Rename VM states in sunstone to be similar to those in the CLI --- src/sunstone/public/js/opennebula.js | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 42e5d9bc82..9a6da37b2f 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -93,34 +93,34 @@ var OpenNebula = { "BOOT", "RUNNING", "MIGRATE", - "SAVE_STOP", - "SAVE_SUSPEND", - "SAVE_MIGRATE", - "PROLOG_MIGRATE", - "PROLOG_RESUME", - "EPILOG_STOP", + "SAVE", + "SAVE", + "SAVE", + "MIGRATE", + "PROLOG", + "EPILOG", "EPILOG", "SHUTDOWN", - "CANCEL", + "SHUTDOWN", "FAILURE", - "CLEANUP_RESUBMIT", + "CLEANUP", "UNKNOWN", "HOTPLUG", - "SHUTDOWN_POWEROFF", - "BOOT_UNKNOWN", - "BOOT_POWEROFF", - "BOOT_SUSPENDED", - "BOOT_STOPPED", - "CLEANUP_DELETE", - "HOTPLUG_SNAPSHOT", - "HOTPLUG_NIC", - "HOTPLUG_SAVEAS", - "HOTPLUG_SAVEAS_POWEROFF", - "HOTPLUG_SAVEAS_SUSPENDED", - "SHUTDOWN_UNDEPLOY", - "EPILOG_UNDEPLOY", - "PROLOG_UNDEPLOY", - "BOOT_UNDEPLOY"][value]); + "SHUTDOWN", + "BOOT", + "BOOT", + "BOOT", + "BOOT", + "CLEANUP", + "SNAPSHOT", + "HOTPLUG", + "HOTPLUG", + "HOTPLUG", + "HOTPLUG", + "SHUTDOWN", + "EPILOG", + "PROLOG", + "BOOT"][value]); break; case "IMAGE": case "image": From c5ecfd3aa84500e3df48ed375390a72a8f9de960 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 5 Apr 2013 18:12:48 +0200 Subject: [PATCH 74/82] Fix advanced css --- src/sunstone/public/css/app.css | 10 ++++++++++ src/sunstone/public/js/plugins/files-tab.js | 2 +- src/sunstone/public/js/plugins/images-tab.js | 2 +- src/sunstone/public/js/plugins/templates-tab.js | 8 ++++---- src/sunstone/public/sass/app.scss | 7 +++++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css index 271bd2bd06..55fd3d7b85 100644 --- a/src/sunstone/public/css/app.css +++ b/src/sunstone/public/css/app.css @@ -6910,3 +6910,13 @@ form { .dataTables_scrollBody { margin-top: -3px; } + +/* line 833, ../sass/app.scss */ +.show_hide { + cursor: pointer; +} + +/* line 837, ../sass/app.scss */ +.show_hide:hover > h4 > small { + color: #6f6f6f !important; +} diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index 8389b22402..ca4758b617 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -150,7 +150,7 @@ var create_file_tmpl = \ \
    \ -

    '+tr("Advanced options")+'

    \ +

    '+tr("Advanced options")+'

    \
    \
    \
    \ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 98059592c0..fee2154e52 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -198,7 +198,7 @@ var create_image_tmpl = \
    \
    \ -

    '+tr("Advanced options")+'

    \ +

    '+tr("Advanced options")+'

    \
    \
    \
    \ diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 9b71f6b2fd..7b7a5c8ff1 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -554,7 +554,7 @@ function generate_capacity_tab_content() { '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -789,7 +789,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ @@ -873,7 +873,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+''+ + '

    '+tr("Advanced options")+''+ '

    '+ '
    '+ '
    '+ @@ -1141,7 +1141,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ '
    '+ '
    '+ '
    '+ - '

    '+tr("Advanced options")+'

    '+ + '

    '+tr("Advanced options")+'

    '+ '
    '+ '
    '+ '
    '+ diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss index a341cc9c4c..6e5081acb9 100644 --- a/src/sunstone/public/sass/app.scss +++ b/src/sunstone/public/sass/app.scss @@ -830,3 +830,10 @@ form { margin-top: -3px; } +.show_hide { + cursor: pointer; +} + +.show_hide:hover > h4 > small { + color: #6f6f6f !important; +} From 171eba7aaf71f64dbdfe7f101e323abb7111aba4 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 5 Apr 2013 18:59:46 +0200 Subject: [PATCH 75/82] Remove clone and persistence in files tab --- src/sunstone/public/js/plugins/files-tab.js | 136 -------------------- 1 file changed, 136 deletions(-) diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js index ca4758b617..9807a2c693 100644 --- a/src/sunstone/public/js/plugins/files-tab.js +++ b/src/sunstone/public/js/plugins/files-tab.js @@ -319,16 +319,6 @@ var file_actions = { error: onError, notify: true }, - "File.clone_dialog" : { - type: "custom", - call: popUpFileCloneDialog - }, - "File.clone" : { - type: "single", - call: OpenNebula.Image.clone, - error: onError, - notify: true - }, "File.help" : { type: "custom", call: function() { @@ -386,11 +376,6 @@ var file_buttons = { layout: "more_select", text: tr("Disable") }, - "File.clone_dialog" : { - type: "action", - layout: "main", - text: tr("Clone") - }, "File.delete" : { type: "confirm", layout: "del", @@ -546,14 +531,6 @@ function updateFileInfo(request,img){ '+pretty_time(img_info.REGTIME)+'\ \ \ - \ - '+tr("Persistent")+'\ - '+(parseInt(img_info.PERSISTENT) ? tr("yes") : tr("no"))+'\ -
    \ - \ -
    \ - \ - \ \ '+tr("Filesystem type")+'\ '+(typeof img_info.FSTYPE === "string" ? img_info.FSTYPE : "--")+'\ @@ -633,26 +610,6 @@ function updateFileInfo(request,img){ Sunstone.runAction("File.showinfo", img_info.ID); }); - // Listener for edit link for persistency change - $("#div_edit_persistency").live("click", function() { - var value_str = $(".value_td_persistency").text(); - $(".value_td_persistency").html( - ''); - $('option[value="'+value_str+'"]').replaceWith(''); - }); - - $("#persistency_select").live("change", function() { - var new_value=$("option:selected", this).text(); - - if (new_value=="yes") - Sunstone.runAction("File.persistent",[img_info.ID]); - else - Sunstone.runAction("File.nonpersistent",[img_info.ID]); - - }); Sunstone.updateInfoPanelTab("file_info_panel","file_info_tab",info_tab); Sunstone.popUpInfoPanel("file_info_panel"); @@ -946,98 +903,6 @@ function is_persistent_file(id){ return $(data).is(':checked'); }; -function setupFileCloneDialog(){ - //Append to DOM - dialogs_context.append('
    '); - var dialog = $('#file_clone_dialog',dialogs_context); - - //Put HTML in place - - var html = '
    \ -

    \ - '+tr("Clone File")+'\ -

    \ -
    \ -
    \ -
    \ -
    \ -
    '+tr("Several file are selected, please choose prefix to name the new copies")+':
    \ -
    \ -
    \ -
    \ -
    \ - \ - \ -
    \ -
    \ - \ -
    \ -
    \ -
    \ -
    \ - \ - \ -
    \ -×\ -
    \ -'; - - dialog.html(html); - - //Convert into jQuery - //dialog.dialog({ - // autoOpen:false, - // width:375, - // modal:true, - // resizable:false - //}); - dialog.addClass("reveal-modal"); - - //$('button',dialog).button(); - - $('form',dialog).submit(function(){ - var name = $('input', this).val(); - var sel_elems = fileElements(); - if (!name || !sel_elems.length) - notifyError('A name or prefix is needed!'); - if (sel_elems.length > 1){ - for (var i=0; i< sel_elems.length; i++) - //If we are cloning several files we - //use the name as prefix - Sunstone.runAction('Image.clone', - sel_elems[i], - name+getFileName(sel_elems[i])); - } else { - Sunstone.runAction('Image.clone',sel_elems[0],name) - }; - dialog.trigger("reveal:close") - setTimeout(function(){ - Sunstone.runAction('Image.refresh'); - }, 1500); - return false; - }); -} - -function popUpFileCloneDialog(){ - var dialog = $('#file_clone_dialog'); - var sel_elems = fileElements(); - //show different text depending on how many elements are selected - if (sel_elems.length > 1){ - $('.clone_one',dialog).hide(); - $('.clone_several',dialog).show(); - $('input',dialog).val('Copy of '); - } - else { - $('.clone_one',dialog).show(); - $('.clone_several',dialog).hide(); - $('input',dialog).val('Copy of '+getFileName(sel_elems[0])); - }; - - $(dialog).reveal(); -} - //The DOM is ready at this point $(document).ready(function(){ @@ -1066,7 +931,6 @@ $(document).ready(function(){ setupCreateFileDialog(); setupTips($create_file_dialog); - setupFileCloneDialog(); setFileAutorefresh(); initCheckAllBoxes(dataTable_files); From cc1a9292c100df6457dbb45d2e9295ada525554b Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Sat, 6 Apr 2013 00:34:13 +0200 Subject: [PATCH 76/82] Fix host form creation --- src/sunstone/public/js/plugins/hosts-tab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 7d4b922267..e2c24ef565 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -178,7 +178,6 @@ var create_host_tmpl =
    \
    \
    \ -
    \ \ ×\ -'; +\ +
    '; var hosts_select=""; var dataTable_hosts; From 5bcb9a80adff5964cd563690c5ca51440645e6fc Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 8 Apr 2013 11:34:39 +0200 Subject: [PATCH 77/82] Fix acl creation form --- src/sunstone/public/js/plugins/acls-tab.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 9b2851a7ee..c18e8f629c 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -149,7 +149,6 @@ var create_acl_tmpl =
    \
    \ \ - \