From 07c7d2bf9acb25f9befa8b9186e144dd0222442b Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Thu, 21 Jul 2016 11:50:11 +0200 Subject: [PATCH] =?UTF-8?q?Int=C3=A9gration=20de=20la=20nouvelle=20vue=20"?= =?UTF-8?q?admin"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Retour de la vue admin avec les modifications pour ONE 5.0 ref #16790 @40m --- dicos/99_one-frontend.xml | 1 + tmpl/admin.yaml | 777 +++++++++++++++++++++++++------------- 2 files changed, 516 insertions(+), 262 deletions(-) diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml index 72b4049..233864c 100644 --- a/dicos/99_one-frontend.xml +++ b/dicos/99_one-frontend.xml @@ -3,6 +3,7 @@ opennebula-sunstone + diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml index 3802382..a5bf9ae 100644 --- a/tmpl/admin.yaml +++ b/tmpl/admin.yaml @@ -1,68 +1,82 @@ -small_logo: images/opennebula-sunstone-v4.0-small.png -provision_logo: images/one_small_logo.png +small_logo: images/opennebula-5.0.png +provision_logo: images/opennebula-5.0.png enabled_tabs: - dashboard-tab: true - system-tab: true - users-tab: true - groups-tab: true - acls-tab: true - vresources-tab: true - vms-tab: true - templates-tab: true - images-tab: true - files-tab: true - infra-tab: true - clusters-tab: true - hosts-tab: true - datastores-tab: true - vnets-tab: true -%if %%getVar('activer_market_place', 'non') - marketplace-tab: true -%end if -%if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow-dashboard: true - oneflow-services: true - oneflow-templates: true -%else - oneflow-dashboard: false - oneflow-services: false - oneflow-templates: false -%end if -%if %%getVar('activer_market_views', 'non') == 'oui' - apptools-appmarket-dashboard: true - apptools-appmarket-appliances: true -%end if - support-tab: true - doc-tab: true - community-tab: true - enterprise-tab: true - zones-tab: true + - dashboard-tab + - instances-top-tab + - vms-tab + - oneflow-services-tab + - vrouters-tab + - templates-top-tab + - templates-tab + - oneflow-templates-tab + - vrouter-templates-tab + - storage-top-tab + - datastores-tab + - images-tab + - files-tab + - marketplaces-tab + - marketplaceapps-tab + - network-top-tab + - vnets-tab + - vnets-topology-tab + - secgroups-tab + - infrastructure-top-tab + - clusters-tab + - hosts-tab + - zones-tab + - system-top-tab + - users-tab + - groups-tab + - vdcs-tab + - acls-tab + - settings-tab + - support-tab + - upgrade-top-tab autorefresh: true +features: + # True to show showback monthly reports, and VM cost + showback: true + + # Allows to change the security groups for each network interface + # on the VM creation dialog + secgroups: true tabs: dashboard-tab: + # The following widgets can be used inside any of the '_per_row' settings + # bellow. As the name suggest, the widgets will be scaled to fit one, + # two, or three per row. The footer uses the widgets at full size, i.e. + # one per row. + # + # - storage + # - users + # - network + # - hosts + # - vms + # - groupquotas + # - quotas panel_tabs: actions: Dashboard.refresh: false Sunstone.toggle_top: false - widgets_three_per_row: - - storage - - users - - network - widgets_two_per_row: -# - user_quotas -# - group_quotas widgets_one_per_row: - vms - hosts + - users + widgets_three_per_row: + widgets_two_per_row: + - storage + - network widgets_one_footer: -# - accounting - system-tab: + system-top-tab: panel_tabs: actions: users-tab: panel_tabs: user_info_tab: true user_quotas_tab: true + user_groups_tab: true + user_accounting_tab: true + user_showback_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -74,19 +88,25 @@ tabs: - 7 # CPU #- 8 # Group ID #- 9 # Hidden User Data + #- 10 # Labels actions: User.refresh: true User.create_dialog: true User.update_password: true User.quotas_dialog: true + User.groups_dialog: true User.chgrp: true - User.addgroup: true - User.delgroup: true - User.chauth: true + User.change_authentication: true User.delete: true + User.edit_labels: true + User.menu_labels: true groups-tab: panel_tabs: + group_info_tab: true + group_users_tab: true group_quotas_tab: true + group_accounting_tab: true + group_showback_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -95,11 +115,39 @@ tabs: - 4 # VMs - 5 # Memory - 6 # CPU + #- 7 # Labels actions: Group.refresh: true Group.create_dialog: true + Group.update_dialog: true Group.quotas_dialog: true Group.delete: true + Group.edit_admins: true + Group.edit_labels: true + Group.menu_labels: true + vdcs-tab: + panel_tabs: + vdc_info_tab: true + vdc_groups_tab: true + vdc_resources_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Groups + - 4 # Clusters + - 5 # Hosts + - 6 # VNets + - 7 # Datastores + #- 8 # Labels + actions: + Vdc.refresh: true + Vdc.create_dialog: true + Vdc.update_dialog: true + Vdc.rename: true + Vdc.delete: true + Vdc.edit_labels: true + Vdc.menu_labels: true acls-tab: panel_tabs: table_columns: @@ -115,18 +163,125 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + Template.refresh: true + Template.create_dialog: true + Template.import_dialog: false + Template.update_dialog: true + Template.instantiate_vms: true + Template.rename: true + Template.chown: true + Template.chgrp: true + Template.chmod: true + Template.clone_dialog: true + Template.delete_dialog: true + Template.share: true + Template.unshare: true + Template.edit_labels: true + Template.menu_labels: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true +%if %%getVar('activer_oneflow','non') + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + service_template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Labels + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: true + ServiceTemplate.update_dialog: true + ServiceTemplate.instantiate: true + ServiceTemplate.chown: true + ServiceTemplate.chgrp: true + ServiceTemplate.chmod: true + ServiceTemplate.rename: true + ServiceTemplate.clone_dialog: true + ServiceTemplate.delete: true + ServiceTemplate.edit_labels: true + ServiceTemplate.menu_labels: true +%end if + vrouter-templates-tab: + panel_tabs: + vrouter_template_info_tab: true + vrouter_template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + actions: + VirtualRouterTemplate.refresh: true + VirtualRouterTemplate.create_dialog: true + VirtualRouterTemplate.update_dialog: true + VirtualRouterTemplate.rename: true + VirtualRouterTemplate.chown: true + VirtualRouterTemplate.chgrp: true + VirtualRouterTemplate.chmod: true + VirtualRouterTemplate.clone_dialog: true + VirtualRouterTemplate.delete_dialog: true + VirtualRouterTemplate.share: true + VirtualRouterTemplate.unshare: true + VirtualRouterTemplate.edit_labels: true + VirtualRouterTemplate.menu_labels: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + instances-top-tab: panel_tabs: actions: vms-tab: panel_tabs: vm_info_tab: true vm_capacity_tab: true - vm_hotplugging_tab: true + vm_storage_tab: true vm_network_tab: true vm_snapshot_tab: true vm_placement_tab: true vm_actions_tab: true + vm_conf_tab: true vm_template_tab: true vm_log_tab: true table_columns: @@ -142,9 +297,12 @@ tabs: - 9 # IPs #- 10 # Start Time - 11 # VNC + #- 12 # Hidden Template + #- 13 # Labels actions: VM.refresh: true VM.create_dialog: true + VM.rename: true VM.chown: true VM.chgrp: true VM.chmod: true @@ -157,63 +315,227 @@ tabs: VM.resume: true VM.stop: true VM.recover: true - VM.boot: true VM.reboot: true VM.reboot_hard: true VM.poweroff: true VM.poweroff_hard: true VM.undeploy: true VM.undeploy_hard: true - VM.shutdown: true - VM.shutdown_hard: true - VM.delete: true - VM.delete_recreate: true + VM.terminate: true + VM.terminate_hard: true VM.resize: true VM.attachdisk: true VM.detachdisk: true - VM.saveas: 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.resched: true VM.unresched: true - templates-tab: + VM.save_as_template: true + VM.updateconf: true + VM.edit_labels: true + VM.menu_labels: true + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: true + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: true + Role.resume: true + Role.stop: true + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.terminate: true + Role.terminate_hard: true + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: true + RoleVM.resume: true + RoleVM.stop: true + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.terminate: true + RoleVM.terminate_hard: true + RoleVM.resched: true + RoleVM.unresched: true + RoleVM.recover: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time + - 5 # State + #- 6 # Labels actions: - Template.refresh: true - Template.create_dialog: true - Template.update_dialog: true - Template.instantiate_vms: true - Template.chown: true - Template.chgrp: true - Template.chmod: true - Template.clone_dialog: true - Template.delete: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: true - other: true + Service.refresh: true + Service.chown: true + Service.chgrp: true + Service.chmod: true + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + Service.edit_labels: true + Service.menu_labels: true + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: true + VirtualRouter.chmod: true + VirtualRouter.delete: true + VirtualRouter.attachnic: true + VirtualRouter.detachnic: true + VirtualRouter.edit_labels: true + VirtualRouter.menu_labels: true + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores + #- 6 # Labels + actions: + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + Cluster.edit_labels: true + Cluster.menu_labels: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_zombies_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.offline: true + Host.delete: true + Host.edit_labels: true + Host.menu_labels: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + Zone.edit_labels: true + Zone.menu_labels: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: true + datastore_image_tab: true + datastore_clusters_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + - 10 # Type + - 11 # Status + #- 12 # Labels + actions: + Datastore.refresh: true + Datastore.create_dialog: true + Datastore.import_dialog: false + Datastore.addtocluster: true + Datastore.rename: true + Datastore.chown: true + Datastore.chgrp: true + Datastore.chmod: true + Datastore.delete: true + Datastore.enable: true + Datastore.disable: true + Datastore.edit_labels: true + Datastore.menu_labels: true images-tab: panel_tabs: image_info_tab: true image_vms_tab: true + image_snapshots_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -228,9 +550,13 @@ tabs: - 10 # Status - 11 # #VMs #- 12 # Target + #- 13 # Labels actions: Image.refresh: true Image.create_dialog: true + Image.import_dialog: false + Image.upload_marketplace_dialog: true + Image.rename: true Image.chown: true Image.chgrp: true Image.chmod: true @@ -240,6 +566,11 @@ tabs: Image.nonpersistent: true Image.clone_dialog: true Image.delete: true + Image.snapshot_flatten: true + Image.snapshot_revert: true + Image.snapshot_delete: true + Image.edit_labels: true + Image.menu_labels: true files-tab: panel_tabs: file_info_tab: true @@ -257,65 +588,23 @@ tabs: - 10 # Status #- 11 # #VMs #- 12 # Target + #- 13 # Labels actions: File.refresh: true File.create_dialog: true + File.rename: true File.chown: true File.chgrp: true File.chmod: true File.enable: true File.disable: true File.delete: true - infra-tab: + File.edit_labels: true + File.menu_labels: true + marketplaces-tab: panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: true - datastore_image_tab: true + marketplace_info_tab: true + marketplace_apps_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -323,24 +612,64 @@ tabs: - 3 # Group - 4 # Name - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - - 10 # Type + - 6 # Apps + - 7 # Driver + - 8 # Zone + #- 9 # Labels + actions: + MarketPlace.refresh: true + MarketPlace.create_dialog: true + MarketPlace.update_dialog: true + MarketPlace.rename: true + MarketPlace.chown: true + MarketPlace.chgrp: true + MarketPlace.chmod: true + MarketPlace.delete: true + MarketPlace.edit_labels: true + MarketPlace.menu_labels: true + marketplaceapps-tab: + panel_tabs: + marketplaceapp_info_tab: true + marketplaceapp_templates_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Version + - 6 # Size + - 7 # State + #- 8 # Type + - 9 # Registration + - 10 # Marketplace + - 11 # Zone + #- 12 # Labels + actions: + MarketPlaceApp.refresh: true + MarketPlaceApp.create_dialog: true + MarketPlaceApp.download_opennebula_dialog: true + MarketPlaceApp.download_local: true + MarketPlaceApp.rename: true + MarketPlaceApp.chown: true + MarketPlaceApp.chgrp: true + MarketPlaceApp.chmod: true + MarketPlaceApp.enable: true + MarketPlaceApp.disable: true + MarketPlaceApp.delete: true + MarketPlaceApp.edit_labels: true + MarketPlaceApp.menu_labels: true + network-top-tab: + panel_tabs: actions: - Datastore.refresh: true - Datastore.create_dialog: true - Datastore.addtocluster: true - Datastore.chown: true - Datastore.chgrp: true - Datastore.chmod: true - Datastore.delete: true vnets-tab: panel_tabs: vnet_info_tab: true vnet_ar_list_tab: true vnet_leases_tab: true + vnet_sg_list_tab: true + vnet_vr_list_tab: true + vnet_clusters_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -352,10 +681,15 @@ tabs: #- 7 # Bridge - 8 # Leases #- 9 # VLAN ID + #- 10 # Labels actions: Network.refresh: true Network.create_dialog: true + Network.import_dialog: false + Network.update_dialog: true + Network.reserve_dialog: true Network.addtocluster: true + Network.rename: true Network.chown: true Network.chgrp: true Network.chmod: true @@ -365,141 +699,60 @@ tabs: Network.add_ar: true Network.remove_ar: true Network.update_ar: true - marketplace-tab: + Network.edit_labels: true + Network.menu_labels: true + vnets-topology-tab: panel_tabs: - marketplace_info_tab: true - table_columns: - - 0 # Checkbox - #- 1 # ID - - 2 # Name - - 3 # Publisher - - 4 # Hypervisor - - 5 # Arch - - 6 # Format - #- 7 # Tags actions: - Marketplace.refresh: true - Marketplace.import: true -%if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow-dashboard: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: panel_tabs: - table_columns: - actions: - oneflow-services: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: true - Role.resume: true - Role.stop: true - Role.boot: true - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: true - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: true - RoleVM.resume: true - RoleVM.stop: true - RoleVM.boot: true - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: true - RoleVM.resched: true - RoleVM.unresched: true - RoleVM.recover: true + security_group_info_tab: true + security_group_vms_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # State + #- 5 # Labels actions: - Service.refresh: true - Service.chown: true - Service.chgrp: true - Service.chmod: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: true + SecurityGroup.update_dialog: true + SecurityGroup.rename: true + SecurityGroup.chown: true + SecurityGroup.chgrp: true + SecurityGroup.chmod: true + SecurityGroup.clone_dialog: true + SecurityGroup.commit_dialog: true + SecurityGroup.delete: true + SecurityGroup.edit_labels: true + SecurityGroup.menu_labels: true + support-tab: panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true + support_info_tab: true table_columns: - - 0 # Checkbox + #- 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Subject + - 3 # Created at + - 4 # Status actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: true - ServiceTemplate.chgrp: true - ServiceTemplate.chmod: true - ServiceTemplate.delete: true -%end if - zones-tab: + Support.refresh: true + Support.create_dialog: true + settings-tab: panel_tabs: - zone_info_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Endpoint + user_info_tab: true + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true actions: - Zone.refresh: true - Zone.create_dialog: true - Zone.delete: true -%if %%getVar('activer_market_views', 'non') == 'oui' - apptools-appmarket-dashboard: + User.quotas_dialog: false + upgrade-top-tab: panel_tabs: - table_columns: actions: - apptools-appmarket-appliances: - panel_tabs: - appmarketplace_info_tab: true - appmarketplace_jobs_tab: true - appmarketplace_template_tab: true - panel_tabs_actions: - appmarketplace_jobs_tab: - Job.del: true - table_columns: - - 0 # Checkbox - #- 1 # ID - - 2 # Name - - 3 # Status - - 4 # Publisher - - 5 # Hypervisor - - 6 # Arch - - 7 # Format - #- 8 # Tags - - 9 # Created - actions: - AppMarket.refresh: true - AppMarket.import: true - AppMarket.delete: true - AppMarket.convert: true - AppMarket.create_dialog: true -%end if