From 1c642ddd5eb34fb7f4072bb3b86d45edd7b8532a Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 15 Feb 2016 18:59:43 +0100 Subject: [PATCH 1/3] Feature #3671: Use sunstone vector in TemplateJSON --- src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb index fec8431a1d..c6a2b6fb68 100644 --- a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb @@ -99,13 +99,13 @@ module OpenNebulaJSON def instantiate(params=Hash.new) if params['template'] - select_capacity = self['TEMPLATE/SUNSTONE_CAPACITY_SELECT'] + select_capacity = self['TEMPLATE/SUNSTONE/CAPACITY_SELECT'] if (select_capacity && select_capacity.upcase == "NO") params['template'].delete("CPU") params['template'].delete("MEMORY") end - select_network = self['TEMPLATE/SUNSTONE_NETWORK_SELECT'] + select_network = self['TEMPLATE/SUNSTONE/NETWORK_SELECT'] if (select_network && select_network.upcase == "NO") params['template'].delete("NIC") end From 3da6446f257397b7d1004482a8658908cb961318 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 15 Feb 2016 19:18:41 +0100 Subject: [PATCH 2/3] Bug #4198: oneflow tabs use an inconsistent tab-id --- src/sunstone/etc/sunstone-views/admin.yaml | 8 ++++---- src/sunstone/etc/sunstone-views/admin_vcenter.yaml | 8 ++++---- src/sunstone/etc/sunstone-views/user.yaml | 8 ++++---- src/sunstone/public/app/main.js | 2 +- src/sunstone/public/app/tabs/oneflow-dashboard.js | 2 +- src/sunstone/public/app/tabs/oneflow-services-tab.js | 2 +- .../public/app/tabs/oneflow-services-tab/panels/roles.js | 4 ++-- .../public/app/tabs/oneflow-services-tab/tabId.js | 2 +- src/sunstone/public/app/tabs/oneflow-templates-tab.js | 2 +- .../public/app/tabs/oneflow-templates-tab/tabId.js | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 8d43b8ffe5..d78ee416ff 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -21,7 +21,7 @@ enabled_tabs: - secgroups-tab - vrouters-tab - zones-tab - - oneflow-dashboard + - oneflow-dashboard-tab - oneflow-services-tab - oneflow-templates-tab - marketplaces-tab @@ -470,11 +470,11 @@ tabs: VirtualRouter.delete: true VirtualRouter.attachnic: true VirtualRouter.detachnic: true - oneflow-dashboard: + oneflow-dashboard-tab: panel_tabs: table_columns: actions: - oneflow-services: + oneflow-services-tab: panel_tabs: service_info_tab: true service_roles_tab: true @@ -529,7 +529,7 @@ tabs: Service.shutdown: true Service.recover: true Service.delete: true - oneflow-templates: + oneflow-templates-tab: panel_tabs: service_template_info_tab: true service_template_roles_tab: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 424ed9d84f..ac990f8643 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -20,7 +20,7 @@ enabled_tabs: #- secgroups-tab - vrouters-tab - zones-tab - - oneflow-dashboard + - oneflow-dashboard-tab - oneflow-services-tab - oneflow-templates-tab - settings-tab @@ -461,11 +461,11 @@ tabs: VirtualRouter.delete: true VirtualRouter.attachnic: true VirtualRouter.detachnic: true - oneflow-dashboard: + oneflow-dashboard-tab: panel_tabs: table_columns: actions: - oneflow-services: + oneflow-services-tab: panel_tabs: service_info_tab: true service_roles_tab: true @@ -520,7 +520,7 @@ tabs: Service.shutdown: true Service.recover: true Service.delete: true - oneflow-templates: + oneflow-templates-tab: panel_tabs: service_template_info_tab: true service_template_roles_tab: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index f3679cbc7e..b828c7648e 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -20,7 +20,7 @@ enabled_tabs: - secgroups-tab - vrouters-tab #- zones-tab - - oneflow-dashboard + - oneflow-dashboard-tab - oneflow-services-tab - oneflow-templates-tab - marketplaces-tab @@ -465,11 +465,11 @@ tabs: VirtualRouter.delete: true VirtualRouter.attachnic: true VirtualRouter.detachnic: true - oneflow-dashboard: + oneflow-dashboard-tab: panel_tabs: table_columns: actions: - oneflow-services: + oneflow-services-tab: panel_tabs: service_info_tab: true service_roles_tab: true @@ -524,7 +524,7 @@ tabs: Service.shutdown: true Service.recover: true Service.delete: true - oneflow-templates: + oneflow-templates-tab: panel_tabs: service_template_info_tab: true service_template_roles_tab: true diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index e2a21a566f..a5796717ea 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -139,7 +139,7 @@ require.config({ 'tabs/secgroups-tab', 'tabs/vrouters-tab', 'tabs/zones-tab', - 'tabs/oneflow-dashboard', + 'tabs/oneflow-dashboard-tab', 'tabs/oneflow-services-tab', 'tabs/oneflow-templates-tab', 'tabs/marketplaces-tab', diff --git a/src/sunstone/public/app/tabs/oneflow-dashboard.js b/src/sunstone/public/app/tabs/oneflow-dashboard.js index 3abce46ae1..56bf03a346 100644 --- a/src/sunstone/public/app/tabs/oneflow-dashboard.js +++ b/src/sunstone/public/app/tabs/oneflow-dashboard.js @@ -15,7 +15,7 @@ /* -------------------------------------------------------------------------- */ define(function(require) { - var TAB_ID = 'oneflow-dashboard'; + var TAB_ID = 'oneflow-dashboard-tab'; var Tab = { tabId: TAB_ID, diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab.js b/src/sunstone/public/app/tabs/oneflow-services-tab.js index 69ab699f5f..85287c3b1a 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab.js @@ -45,7 +45,7 @@ define(function(require) { tabId: TAB_ID, title: Locale.tr("Services"), tabClass: "subTab", - parentTab: "oneflow-dashboard", + parentTab: "oneflow-dashboard-tab", listHeader: ' '+Locale.tr("OneFlow - Services"), infoHeader: ' '+Locale.tr("OneFlow - Service"), subheader: '', diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js index 238b4ff930..c93163030d 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js @@ -187,7 +187,7 @@ define(function(require) { this.servicerolesDataTable.initialize(); - Sunstone.insertButtonsInTab("oneflow-services", "service_roles_tab", roles_buttons, $('#role_actions', context)); + Sunstone.insertButtonsInTab(TAB_ID, "service_roles_tab", roles_buttons, $('#role_actions', context)); } } @@ -299,7 +299,7 @@ define(function(require) { this.serviceroleVMsDataTable.initialize(); Sunstone.insertButtonsInTab( - "oneflow-services", + TAB_ID, "service_roles_tab", roles_vm_buttons, $('div#role_vms_actions', context)); diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js index 07a1ebf972..fe783eb314 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js @@ -15,5 +15,5 @@ /* -------------------------------------------------------------------------- */ define(function(require){ - return 'oneflow-services'; + return 'oneflow-services-tab'; }); diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab.js index faee265f8e..a11f0c8d2c 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab.js @@ -46,7 +46,7 @@ define(function(require) { tabId: TAB_ID, title: Locale.tr("Templates"), tabClass: "subTab", - parentTab: "oneflow-dashboard", + parentTab: "oneflow-dashboard-tab", listHeader: ' '+Locale.tr("OneFlow - Templates"), infoHeader: ' '+Locale.tr("OneFlow - Template"), subheader: '', diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js index 7716ae980b..9fc10081d1 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js @@ -15,5 +15,5 @@ /* -------------------------------------------------------------------------- */ define(function(require){ - return 'oneflow-templates'; + return 'oneflow-templates-tab'; }); From d397116db9c212e9b0d9bc12488829f99eda0e51 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 15 Feb 2016 22:33:18 +0100 Subject: [PATCH 3/3] feature #4215: Do not generate prolog commands for cloud hosts during nic_attach. --- src/vmm/VirtualMachineManager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc index 68feb8f319..91d6c489f5 100644 --- a/src/vmm/VirtualMachineManager.cc +++ b/src/vmm/VirtualMachineManager.cc @@ -2436,7 +2436,7 @@ void VirtualMachineManager::attach_nic_action( disk = vm->get_context(); - if ( disk != 0 ) + if (disk != 0 && !vm->get_host_is_cloud()) { vm_tm_mad = vm->get_tm_mad();