diff --git a/src/fireedge/etc/sunstone/admin/service-tab.yaml b/src/fireedge/etc/sunstone/admin/service-tab.yaml index 0fe91c3e1a..5b249a1788 100644 --- a/src/fireedge/etc/sunstone/admin/service-tab.yaml +++ b/src/fireedge/etc/sunstone/admin/service-tab.yaml @@ -8,7 +8,7 @@ resource_name: "SERVICE" # Actions - Which buttons are visible to operate over the resources actions: - create_dialog: true # reference to deploy_dialog in service-template-tab.yaml + instantiate_dialog: true # reference to deploy_dialog in service-template-tab.yaml recover: true recover_delete: true delete: true diff --git a/src/fireedge/etc/sunstone/groupadmin/file-tab.yaml b/src/fireedge/etc/sunstone/cloud/marketplace-tab.yaml similarity index 87% rename from src/fireedge/etc/sunstone/groupadmin/file-tab.yaml rename to src/fireedge/etc/sunstone/cloud/marketplace-tab.yaml index 9e0f1449c7..509a8dc654 100644 --- a/src/fireedge/etc/sunstone/groupadmin/file-tab.yaml +++ b/src/fireedge/etc/sunstone/cloud/marketplace-tab.yaml @@ -1,27 +1,25 @@ --- -# This file describes the information and actions available in the FILE tab +# This file describes the information and actions available in the MARKETPLACE tab # Resource -resource_name: "FILE" +resource_name: "MARKETPLACE" # Actions - Which buttons are visible to operate over the resources actions: create_dialog: true - import_dialog: true - disable: true - enable: true + update_dialog: true chown: true chgrp: true delete: true + disable: true + enable: true # Filters - List of criteria to filter the resources filters: label: true - state: true - # Info Tabs - Which info tabs are used to show extended information @@ -47,4 +45,7 @@ info-tabs: copy: true add: true edit: true - delete: true \ No newline at end of file + delete: true + + apps: + enabled: true diff --git a/src/fireedge/etc/sunstone/cloud/service-tab.yaml b/src/fireedge/etc/sunstone/cloud/service-tab.yaml new file mode 100644 index 0000000000..8345ba0796 --- /dev/null +++ b/src/fireedge/etc/sunstone/cloud/service-tab.yaml @@ -0,0 +1,68 @@ +--- +# This file describes the information and actions available in the Service tab + +# Resource + +resource_name: "SERVICE" + +# Actions - Which buttons are visible to operate over the resources + +actions: + instantiate_dialog: true # reference to deploy_dialog in service-template-tab.yaml + create_dialog: true + recover: true + recover_delete: true + delete: true + chown: false + chgrp: false + share: false + unshare: false + edit_labels: false + +# Filters - List of criteria to filter the resources + +filters: + label: true + state: true + owner: true + group: true + + +# Info Tabs - Which info tabs are used to show extended information + +info-tabs: + + info: + enabled: true + information_panel: + enabled: true + actions: + rename: false + permissions_panel: + enabled: true + actions: + chmod: false + ownership_panel: + enabled: true + actions: + chown: false + chgrp: false + + roles: + enabled: true + + log: + enabled: true + + scheduler_actions: + enabled: false + actions: + sched_action_create: false + sched_action_update: false + sched_action_delete: false + charter_create: false + +# Dialogs + +dialogs: + # update_dialog: diff --git a/src/fireedge/etc/sunstone/cloud/user-tab.yaml b/src/fireedge/etc/sunstone/cloud/user-tab.yaml new file mode 100644 index 0000000000..bff0310062 --- /dev/null +++ b/src/fireedge/etc/sunstone/cloud/user-tab.yaml @@ -0,0 +1,70 @@ +--- +# This file describes the information and actions available in the USER tab + +# Resource + +resource_name: "USER" + +# Actions - Which buttons are visible to operate over the resources + +actions: + create_dialog: false + chgrp: false + delete: false + enable: false + disable: false + +# Filters - List of criteria to filter the resources + +filters: + label: false + state: false + +# Info Tabs - Which info tabs are used to show extended information + +info-tabs: + + info: + enabled: true + information_panel: + enabled: true + actions: + rename: false + attributes_panel: + enabled: true + actions: + copy: false + add: false + edit: false + delete: false + + group: + enabled: false + actions: + chgrp: false + + quota: + enabled: true + actions: + quotas_dialog: true + + accounting: + enabled: true + actions: + get_accounting: true + + showback: + enabled: true + actions: + get_showback: true + + authentication: + enabled: false + actions: + change_authentication: false + update_password: false + login_token: false + two_factor_auth: false + public_ssh_key: false + private_ssh_key: false + private_ssh_key_passphrase: false \ No newline at end of file diff --git a/src/fireedge/etc/sunstone/cloud/vm-tab.yaml b/src/fireedge/etc/sunstone/cloud/vm-tab.yaml index ea5ecc8022..0a1bbec383 100644 --- a/src/fireedge/etc/sunstone/cloud/vm-tab.yaml +++ b/src/fireedge/etc/sunstone/cloud/vm-tab.yaml @@ -11,35 +11,35 @@ actions: create_dialog: true create_app_dialog: true # reference to create_dialog in marketplace-app-tab.yaml deploy: false - migrate: true - migrate_live: true - hold: true - release: true - suspend: true + migrate: false + migrate_live: false + hold: false + release: false + suspend: false resume: true - stop: true - recover: true + stop: false + recover: false reboot: true reboot-hard: true poweroff: true poweroff-hard: true - undeploy: true - undeploy-hard: true + undeploy: false + undeploy-hard: false terminate: true terminate-hard: true - resched: true - unresched: true - save_as_template: false + resched: false + unresched: false + save_as_template: true chown: false chgrp: false - lock: true - unlock: true + lock: false + unlock: false vmrc: true vnc: true ssh: true rdp: true edit_labels: false - backup: true + backup: false # Filters - List of criteria to filter the resources @@ -63,7 +63,7 @@ info-tabs: information_panel: enabled: true actions: - rename: true + rename: false permissions_panel: enabled: true actions: @@ -77,19 +77,12 @@ info-tabs: enabled: true actions: resize_capacity: true - lxc_panel: - enabled: true - actions: - copy: true - add: false - edit: false - delete: false monitoring_panel: enabled: true actions: copy: true attributes_panel: - enabled: true + enabled: false actions: copy: true add: true @@ -127,10 +120,10 @@ info-tabs: snapshot-delete: true backup: - enabled: true + enabled: false history: - enabled: true + enabled: false sched_actions: enabled: true @@ -141,9 +134,9 @@ info-tabs: charter_create: true configuration: - enabled: true + enabled: false actions: - update_configuration: true + update_configuration: false template: - enabled: true + enabled: false diff --git a/src/fireedge/etc/sunstone/groupadmin/sec-group-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/sec-group-tab.yaml index 28d57f944f..32152e136b 100644 --- a/src/fireedge/etc/sunstone/groupadmin/sec-group-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/sec-group-tab.yaml @@ -8,13 +8,13 @@ resource_name: "SECURITY-GROUP" # Actions - Which buttons are visible to operate over the resources actions: - create_dialog: true - update_dialog: true - clone: true - commit: true - chown: true - chgrp: true - delete: true + create_dialog: false + update_dialog: false + clone: false + commit: false + chown: false + chgrp: false + delete: false # Filters - List of criteria to filter the resources @@ -29,16 +29,16 @@ info-tabs: information_panel: enabled: true actions: - rename: true + rename: false permissions_panel: enabled: true actions: - chmod: true + chmod: false ownership_panel: enabled: true actions: - chown: true - chgrp: true + chown: false + chgrp: false rules_panel: enabled: true attributes_panel: diff --git a/src/fireedge/etc/sunstone/groupadmin/service-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/service-tab.yaml new file mode 100644 index 0000000000..69a6c4f5fb --- /dev/null +++ b/src/fireedge/etc/sunstone/groupadmin/service-tab.yaml @@ -0,0 +1,68 @@ +--- +# This file describes the information and actions available in the Service tab + +# Resource + +resource_name: "SERVICE" + +# Actions - Which buttons are visible to operate over the resources + +actions: + instantiate_dialog: true # reference to deploy_dialog in service-template-tab.yaml + create_dialog: true + recover: true + recover_delete: true + delete: true + chown: true + chgrp: true + share: true + unshare: true + edit_labels: true + +# Filters - List of criteria to filter the resources + +filters: + label: true + state: true + owner: true + group: true + + +# Info Tabs - Which info tabs are used to show extended information + +info-tabs: + + info: + enabled: true + information_panel: + enabled: true + actions: + rename: true + permissions_panel: + enabled: true + actions: + chmod: true + ownership_panel: + enabled: true + actions: + chown: true + chgrp: true + + roles: + enabled: true + + log: + enabled: true + + scheduler_actions: + enabled: true + actions: + sched_action_create: true + sched_action_update: true + sched_action_delete: true + charter_create: true + +# Dialogs + +dialogs: + # update_dialog: diff --git a/src/fireedge/etc/sunstone/groupadmin/service-template-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/service-template-tab.yaml new file mode 100644 index 0000000000..f25733ed29 --- /dev/null +++ b/src/fireedge/etc/sunstone/groupadmin/service-template-tab.yaml @@ -0,0 +1,63 @@ +--- +# This file describes the information and actions available in the Service Template tab + +# Resource + +resource_name: "SERVICE-TEMPLATE" + +# Actions - Which buttons are visible to operate over the resources + +actions: + create_dialog: false + instantiate_dialog: true + update_dialog: false + deploy_dialog: true + create_app_dialog: true # reference to create_dialog in marketplace-app-tab.yaml + clone: false + delete: false + chown: false + recover: false + chgrp: false + share: false + unshare: false + edit_labels: false + +# Filters - List of criteria to filter the resources + +filters: + label: true + owner: true + group: true + + +# Info Tabs - Which info tabs are used to show extended information + +info-tabs: + + info: + enabled: true + information_panel: + enabled: true + actions: + rename: false + permissions_panel: + enabled: true + actions: + chmod: false + ownership_panel: + enabled: true + actions: + chown: false + chgrp: false + + roles: + enabled: true + + template: + enabled: true + +# Dialogs + +dialogs: + deploy_dialog: + create_dialog: diff --git a/src/fireedge/etc/sunstone/groupadmin/backup-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/vm-group-tab.yaml similarity index 60% rename from src/fireedge/etc/sunstone/groupadmin/backup-tab.yaml rename to src/fireedge/etc/sunstone/groupadmin/vm-group-tab.yaml index d36f697b9a..2a8460d4a0 100644 --- a/src/fireedge/etc/sunstone/groupadmin/backup-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/vm-group-tab.yaml @@ -1,24 +1,29 @@ --- -# This file describes the information and actions available in the IMAGE tab +# This file describe the information add actions available in the VM GROUP TEMPLATES tab # Resource -resource_name: "BACKUP" +resource_name: "VM-GROUP" -# Actions - Which buttons are visible to operate over the resources +# Actions - Which buttons are visible to operate over the resource -actions: - restore: true - chown: true +actions: + create_dialog: true + update_dialog: true + enable: true + disable: true chgrp: true + chown: true delete: true -# Filters - List of criteria to filter the resources +# Filters - List of criteria to filter the resource -filters: +filters: label: true state: true + + # Info Tabs - Which info tabs are used to show extended information info-tabs: @@ -36,15 +41,11 @@ info-tabs: enabled: true actions: chown: true - chgrp: true - attributes_panel: + cgrp: true + roles_panel: + enabled: true + roles-affinity_panel: enabled: true - actions: - copy: true - add: true - edit: true - delete: true vms: enabled: true - increments: - enabled: true + diff --git a/src/fireedge/etc/sunstone/groupadmin/vm-template-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/vm-template-tab.yaml index 4c3d28b7cf..a9b0d83be7 100644 --- a/src/fireedge/etc/sunstone/groupadmin/vm-template-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/vm-template-tab.yaml @@ -20,14 +20,14 @@ features: # Actions - Which buttons are visible to operate over the resources actions: - create_dialog: true + create_dialog: false import_dialog: false update_dialog: true instantiate_dialog: true create_app_dialog: false # reference to create_dialog in marketplace-app-tab.yaml clone: true delete: true - chown: false + chown: true chgrp: false lock: true unlock: true diff --git a/src/fireedge/etc/sunstone/groupadmin/vnet-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/vnet-tab.yaml index 2b12a2327b..069812a69d 100644 --- a/src/fireedge/etc/sunstone/groupadmin/vnet-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/vnet-tab.yaml @@ -12,13 +12,13 @@ actions: import_dialog: false instantiate_dialog: true reserve_dialog: true - update_dialog: true + update_dialog: false change_cluster: false chown: false chgrp: false lock: true unlock: true - delete: true + delete: false # Filters - List of criteria to filter the resources @@ -38,11 +38,11 @@ info-tabs: information_panel: enabled: true actions: - rename: true + rename: false permissions_panel: enabled: true actions: - chmod: true + chmod: false ownership_panel: enabled: true actions: @@ -53,29 +53,29 @@ info-tabs: attributes_panel: enabled: true actions: - copy: true - add: true - edit: true - delete: true + copy: false + add: false + edit: false + delete: false address: enabled: true actions: add_ar: false - update_ar: true - delete_ar: true + update_ar: false + delete_ar: false lease: enabled: true actions: - hold_lease: true - release_lease: true + hold_lease: false + release_lease: false security: enabled: true actions: - add_secgroup: true - delete_secgroup: true + add_secgroup: false + delete_secgroup: false virtual_router: enabled: true diff --git a/src/fireedge/etc/sunstone/groupadmin/image-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/vnet-template-tab.yaml similarity index 72% rename from src/fireedge/etc/sunstone/groupadmin/image-tab.yaml rename to src/fireedge/etc/sunstone/groupadmin/vnet-template-tab.yaml index 535d7541d7..178d6f32f2 100644 --- a/src/fireedge/etc/sunstone/groupadmin/image-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/vnet-template-tab.yaml @@ -1,32 +1,26 @@ --- -# This file describes the information and actions available in the IMAGE tab +# This file describes the information and actions available in the V. NETWORK TEMPLATE tab # Resource -resource_name: "IMAGE" +resource_name: "NETWORK-TEMPLATE" # Actions - Which buttons are visible to operate over the resources actions: - create_dialog: true - import_dialog: true - clone: true - lock: true - unlock: true - disable: true - enable: true - persistent: true - nonpersistent: true + create_dialog: false + instantiate_dialog: true + update_dialog: true + delete: true chown: true chgrp: true - delete: true + lock: true + unlock: true # Filters - List of criteria to filter the resources filters: label: true - state: true - # Info Tabs - Which info tabs are used to show extended information @@ -46,6 +40,8 @@ info-tabs: actions: chown: true chgrp: true + qos_panel: + enabled: true attributes_panel: enabled: true actions: @@ -53,11 +49,19 @@ info-tabs: add: true edit: true delete: true - vms: - enabled: true - snapshot: + + address: enabled: true actions: - snapshot_flatten: true - snapshot_revert: true - snapshot_delete: true \ No newline at end of file + add_ar: true + update_ar: true + delete_ar: true + + security: + enabled: true + + cluster: + enabled: true + + template: + enabled: true diff --git a/src/fireedge/etc/sunstone/groupadmin/marketplace-app-tab.yaml b/src/fireedge/etc/sunstone/groupadmin/vrouter-template-tab.yaml similarity index 63% rename from src/fireedge/etc/sunstone/groupadmin/marketplace-app-tab.yaml rename to src/fireedge/etc/sunstone/groupadmin/vrouter-template-tab.yaml index cb989da1f9..7319540837 100644 --- a/src/fireedge/etc/sunstone/groupadmin/marketplace-app-tab.yaml +++ b/src/fireedge/etc/sunstone/groupadmin/vrouter-template-tab.yaml @@ -1,22 +1,27 @@ --- -# This file describes the information and actions available in the App tab +# This file describes the information and actions available in the VRouter Template tab # Resource -resource_name: "MARKETPLACE-APP" +resource_name: "VROUTER-TEMPLATE" # Actions - Which buttons are visible to operate over the resources actions: - create_dialog: true - export: true - download: true - chown: true - chgrp: true - enable: true - disable: true + create_dialog: false + instantiate_dialog: true + update_dialog: false + deploy_dialog: true + clone: true delete: true - edit_labels: true + chown: true + recover: false + chgrp: false + lock: false + unlock: false + share: true + unshare: true + edit_labels: false # Filters - List of criteria to filter the resources @@ -24,10 +29,7 @@ filters: label: true owner: true group: true - state: true - type: true - marketplace: true - zone: true + # Info Tabs - Which info tabs are used to show extended information @@ -47,14 +49,16 @@ info-tabs: enabled: true actions: chown: true - chgrp: true - attributes_panel: - enabled: true - actions: - copy: true - add: true - edit: true - delete: true + chgrp: false + + roles: + enabled: true template: enabled: true + +# Dialogs + +dialogs: + deploy_dialog: + create_dialog: diff --git a/src/fireedge/src/client/apps/sunstone/routesOne.js b/src/fireedge/src/client/apps/sunstone/routesOne.js index 61f851ea3b..d6f51fb76d 100644 --- a/src/fireedge/src/client/apps/sunstone/routesOne.js +++ b/src/fireedge/src/client/apps/sunstone/routesOne.js @@ -346,6 +346,7 @@ export const PATH = { SERVICES: { LIST: `/${RESOURCE_NAMES.SERVICE}`, DETAIL: `/${RESOURCE_NAMES.SERVICE}/:id`, + INSTANTIATE: `/${RESOURCE_NAMES.SERVICE}/instantiate/`, }, }, TEMPLATE: { @@ -353,6 +354,7 @@ export const PATH = { LIST: `/${RESOURCE_NAMES.VM_TEMPLATE}`, INSTANTIATE: `/${RESOURCE_NAMES.VM_TEMPLATE}/instantiate`, CREATE: `/${RESOURCE_NAMES.VM_TEMPLATE}/create`, + UPDATE: `/${RESOURCE_NAMES.VM_TEMPLATE}/update`, DETAIL: `/${RESOURCE_NAMES.VM_TEMPLATE}/:id`, }, VMGROUP: { @@ -515,6 +517,13 @@ const ENDPOINTS = [ icon: ServicesIcon, Component: Services, }, + { + title: T.InstantiateServiceTemplate, + description: (_, state) => + state?.ID !== undefined && `#${state.ID} ${state.NAME}`, + path: PATH.INSTANCE.SERVICES.INSTANTIATE, + Component: InstantiateServiceTemplate, + }, { title: T.Service, description: (params) => `#${params?.id}`, @@ -549,6 +558,14 @@ const ENDPOINTS = [ path: PATH.TEMPLATE.VMS.CREATE, Component: CreateVmTemplate, }, + { + title: (_, state) => + state?.ID !== undefined ? T.UpdateVmTemplate : T.CreateVmTemplate, + description: (_, state) => + state?.ID !== undefined && `#${state.ID} ${state.NAME}`, + path: PATH.TEMPLATE.VMS.UPDATE, + Component: CreateVmTemplate, + }, { title: T.VMTemplate, description: (params) => `#${params?.id}`, diff --git a/src/fireedge/src/client/components/Tables/Services/actions.js b/src/fireedge/src/client/components/Tables/Services/actions.js index 31e474e357..a41b25fd58 100644 --- a/src/fireedge/src/client/components/Tables/Services/actions.js +++ b/src/fireedge/src/client/components/Tables/Services/actions.js @@ -88,7 +88,7 @@ const Actions = () => { filters: getResourceView(RESOURCE_NAMES.SERVICE_TEMPLATE)?.actions, actions: [ { - accessor: SERVICE_TEMPLATE_ACTIONS.CREATE_DIALOG, + accessor: SERVICE_TEMPLATE_ACTIONS.INSTANTIATE_DIALOG, tooltip: T.Create, icon: AddCircledOutline, options: [ @@ -100,7 +100,7 @@ const Actions = () => { const classes = useTableStyles() const redirectToInstantiate = (template) => - history.push(PATH.TEMPLATE.SERVICES.INSTANTIATE, template) + history.push(PATH.INSTANCE.SERVICES.INSTANTIATE, template) return ( { color: 'secondary', action: (rows) => { const vmTemplate = rows?.[0]?.original ?? {} - const path = PATH.TEMPLATE.VMS.CREATE + const path = PATH.TEMPLATE.VMS.UPDATE history.push(path, vmTemplate) },