diff --git a/src/sunstone/etc/sunstone-views/kvm/cloud.yaml b/src/sunstone/etc/sunstone-views/kvm/cloud.yaml index a9e244cdd3..59fcdc3683 100644 --- a/src/sunstone/etc/sunstone-views/kvm/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/cloud.yaml @@ -16,7 +16,7 @@ features: # True to hide the CPU setting in the VM creation dialog. The CPU setting # will be set to the same value as VCPU, that will still be visible for the # end users - instantiate_hide_cpu: false + instantiate_hide_cpu: true # False to not scale the CPU. Number [0, 1] to scale from VCPU instantiate_cpu_factor: false @@ -30,12 +30,12 @@ tabs: provision-tab: panel_tabs: vm_info_tab: false - vm_capacity_tab: false - vm_storage_tab: false - vm_network_tab: false - vm_snapshot_tab: false + vm_capacity_tab: true + vm_storage_tab: true + vm_network_tab: true + vm_snapshot_tab: true vm_placement_tab: false - vm_actions_tab: false + vm_actions_tab: true vm_conf_tab: false vm_template_tab: false vm_log_tab: false @@ -61,17 +61,17 @@ tabs: VM.terminate: true VM.terminate_hard: true VM.resize: false - VM.attachdisk: false - VM.detachdisk: false - VM.disk_saveas: false - VM.attachnic: false - VM.detachnic: false - VM.snapshot_create: false - VM.snapshot_revert: false - VM.snapshot_delete: false - VM.disk_snapshot_create: false - VM.disk_snapshot_revert: false - VM.disk_snapshot_delete: false + VM.attachdisk: true + VM.detachdisk: true + VM.disk_saveas: true + VM.attachnic: true + VM.detachnic: true + VM.snapshot_create: true + VM.snapshot_revert: true + VM.snapshot_delete: true + VM.disk_snapshot_create: true + VM.disk_snapshot_revert: true + VM.disk_snapshot_delete: true VM.save_as_template: true dashboard: # Connected user's quotas diff --git a/src/sunstone/etc/sunstone-views/mixed/cloud.yaml b/src/sunstone/etc/sunstone-views/mixed/cloud.yaml index a9e244cdd3..59fcdc3683 100644 --- a/src/sunstone/etc/sunstone-views/mixed/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/cloud.yaml @@ -16,7 +16,7 @@ features: # True to hide the CPU setting in the VM creation dialog. The CPU setting # will be set to the same value as VCPU, that will still be visible for the # end users - instantiate_hide_cpu: false + instantiate_hide_cpu: true # False to not scale the CPU. Number [0, 1] to scale from VCPU instantiate_cpu_factor: false @@ -30,12 +30,12 @@ tabs: provision-tab: panel_tabs: vm_info_tab: false - vm_capacity_tab: false - vm_storage_tab: false - vm_network_tab: false - vm_snapshot_tab: false + vm_capacity_tab: true + vm_storage_tab: true + vm_network_tab: true + vm_snapshot_tab: true vm_placement_tab: false - vm_actions_tab: false + vm_actions_tab: true vm_conf_tab: false vm_template_tab: false vm_log_tab: false @@ -61,17 +61,17 @@ tabs: VM.terminate: true VM.terminate_hard: true VM.resize: false - VM.attachdisk: false - VM.detachdisk: false - VM.disk_saveas: false - VM.attachnic: false - VM.detachnic: false - VM.snapshot_create: false - VM.snapshot_revert: false - VM.snapshot_delete: false - VM.disk_snapshot_create: false - VM.disk_snapshot_revert: false - VM.disk_snapshot_delete: false + VM.attachdisk: true + VM.detachdisk: true + VM.disk_saveas: true + VM.attachnic: true + VM.detachnic: true + VM.snapshot_create: true + VM.snapshot_revert: true + VM.snapshot_delete: true + VM.disk_snapshot_create: true + VM.disk_snapshot_revert: true + VM.disk_snapshot_delete: true VM.save_as_template: true dashboard: # Connected user's quotas diff --git a/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml b/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml index 34790b8707..d1351d8270 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml @@ -30,18 +30,19 @@ tabs: provision-tab: panel_tabs: vm_info_tab: false - vm_capacity_tab: false - vm_storage_tab: false - vm_network_tab: false - vm_snapshot_tab: false + vm_capacity_tab: true + vm_storage_tab: true + vm_network_tab: true + vm_snapshot_tab: true vm_placement_tab: false - vm_actions_tab: false + vm_actions_tab: true vm_conf_tab: false vm_template_tab: false vm_log_tab: false provision_tabs: flows: true - templates: false + templates: true + actions: &provisionactions # In the cloud view, delete is the equivalent # of 'onetemplate chmod --recursive' @@ -50,7 +51,7 @@ tabs: # In the cloud view, delete is the equivalent # of 'onetemplate delete --recursive' Template.delete: true - VM.rename: false + VM.rename: true VM.resume: true VM.reboot: true VM.reboot_hard: true @@ -61,17 +62,17 @@ tabs: VM.terminate: true VM.terminate_hard: true VM.resize: false - VM.attachdisk: false - VM.detachdisk: false - VM.disk_saveas: false - VM.attachnic: false - VM.detachnic: false - VM.snapshot_create: false - VM.snapshot_revert: false - VM.snapshot_delete: false - VM.disk_snapshot_create: false - VM.disk_snapshot_revert: false - VM.disk_snapshot_delete: false + VM.attachdisk: true + VM.detachdisk: true + VM.disk_saveas: true + VM.attachnic: true + VM.detachnic: true + VM.snapshot_create: true + VM.snapshot_revert: true + VM.snapshot_delete: true + VM.disk_snapshot_create: true + VM.disk_snapshot_revert: true + VM.disk_snapshot_delete: true VM.save_as_template: true dashboard: # Connected user's quotas @@ -101,10 +102,9 @@ tabs: settings_accounting_tab: true settings_showback_tab: true actions: - # The buttons inside the settings-tab panel settings_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true @@ -113,10 +113,6 @@ tabs: Settings.login_token: true # Edit button in settings_quotas_tab User.quotas_dialog: false - users-tab: - actions: - User.update_password: true - User.login_token: true vms-tab: actions: *provisionactions images-tab: @@ -124,7 +120,7 @@ tabs: - 0 # Checkbox - 1 # ID - 2 # Name - - 3 # Owner + - 3 # Onwer - 4 # Group - 5 # Datastore #- 6 # Size @@ -179,4 +175,4 @@ tabs: #- 10 # Type - 11 # Status #- 12 # Labels - #- 13 # Search data \ No newline at end of file + #- 13 # Search data diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js index 4ad79cc5dc..3c962776e5 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js @@ -213,6 +213,14 @@ define(function(require) { that.listener.notify(); }); } + + if (config["mode"] === "kvm"){ + $("#kvmRadio", context).click(); + $("#template_hypervisor_form", context).hide(); + } else if (config["mode"] === "vcenter"){ + $("#vcenterRadio", context).click(); + $("#template_hypervisor_form", context).hide(); + } } function _retrieve(context) { diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js index 7e14cb7003..b0ec3e59ee 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js @@ -233,6 +233,17 @@ define(function(require) { $("#vnet_wizard_ar_btn", context).trigger("click"); Tips.setup(); + + if (config["mode"] === "kvm"){ + $("#network_mode option[value=\"vcenter\"]", context).hide(); + } else if (config["mode"] === "vcenter"){ + $("#network_mode option[value=\"dummy\"]", context).hide(); + $("#network_mode option[value=\"fw\"]", context).hide(); + $("#network_mode option[value=\"ebtables\"]", context).hide(); + $("#network_mode option[value=\"802.1Q\"]", context).hide(); + $("#network_mode option[value=\"vxlan\"]", context).hide(); + $("#network_mode option[value=\"ovswitch\"]", context).hide(); + } return false; }