diff --git a/src/fireedge/src/client/components/Tabs/Vm/Placement/index.js b/src/fireedge/src/client/components/Tabs/Vm/History/index.js
similarity index 89%
rename from src/fireedge/src/client/components/Tabs/Vm/Placement/index.js
rename to src/fireedge/src/client/components/Tabs/Vm/History/index.js
index 71ea533e56..285a74801b 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Placement/index.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/History/index.js
@@ -18,12 +18,12 @@ import { useContext, useMemo } from 'react'
import PropTypes from 'prop-types'
import { TabContext } from 'client/components/Tabs/TabProvider'
-import HistoryList from 'client/components/Tabs/Vm/Placement/List'
+import HistoryList from 'client/components/Tabs/Vm/History/List'
import { getHypervisor, getHistoryRecords, isAvailableAction } from 'client/models/VirtualMachine'
import { getActionsAvailable } from 'client/models/Helper'
-const VmPlacementTab = ({ tabProps: { actions } = {} }) => {
+const VmHistoryTab = ({ tabProps: { actions } = {} }) => {
const { data: vm } = useContext(TabContext)
const [records, actionsAvailable] = useMemo(() => {
@@ -40,10 +40,10 @@ const VmPlacementTab = ({ tabProps: { actions } = {} }) => {
)
}
-VmPlacementTab.propTypes = {
+VmHistoryTab.propTypes = {
tabProps: PropTypes.object
}
-VmPlacementTab.displayName = 'VmPlacementTab'
+VmHistoryTab.displayName = 'VmHistoryTab'
-export default VmPlacementTab
+export default VmHistoryTab
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Info/index.js b/src/fireedge/src/client/components/Tabs/Vm/Info/index.js
index 6e654321bb..ac6edaadc9 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Info/index.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Info/index.js
@@ -24,7 +24,7 @@ import Information from 'client/components/Tabs/Vm/Info/information'
import { Tr } from 'client/components/HOC'
import { T } from 'client/constants'
-import { getHypervisor, isAvailableAction } from 'client/models/VirtualMachine'
+import { getHypervisor } from 'client/models/VirtualMachine'
import { getActionsAvailable, filterAttributes, jsonToXml } from 'client/models/Helper'
import { cloneObject, set } from 'client/utils'
@@ -76,14 +76,10 @@ const VmInfoTab = ({ tabProps = {} }) => {
String(response) === String(ID) && (await handleRefetch?.())
}
- const getActions = useCallback(actions => {
- const hypervisor = getHypervisor(vm)
- const actionsByHypervisor = getActionsAvailable(actions, hypervisor)
- const actionsByState = actionsByHypervisor
- .filter(action => !isAvailableAction(action)(vm))
-
- return actionsByState
- }, [vm])
+ const getActions = useCallback(
+ actions => getActionsAvailable(actions, getHypervisor(vm)),
+ [vm]
+ )
const {
attributes,
@@ -172,6 +168,7 @@ const VmInfoTab = ({ tabProps = {} }) => {
)}
{monitoringPanel?.enabled && monitoringAttributes && (
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Network/Item.js b/src/fireedge/src/client/components/Tabs/Vm/Network/Item.js
index 10d334b293..3a3678a7e2 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Network/Item.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Network/Item.js
@@ -17,16 +17,13 @@
import { useMemo, useContext } from 'react'
import PropTypes from 'prop-types'
-import { Trash } from 'iconoir-react'
-import {
- Typography,
- Accordion,
- AccordionSummary as MAccordionSummary,
- AccordionDetails,
- useMediaQuery,
- Paper
-} from '@mui/material'
-import { withStyles, makeStyles } from '@mui/styles'
+import { styled, useMediaQuery } from '@mui/material'
+import Typography from '@mui/material/Typography'
+import Paper from '@mui/material/Paper'
+import MAccordion from '@mui/material/Accordion'
+import AccordionDetails from '@mui/material/AccordionDetails'
+import AccordionSummary, { accordionSummaryClasses } from '@mui/material/AccordionSummary'
+import { Trash as TrashIcon, NavArrowRight as ExpandIcon } from 'iconoir-react'
import { useVmApi } from 'client/features/One'
import { useDialog } from 'client/hooks'
@@ -38,63 +35,62 @@ import MultipleTags from 'client/components/MultipleTags'
import { Translate } from 'client/components/HOC'
import { T, VM_ACTIONS } from 'client/constants'
-const AccordionSummary = withStyles({
- root: {
- backgroundColor: 'rgba(0, 0, 0, .03)',
- borderBottom: '1px solid rgba(0, 0, 0, .125)',
- marginBottom: -1,
- minHeight: 56,
- '&:hover': {
- backgroundColor: 'rgba(0, 0, 0, .07)'
- },
- '&$expanded': {
- backgroundColor: 'rgba(0, 0, 0, .07)',
- minHeight: 56
- }
- },
- content: {
- overflow: 'hidden',
- '&$expanded': {
- margin: '12px 0'
- }
- },
- expanded: {}
-})(MAccordionSummary)
+const Accordion = styled(props => (
+
+))(({ theme }) => ({
+ border: `1px solid ${theme.palette.divider}`,
+ '&:before': { display: 'none' }
+}))
-const useStyles = makeStyles(({
- row: {
- width: '100%',
- display: 'flex',
- alignItems: 'center',
- flexWrap: 'nowrap'
+const Summary = styled(props => (
+
} {...props} />
+))(({
+ [`&.${accordionSummaryClasses.root}`]: {
+ backgroundColor: 'rgba(0, 0, 0, .03)',
+ flexDirection: 'row-reverse',
+ '&:hover': { backgroundColor: 'rgba(0, 0, 0, .07)' }
},
- labels: {
- display: 'inline-flex',
- gap: '0.5em',
- alignItems: 'center'
- },
- details: {
- marginLeft: '1em',
- flexDirection: 'column',
- gap: '0.5em'
- },
- securityGroups: {
- display: 'flex',
- flexDirection: 'column',
- gap: '0.5em',
- padding: '0.8em'
+ [`& .${accordionSummaryClasses.expandIconWrapper}.${accordionSummaryClasses.expanded}`]: {
+ transform: 'rotate(90deg)'
}
}))
+const Row = styled('div')({
+ display: 'flex',
+ width: '100%',
+ gap: '0.5em',
+ alignItems: 'center',
+ flexWrap: 'nowrap'
+})
+
+const Labels = styled('span')({
+ display: 'inline-flex',
+ gap: '0.5em',
+ alignItems: 'center'
+})
+
+const Details = styled(AccordionDetails)({
+ display: 'flex',
+ flexDirection: 'column',
+ gap: '0.5em',
+ marginLeft: '1em'
+})
+
+const SecGroups = styled(Paper)({
+ display: 'flex',
+ flexDirection: 'column',
+ gap: '0.5em',
+ padding: '0.8em'
+})
+
const NetworkItem = ({ nic = {}, actions }) => {
- const classes = useStyles()
const isMobile = useMediaQuery(theme => theme.breakpoints.down('md'))
const { display, show, hide, values } = useDialog()
const { detachNic } = useVmApi()
const { handleRefetch, data: vm } = useContext(TabContext)
- const { NIC_ID, NETWORK = '-', BRIDGE, IP, MAC, PCI_ID, ALIAS, SECURITY_GROUPS } = nic
+ const { NIC_ID, NETWORK = '-', IP, MAC, PCI_ID, ALIAS, SECURITY_GROUPS } = nic
const hasDetails = useMemo(
() => !!ALIAS.length || !!SECURITY_GROUPS?.length,
@@ -112,7 +108,7 @@ const NetworkItem = ({ nic = {}, actions }) => {
actions?.includes?.(VM_ACTIONS.DETACH_NIC) && (
}
+ icon={
}
stopPropagation
handleClick={() => show({ id, isAlias })}
/>
@@ -120,50 +116,52 @@ const NetworkItem = ({ nic = {}, actions }) => {
return (
<>
-
-
-
+
+
+
{`${NIC_ID} | ${NETWORK}`}
-
+
-
+
{!isMobile && detachAction(NIC_ID)}
-
{ALIAS?.map(({ NIC_ID, NETWORK = '-', BRIDGE, IP, MAC }) => (
-
+
{`${NIC_ID} | ${NETWORK}`}
-
+
-
+
{!isMobile && detachAction(NIC_ID, true)}
-
+
))}
{!!SECURITY_GROUPS?.length && (
-
+
{SECURITY_GROUPS
?.map(({ ID, NAME, PROTOCOL, RULE_TYPE, ICMP_TYPE, RANGE, NETWORK_ID }, idx) => (
-
+
{`${ID} | ${NAME}`}
-
+
{
ICMP_TYPE
].filter(Boolean)}
/>
-
-
+
+
))}
-
+
)}
-
+
)}
@@ -193,9 +191,9 @@ const NetworkItem = ({ nic = {}, actions }) => {
handleAccept={handleDetach}
handleCancel={hide}
>
-
+
-
+
)}
diff --git a/src/fireedge/src/client/components/Tabs/Vm/index.js b/src/fireedge/src/client/components/Tabs/Vm/index.js
index 6bb8a8e7e7..ce95ff5294 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/index.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/index.js
@@ -31,7 +31,7 @@ import Configuration from 'client/components/Tabs/Vm/Configuration'
import Info from 'client/components/Tabs/Vm/Info'
import Log from 'client/components/Tabs/Vm/Log'
import Network from 'client/components/Tabs/Vm/Network'
-import Placement from 'client/components/Tabs/Vm/Placement'
+import History from 'client/components/Tabs/Vm/History'
import SchedActions from 'client/components/Tabs/Vm/SchedActions'
import Snapshot from 'client/components/Tabs/Vm/Snapshot'
import Storage from 'client/components/Tabs/Vm/Storage'
@@ -42,7 +42,7 @@ const getTabComponent = tabName => ({
info: Info,
log: Log,
network: Network,
- placement: Placement,
+ history: History,
schedActions: SchedActions,
snapshot: Snapshot,
storage: Storage
diff --git a/src/fireedge/src/client/components/Tabs/index.js b/src/fireedge/src/client/components/Tabs/index.js
index 6979c02c8e..3d35ed8058 100644
--- a/src/fireedge/src/client/components/Tabs/index.js
+++ b/src/fireedge/src/client/components/Tabs/index.js
@@ -13,14 +13,17 @@
* See the License for the specific language governing permissions and *
* limitations under the License. *
* ------------------------------------------------------------------------- */
-/* eslint-disable jsdoc/require-jsdoc */
-import { useState, useMemo } from 'react'
+import { useState, useMemo, JSXElementConstructor } from 'react'
import PropTypes from 'prop-types'
-import { Tabs as MTabs, Tab as MTab, Fade } from '@mui/material'
-import { Box } from '@mui/system'
+import { styled, Tabs as MTabs, TabsProps, Tab as MTab, Box, Fade } from '@mui/material'
+import { WarningCircledOutline } from 'iconoir-react'
-const Content = ({ name, renderContent: Content, hidden }) => (
+const WarningIcon = styled(WarningCircledOutline)(({ theme }) => ({
+ color: theme.palette.error.main
+}))
+
+const Content = ({ name, renderContent: RenderContent, hidden }) => (
(
display: hidden ? 'none' : 'block'
}}
>
- {typeof Content === 'function' ? : Content}
+ {typeof RenderContent === 'function'
+ ?
+ : RenderContent}
)
-const Tabs = ({ tabs = [], renderHiddenTabs = false }) => {
+/**
+ * @param {object} props - Props
+ * @param {Array} props.tabs - Tabs
+ * @param {TabsProps} props.tabsProps - Props to tabs component
+ * @param {boolean} props.renderHiddenTabs - If `true`, will be render hidden tabs
+ * @returns {JSXElementConstructor} Tabs component with content
+ */
+const Tabs = ({
+ tabs = [],
+ tabsProps: { sx, ...tabsProps } = {},
+ renderHiddenTabs = false
+}) => {
const [tabSelected, setTab] = useState(() => 0)
const renderTabs = useMemo(() => (
@@ -43,18 +59,26 @@ const Tabs = ({ tabs = [], renderHiddenTabs = false }) => {
variant='scrollable'
scrollButtons='auto'
onChange={(_, tab) => setTab(tab)}
+ sx={{
+ position: 'sticky',
+ top: 0,
+ zIndex: theme => theme.zIndex.appBar,
+ ...sx
+ }}
+ {...tabsProps}
>
- {tabs.map(({ value, name, label, icon: Icon }, idx) =>
-
{
+ return }
+ icon={error ? : (Icon && )}
value={value ?? idx}
label={label ?? name}
/>
+ }
)}
- ), [tabs.length, tabSelected])
+ ), [tabs, tabSelected])
const renderAllHiddenTabContents = useMemo(() =>
tabs.map((tabProps, idx) => {
@@ -83,6 +107,7 @@ Content.displayName = 'Content'
Tabs.propTypes = {
tabs: PropTypes.array,
+ tabsProps: PropTypes.object,
renderHiddenTabs: PropTypes.bool
}
diff --git a/src/fireedge/src/client/constants/actions.js b/src/fireedge/src/client/constants/actions.js
index 4a2dabfe07..8adeb35ff8 100644
--- a/src/fireedge/src/client/constants/actions.js
+++ b/src/fireedge/src/client/constants/actions.js
@@ -18,6 +18,7 @@
export const RENAME = 'rename'
// ATTRIBUTES
+export const COPY_ATTRIBUTE = 'copy'
export const ADD_ATTRIBUTE = 'add'
export const EDIT_ATTRIBUTE = 'edit'
export const DELETE_ATTRIBUTE = 'delete'
diff --git a/src/fireedge/src/client/constants/index.js b/src/fireedge/src/client/constants/index.js
index 37305abfa2..2b174232b7 100644
--- a/src/fireedge/src/client/constants/index.js
+++ b/src/fireedge/src/client/constants/index.js
@@ -90,6 +90,7 @@ export const SOCKETS = {
export * as T from 'client/constants/translates'
export * as ACTIONS from 'client/constants/actions'
export * as STATES from 'client/constants/states'
+export * from 'client/constants/userInput'
export * from 'client/constants/flow'
export * from 'client/constants/provision'
export * from 'client/constants/cluster'
diff --git a/src/fireedge/src/client/constants/translates.js b/src/fireedge/src/client/constants/translates.js
index 3ad5388519..81e148ee11 100644
--- a/src/fireedge/src/client/constants/translates.js
+++ b/src/fireedge/src/client/constants/translates.js
@@ -31,7 +31,9 @@ module.exports = {
/* actions */
Accept: 'Accept',
Active: 'Active',
+ Add: 'Add',
AddAction: 'Add action',
+ Append: 'Append',
Attach: 'Attach',
AttachDisk: 'Attach disk',
AttachImage: 'Attach image disk',
@@ -41,18 +43,20 @@ module.exports = {
Cancel: 'Cancel',
Change: 'Change',
ChangeGroup: 'Change group',
- CurrentGroup: 'Current group: %s',
ChangeOwner: 'Change owner',
- CurrentOwner: 'Current owner: %s',
Clear: 'Clear',
+ ClickToCopy: 'Click to copy',
Clone: 'Clone',
CloneSeveralTemplates: 'Clone several Templates',
CloneTemplate: 'Clone Template',
Close: 'Close',
Collapse: 'Collapse',
Configuration: 'Configuration',
+ CopiedToClipboard: 'Copied to clipboard',
Create: 'Create',
CreateMarketApp: 'Create Marketplace App',
+ CurrentGroup: 'Current group: %s',
+ CurrentOwner: 'Current owner: %s',
Delete: 'Delete',
DeleteScheduledAction: 'Delete scheduled action: %s',
DeleteSomething: 'Delete: %s',
@@ -76,8 +80,8 @@ module.exports = {
Reboot: 'Reboot',
RebootHard: 'Reboot hard',
Recover: 'Recover',
- RecoverSomething: 'Recover: %s',
RecoverSeveralVMs: 'Recover several VMs',
+ RecoverSomething: 'Recover: %s',
Refresh: 'Refresh',
Release: 'Release',
Remove: 'Remove',
@@ -96,8 +100,8 @@ module.exports = {
SaveAsTemplate: 'Save as Template',
Search: 'Search',
Select: 'Select',
- SelectHost: 'Select a host',
SelectGroup: 'Select a group',
+ SelectHost: 'Select a host',
SelectRequest: 'Select request',
SelectVmTemplate: 'Select a VM Template',
Share: 'Share',
@@ -175,6 +179,7 @@ module.exports = {
None: 'None',
Empty: 'Empty',
NoDataAvailable: 'There is no data available',
+ ErrorsOcurred: '%s error(s) occurred',
/* steps form */
AdvancedOptions: 'Advanced options',
@@ -285,6 +290,9 @@ module.exports = {
EndTime: 'End time',
Locked: 'Locked',
Attributes: 'Attributes',
+ Type: 'Type',
+ Data: 'Data',
+ Validate: 'Validate',
/* permissions */
Permissions: 'Permissions',
@@ -455,23 +463,29 @@ module.exports = {
`Number of iothreads for virtio disks.
By default threads will be assign to disk by round robin algorithm.
Disk thread id can be forced by disk IOTHREAD attribute`,
+ RawData: 'Raw data',
+ RawDataConcept: 'Raw data to be passed directly to the hypervisor',
+ RawValidateConcept: `
+ Disable validation of the RAW data.
+ By default, the data will be checked against the libvirt schema`,
/* VM Template schema - context */
Context: 'Context',
/* VM Template schema - Input/Output */
InputOrOutput: 'Input / Output',
+ Inputs: 'Inputs',
/* VM Template schema - Input/Output - graphics */
Graphics: 'Graphics',
VMRC: 'VMRC',
VNC: 'VNC',
SDL: 'SDL',
SPICE: 'SPICE',
- Type: 'Type',
ListenOnIp: 'Listen on IP',
ServerPort: 'Server port',
ServerPortConcept: 'Port for the VNC/SPICE server',
Keymap: 'Keymap',
GenerateRandomPassword: 'Generate random password',
Command: 'Command',
+ Bus: 'Bus',
/* VM Template schema - NUMA */
PinPolicy: 'Pin Policy',
PinPolicyConcept: 'Virtual CPU pinning preference: %s',
@@ -517,10 +531,21 @@ module.exports = {
ReservedCpu: 'Allocated CPU',
/* User inputs */
+ UserInputs: 'User Inputs',
+ UserInputsConcept: `
+ These attributes must be provided by the user when a new VM is instantiated.
+ They will be included in the VM context`,
Fixed: 'Fixed',
Range: 'Range',
List: 'List',
AnyValue: 'Any value',
+ Options: 'Options',
+ UIOptionsConcept:
+ 'Comma-separated list of options for the drop-down select input',
+ Min: 'Min',
+ Max: 'Max',
+ DefaultValue: 'Default value',
+ Mandatory: 'Mandatory',
/* Validation */
/* Validation - mixed */
diff --git a/src/fireedge/src/client/constants/userInput.js b/src/fireedge/src/client/constants/userInput.js
new file mode 100644
index 0000000000..b7a3cade0e
--- /dev/null
+++ b/src/fireedge/src/client/constants/userInput.js
@@ -0,0 +1,59 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+/**
+ * @typedef {(
+ * 'text' |
+ * 'text64' |
+ * 'password' |
+ * 'number' |
+ * 'number-float' |
+ * 'range' |
+ * 'range-float' |
+ * 'boolean' |
+ * 'list' |
+ * 'array' |
+ * 'list-multiple'
+ * )} UserInputType
+ * - OpenNebula types for user inputs
+ */
+
+/**
+ * @typedef {object} UserInputObject
+ * @property {boolean} mandatory - If `true`, the input will be required
+ * @property {UserInputType} type - Input type
+ * @property {string} name - Name of input
+ * @property {string} [description] - Description of input
+ * @property {number|string} [min] - Minimum value of range type input
+ * @property {number|string} [max] - Maximum value of range type input
+ * @property {string[]} [options] - Options available for the input
+ * @property {number|string|string[]} [default] - Default value for the input
+ */
+
+/** @enum {UserInputType} User input types */
+export const USER_INPUT_TYPES = {
+ text: 'text',
+ text64: 'text64',
+ password: 'password',
+ number: 'number',
+ numberFloat: 'number-float',
+ range: 'range',
+ rangeFloat: 'range-float',
+ boolean: 'boolean',
+ list: 'list',
+ array: 'array',
+ listMultiple: 'list-multiple'
+}
diff --git a/src/fireedge/src/client/constants/vmTemplate.js b/src/fireedge/src/client/constants/vmTemplate.js
index 674484e8b4..f7995e4636 100644
--- a/src/fireedge/src/client/constants/vmTemplate.js
+++ b/src/fireedge/src/client/constants/vmTemplate.js
@@ -43,6 +43,9 @@ export const DEFAULT_CPU_MODELS = ['host-passthrough']
export const SD_DISK_BUSES = ['scsi', 'sata']
+export const DEVICE_TYPES = { mouse: 'mouse', tablet: 'tablet' }
+export const DEVICE_BUS_TYPES = { usb: 'usb', ps2: 'ps2' }
+
export const FIRMWARE_TYPES = ['BIOS']
export const KVM_FIRMWARE_TYPES = FIRMWARE_TYPES.concat([
diff --git a/src/fireedge/src/client/hooks/index.js b/src/fireedge/src/client/hooks/index.js
index e49c0df654..a8f8286cb6 100644
--- a/src/fireedge/src/client/hooks/index.js
+++ b/src/fireedge/src/client/hooks/index.js
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and *
* limitations under the License. *
* ------------------------------------------------------------------------- */
+import useClipboard, { CLIPBOARD_STATUS } from 'client/hooks/useClipboard'
import useDialog from 'client/hooks/useDialog'
import useFetch from 'client/hooks/useFetch'
import useFetchAll from 'client/hooks/useFetchAll'
@@ -23,6 +24,7 @@ import useSearch from 'client/hooks/useSearch'
import useSocket from 'client/hooks/useSocket'
export {
+ useClipboard,
useDialog,
useFetch,
useFetchAll,
@@ -30,5 +32,7 @@ export {
useListForm,
useNearScreen,
useSearch,
- useSocket
+ useSocket,
+
+ CLIPBOARD_STATUS
}
diff --git a/src/fireedge/src/client/hooks/useClipboard.js b/src/fireedge/src/client/hooks/useClipboard.js
new file mode 100644
index 0000000000..7a65640a48
--- /dev/null
+++ b/src/fireedge/src/client/hooks/useClipboard.js
@@ -0,0 +1,71 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+import { useMemo, useState } from 'react'
+
+/** @enum {string} Clipboard state */
+export const CLIPBOARD_STATUS = {
+ INIT: 'INIT',
+ ERROR: 'ERROR',
+ COPIED: 'COPIED'
+}
+
+const { INIT, ERROR, COPIED } = CLIPBOARD_STATUS
+
+/**
+ * @callback CallbackCopy
+ * @param {string} text - Text to write on clipboard
+ */
+
+/**
+ * @typedef {object} UseClipboard
+ * @property {CallbackCopy} copy - Function to write text on clipboard
+ * @property {CLIPBOARD_STATUS} state - Result state of copy action
+ * @property {boolean} isCopied
+ * - If the text is copied successfully, will be `true` temporally (2s)
+ */
+
+/**
+ * Hook to manage a clipboard.
+ *
+ * @param {string|number} tooltipDelay - Time in milliseconds to hide the tooltip
+ * @returns {UseClipboard} Returns management attributes
+ */
+const useClipboard = ({ tooltipDelay = 2000 } = {}) => {
+ const [state, setState] = useState(() => INIT)
+ const isCopied = useMemo(() => state === COPIED, [state])
+
+ const copy = async text => {
+ try {
+ // Use the Async Clipboard API when available.
+ // Requires a secure browsing context (i.e. HTTPS)
+ !navigator?.clipboard && setState(ERROR)
+
+ await navigator.clipboard.writeText(String(text))
+
+ setState(COPIED)
+ if (+tooltipDelay > 0) {
+ setTimeout(() => setState(INIT), +tooltipDelay)
+ }
+ } catch (error) {
+ setState(ERROR)
+ }
+ }
+
+ return { copy, state, isCopied }
+}
+
+export default useClipboard
diff --git a/src/fireedge/src/client/hooks/useDialog.js b/src/fireedge/src/client/hooks/useDialog.js
index a854b94e88..c32fed652f 100644
--- a/src/fireedge/src/client/hooks/useDialog.js
+++ b/src/fireedge/src/client/hooks/useDialog.js
@@ -21,7 +21,8 @@ const callAll = (...fns) => (...args) => fns.forEach(fn => fn && fn?.(...args))
* Hook to manage a dialog.
*
* @returns {{
- * on: boolean,
+ * display: boolean,
+ * values: any,
* show: Function,
* hide: Function,
* toggle: Function,
diff --git a/src/fireedge/src/client/hooks/useListForm.js b/src/fireedge/src/client/hooks/useListForm.js
index affadfbe69..9ac4ac8f62 100644
--- a/src/fireedge/src/client/hooks/useListForm.js
+++ b/src/fireedge/src/client/hooks/useListForm.js
@@ -53,6 +53,7 @@ import { set } from 'client/utils'
/**
* @typedef {object} HookListForm
+ * @property {object[]} list - Form list
* @property {object} editingData - Current editing data
* @property {NoParamsCallback} handleClear - Clear the data form list
* @property {NewListCallback} handleSetList - Resets the list with a new value
@@ -201,6 +202,7 @@ const useListForm = ({
)
return {
+ list,
editingData,
handleSelect,
handleUnselect,
diff --git a/src/fireedge/src/client/models/Helper.js b/src/fireedge/src/client/models/Helper.js
index c13ba06462..878853c953 100644
--- a/src/fireedge/src/client/models/Helper.js
+++ b/src/fireedge/src/client/models/Helper.js
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and *
* limitations under the License. *
* ------------------------------------------------------------------------- */
-import { T } from 'client/constants'
import { DateTime } from 'luxon'
import { j2xParser as Parser } from 'fast-xml-parser'
+import { T, UserInputObject, USER_INPUT_TYPES } from 'client/constants'
+
/**
* @param {object} json - JSON
* @param {boolean} [addRoot] - Add ROOT element as parent
@@ -124,6 +125,21 @@ export const levelLockToString = level => ({
4: T.All
}[level] || '-')
+/**
+ * Returns the permission numeric code.
+ *
+ * @param {string[]} category - Array with Use, Manage and Access permissions.
+ * @param {('YES'|'NO')} category.0 - `true` if use permission is allowed
+ * @param {('YES'|'NO')} category.1 - `true` if manage permission is allowed
+ * @param {('YES'|'NO')} category.2 - `true` if access permission is allowed
+ * @returns {number} Permission code number.
+ */
+const getCategoryValue = ([u, m, a]) => (
+ (stringToBoolean(u) ? 4 : 0) +
+ (stringToBoolean(m) ? 2 : 0) +
+ (stringToBoolean(a) ? 1 : 0)
+)
+
/**
* Transform the permission from OpenNebula template to octal format.
*
@@ -146,21 +162,6 @@ export const permissionsToOctal = permissions => {
OTHER_U, OTHER_M, OTHER_A
} = permissions
- /**
- * Returns the permission numeric code.
- *
- * @param {string[]} category - Array with Use, Manage and Access permissions.
- * @param {('YES'|'NO')} category.0 - `true` if use permission is allowed
- * @param {('YES'|'NO')} category.1 - `true` if manage permission is allowed
- * @param {('YES'|'NO')} category.2 - `true` if access permission is allowed
- * @returns {number} Permission code number.
- */
- const getCategoryValue = ([u, m, a]) => (
- (stringToBoolean(u) ? 4 : 0) +
- (stringToBoolean(m) ? 2 : 0) +
- (stringToBoolean(a) ? 1 : 0)
- )
-
return [
[OWNER_U, OWNER_M, OWNER_A],
[GROUP_U, GROUP_M, GROUP_A],
@@ -219,3 +220,95 @@ export const filterAttributes = (list = {}, options = {}) => {
return response
}
+
+// ----------------------------------------------------------
+// User inputs
+// ----------------------------------------------------------
+
+const PARAMS_SEPARATOR = '|'
+const RANGE_SEPARATOR = '..'
+const LIST_SEPARATOR = ','
+const OPTIONS_DEFAULT = ' '
+const MANDATORY = 'M'
+const OPTIONAL = 'O'
+
+/**
+ * Get object attributes from user input as string.
+ *
+ * @param {string} userInputString - User input as string with format:
+ * mandatory | type | description | options | defaultValue
+ * @returns {UserInputObject} User input object
+ */
+export const getUserInputParams = userInputString => {
+ const params = String(userInputString).split(PARAMS_SEPARATOR)
+
+ const options = [
+ USER_INPUT_TYPES.range,
+ USER_INPUT_TYPES.rangeFloat
+ ].includes(params[1])
+ ? params[3].split(RANGE_SEPARATOR)
+ : params[3].split(LIST_SEPARATOR)
+
+ return {
+ mandatory: params[0] === MANDATORY,
+ type: params[1],
+ description: params[2],
+ options: options,
+ default: params[4],
+ min: options[0],
+ max: options[1]
+ }
+}
+
+/**
+ * @param {UserInputObject} userInput - User input object
+ * @returns {string} User input in string format
+ */
+export const getUserInputString = userInput => {
+ const {
+ mandatory,
+ mandatoryString = mandatory ? MANDATORY : OPTIONAL,
+ type,
+ description,
+ min,
+ max,
+ range = [min, max].filter(Boolean).join(RANGE_SEPARATOR),
+ options,
+ default: defaultValue
+ } = userInput
+
+ // mandatory|type|description|range/options/' '|defaultValue
+ const uiString = [mandatoryString, type, description]
+
+ range?.length > 0
+ ? uiString.push(range)
+ : options?.length > 0
+ ? uiString.push(options.join(LIST_SEPARATOR))
+ : uiString.push(OPTIONS_DEFAULT)
+
+ return uiString.concat(defaultValue).join(PARAMS_SEPARATOR)
+}
+
+/**
+ * Get list of user inputs defined in OpenNebula template.
+ *
+ * @param {object} userInputs - List of user inputs in string format
+ * @returns {UserInputObject[]} User input object
+ */
+export const userInputsToArray = userInputs => {
+ return Object
+ .entries(userInputs)
+ .map(([name, ui]) => ({ name, ...getUserInputParams(ui) }))
+}
+
+/**
+ * Get list of user inputs in format valid to forms.
+ *
+ * @param {UserInputObject[]} userInputs - List of user inputs in object format
+ * @returns {object} User input object
+ */
+export const userInputsToObject = userInputs =>
+ userInputs.reduce((res, { name, ...userInput }) => ({
+ ...res,
+ [String(name).toUpperCase()]: getUserInputString(userInput)
+ }), {})
diff --git a/src/fireedge/src/client/models/Host.js b/src/fireedge/src/client/models/Host.js
index 34ce2e2769..a155f90dca 100644
--- a/src/fireedge/src/client/models/Host.js
+++ b/src/fireedge/src/client/models/Host.js
@@ -73,9 +73,10 @@ export const getAllocatedInfo = host => {
export const getHugepageSizes = host => {
const numaNodes = [host?.HOST_SHARE?.NUMA_NODES?.NODE ?? []].flat()
- return numaNodes.filter(node => node?.NODE_ID &&
- [node?.HUGEPAGE?.SIZE ?? []].flat().map(size => +size)
- )
+ return numaNodes
+ .filter(node => node?.NODE_ID && node?.HUGEPAGE)
+ .map(node => node.HUGEPAGE.map(({ SIZE }) => +SIZE))
+ .flat()
}
/**
diff --git a/src/fireedge/src/client/models/SecurityGroup.js b/src/fireedge/src/client/models/SecurityGroup.js
index a0dedc4ed3..303d2686c6 100644
--- a/src/fireedge/src/client/models/SecurityGroup.js
+++ b/src/fireedge/src/client/models/SecurityGroup.js
@@ -80,7 +80,7 @@ export const getSecurityGroupsFromResource = (resource, securityGroups) => {
const groups = Array.isArray(securityGroups)
? securityGroups
- : securityGroups.split(',')
+ : securityGroups?.split(',')
- return rules.filter(({ SECURITY_GROUP_ID }) => groups.includes?.(SECURITY_GROUP_ID))
+ return rules.filter(({ SECURITY_GROUP_ID }) => groups?.includes?.(SECURITY_GROUP_ID))
}
diff --git a/src/fireedge/src/client/theme/defaults.js b/src/fireedge/src/client/theme/defaults.js
index fa018f4a41..e9bfdd5e90 100644
--- a/src/fireedge/src/client/theme/defaults.js
+++ b/src/fireedge/src/client/theme/defaults.js
@@ -248,16 +248,6 @@ export default (appTheme, mode = SCHEMES.DARK) => {
fieldset: { border: 'none' }
}
},
- MuiTypography: {
- variants: [{
- props: { component: 'legend' },
- style: {
- marginBottom: '1em',
- padding: '0em 1em 0.2em 0.5em',
- borderBottom: `2px solid ${secondary.main}`
- }
- }]
- },
MuiPaper: {
styleOverrides: {
root: { backgroundImage: 'unset' }
@@ -424,8 +414,7 @@ export default (appTheme, mode = SCHEMES.DARK) => {
},
MuiList: {
defaultProps: {
- dense: true,
- disablePadding: true
+ dense: true
}
},
MuiChip: {
diff --git a/src/fireedge/src/client/utils/helpers.js b/src/fireedge/src/client/utils/helpers.js
index febb2b9683..e0f8677430 100644
--- a/src/fireedge/src/client/utils/helpers.js
+++ b/src/fireedge/src/client/utils/helpers.js
@@ -132,8 +132,8 @@ export const getObjectSchemaFromFields = fields =>
}
const paths = name.split('.')
- const path = paths.pop()
- const fieldSchema = object({ [path]: validation })
+ const pathname = paths.pop()
+ const fieldSchema = object({ [pathname]: validation })
/**
* @param {string} [path] - Path
diff --git a/src/fireedge/src/client/utils/schema.js b/src/fireedge/src/client/utils/schema.js
index a7473b15e2..805cd56db3 100644
--- a/src/fireedge/src/client/utils/schema.js
+++ b/src/fireedge/src/client/utils/schema.js
@@ -20,8 +20,10 @@ import { JSXElementConstructor, SetStateAction } from 'react'
// eslint-disable-next-line no-unused-vars
import { GridProps, TextFieldProps, CheckboxProps, InputBaseComponentProps } from '@mui/material'
import { string, number, boolean, array, object, BaseSchema } from 'yup'
+// eslint-disable-next-line no-unused-vars
+import { Row } from 'react-table'
-import { INPUT_TYPES } from 'client/constants'
+import { UserInputObject, INPUT_TYPES, USER_INPUT_TYPES } from 'client/constants'
// ----------------------------------------------------------
// Types
@@ -90,16 +92,37 @@ import { INPUT_TYPES } from 'client/constants'
* @property {BaseSchema|DependOfCallback} [validation]
* - Schema to validate the field value
* @property {TextFieldProps|CheckboxProps|InputBaseComponentProps} [fieldProps]
- * - Extra properties to material field
+ * - Extra properties to material-ui field
+ * @property {function(string|number):any} [renderValue]
+ * - Render the current selected value inside selector input
+ * - **Only for select inputs.**
+ * @property {JSXElementConstructor} [Table]
+ * - Table component. One of table defined in: `client/components/Tables`
+ * - **Only for table inputs.**
+ * @property {boolean|DependOfCallback} [singleSelect]
+ * If `true`, the table component only will allows to select one row
+ * - **Only for table inputs.**
+ * @property {function(Row, number):string} [getRowId]
+ * This function changes how React Table detects unique rows
+ * and also how it constructs each row's underlying id property.
+ * - **Only for table inputs.**
* @property {{message: string, test: Function}[]|DependOfCallback} [validationBeforeTransform]
* - Tests to validate the field value.
* - **Only for file inputs.**
- * @property {Function|DependOfCallback} [transform]
+ * @property {Function} [transform]
* - Transform the file value.
* - For example: to save file as string value in base64 format.
* - **Only for file inputs.**
*/
+/**
+ * @typedef {object} Section
+ * @property {string} id - Section id
+ * @property {string} legend - Legend text
+ * @property {string} legendTooltip - Legend tooltip
+ * @property {Field[]} fields - The Fields will be includes on section
+ */
+
/**
* @typedef {object} Form
* @property {BaseSchema|function(object):BaseSchema} resolver - Schema
@@ -149,12 +172,6 @@ import { INPUT_TYPES } from 'client/constants'
* @returns {Form & ExtraParams}
*/
-/**
- * @typedef {('text'|'text64'|'password'|'number'|'number-float'|'range'|
- * 'range-float'|'boolean'|'list'|'array'|'list-multiple')} UserInputType
- * - OpenNebula types for user inputs
- */
-
// ----------------------------------------------------------
// Constants
// ----------------------------------------------------------
@@ -192,19 +209,15 @@ const parseUserInputValue = value => {
/**
* Get input schema for the user input defined in OpenNebula resource.
*
- * @param {object} userInput - User input from OpenNebula document
- * @param {boolean} userInput.mandatory - If `true`, the input will be required
- * @param {string} userInput.name - Name of input
- * @param {UserInputType} userInput.type - Input type
- * @param {string} [userInput.options] - Options available for the input
- * @param {number|string|string[]} [userInput.defaultValue] - Default value for the input
+ * @param {UserInputObject} userInput - User input from OpenNebula document
+ * @param {number|string|string[]} [userInput.default] - Default value for the input
* @returns {Field} Field properties
*/
-export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }) => {
+export const schemaUserInput = ({ mandatory, name, type, options, default: defaultValue }) => {
switch (type) {
- case 'text':
- case 'text64':
- case 'password': return {
+ case [USER_INPUT_TYPES.text]:
+ case [USER_INPUT_TYPES.text64]:
+ case [USER_INPUT_TYPES.password]: return {
type: INPUT_TYPES.TEXT,
htmlType: type === 'password' ? 'password' : 'text',
validation: string()
@@ -212,8 +225,8 @@ export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }
.concat(requiredSchema(mandatory, name, string()))
.default(defaultValue || undefined)
}
- case 'number':
- case 'number-float': return {
+ case [USER_INPUT_TYPES.number]:
+ case [USER_INPUT_TYPES.numberFloat]: return {
type: INPUT_TYPES.TEXT,
htmlType: 'number',
validation: number()
@@ -222,8 +235,8 @@ export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }
.transform(value => !isNaN(value) ? value : null)
.default(() => parseFloat(defaultValue) ?? undefined)
}
- case 'range':
- case 'range-float': {
+ case [USER_INPUT_TYPES.range]:
+ case [USER_INPUT_TYPES.rangeFloat]: {
const [min, max] = getRange(options)
return {
@@ -238,13 +251,13 @@ export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }
fieldProps: { min, max, step: type === 'range-float' ? 0.01 : 1 }
}
}
- case 'boolean': return {
+ case [USER_INPUT_TYPES.boolean]: return {
type: INPUT_TYPES.CHECKBOX,
validation: boolean()
.concat(requiredSchema(mandatory, name, boolean()))
.default(defaultValue === 'YES' ?? false)
}
- case 'list': {
+ case [USER_INPUT_TYPES.list]: {
const values = getOptionsFromList(options)
const firstOption = values?.[0]?.value ?? undefined
@@ -258,7 +271,7 @@ export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }
.default(defaultValue || firstOption)
}
}
- case 'array': {
+ case [USER_INPUT_TYPES.array]: {
const defaultValues = getValuesFromArray(defaultValue)
return {
@@ -270,7 +283,7 @@ export const schemaUserInput = ({ mandatory, name, type, options, defaultValue }
fieldProps: { freeSolo: true }
}
}
- case 'list-multiple': {
+ case [USER_INPUT_TYPES.listMultiple]: {
const values = getOptionsFromList(options)
const defaultValues = defaultValue?.split(',') ?? undefined
diff --git a/src/fireedge/src/client/utils/translation.js b/src/fireedge/src/client/utils/translation.js
index 6babe71fd6..d02bf7944a 100644
--- a/src/fireedge/src/client/utils/translation.js
+++ b/src/fireedge/src/client/utils/translation.js
@@ -36,6 +36,18 @@ const buildMethods = () => {
value => isBase64(value)
)
})
+ addMethod(string, 'includesInOptions', function (options, separator = ',') {
+ return this.test({
+ name: 'includes-string-of-values',
+ message: [T['validation.string.invalidFormat'], options.join(separator)],
+ exclusive: true,
+ test: function (values) {
+ return values
+ ?.split(separator)
+ ?.every(value => this.resolve(options).includes(value))
+ }
+ })
+ })
}
/**
diff --git a/src/fireedge/src/server/routes/api/auth/functions.js b/src/fireedge/src/server/routes/api/auth/functions.js
index a6b0253f0b..d9e499c08d 100644
--- a/src/fireedge/src/server/routes/api/auth/functions.js
+++ b/src/fireedge/src/server/routes/api/auth/functions.js
@@ -573,7 +573,8 @@ const functionRoutes = {
setRes,
updaterResponse,
setNodeConnect,
- connectOpennebula
+ connectOpennebula,
+ getCreatedTokenOpennebula
}
module.exports = functionRoutes
diff --git a/src/fireedge/src/server/routes/api/vcenter/command-flags.js b/src/fireedge/src/server/routes/api/vcenter/command-flags.js
index 8ab05af40e..5dc81a41ca 100644
--- a/src/fireedge/src/server/routes/api/vcenter/command-flags.js
+++ b/src/fireedge/src/server/routes/api/vcenter/command-flags.js
@@ -14,19 +14,51 @@
* limitations under the License. *
* ------------------------------------------------------------------------- */
-const questions = {
- datastores: [
+const DATASTORES = 'datastores'
+const TEMPLATES = 'templates'
+const NETWORKS = 'networks'
+const IMAGES = 'images'
- ],
- templates: [
-
- ],
- networks: [
-
- ],
- images: [
-
- ]
+const resources = {
+ DATASTORES,
+ TEMPLATES,
+ NETWORKS,
+ IMAGES
}
-module.exports = questions
+const questions = {
+ [DATASTORES]: [],
+ [TEMPLATES]: [
+ {
+ question: 'Type',
+ flag: '--type'
+ }, {
+ question: 'Folder',
+ flag: '--folder'
+ }, {
+ question: 'Linked Clone',
+ flag: '--linked-clone'
+ }
+ ],
+ [NETWORKS]: [
+ {
+ question: 'Size',
+ flag: '--size'
+ }, {
+ question: 'Type',
+ flag: '--type'
+ }, {
+ question: 'MAC',
+ flag: '--mac'
+ }, {
+ question: 'Cluster(s) to import',
+ flag: '--cluster-imports'
+ }, {
+ question: 'Unimported Cluster(s)',
+ flag: '--cluster-unimported'
+ }
+ ],
+ [IMAGES]: []
+}
+
+module.exports = { resources, questions }
diff --git a/src/fireedge/src/server/routes/api/vcenter/functions.js b/src/fireedge/src/server/routes/api/vcenter/functions.js
new file mode 100644
index 0000000000..df76c26bbb
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vcenter/functions.js
@@ -0,0 +1,262 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const {
+ defaultEmptyFunction,
+ defaultCommandVcenter
+} = require('server/utils/constants/defaults')
+
+const {
+ ok,
+ internalServerError,
+ badRequest
+} = require('server/utils/constants/http-codes')
+const { httpResponse, executeCommand } = require('server/utils/server')
+const { consoleParseToString, consoleParseToJSON } = require('server/utils/opennebula')
+const { resources } = require('./command-flags')
+
+const { getSunstoneConfig } = require('server/utils/yml')
+
+const httpBadRequest = httpResponse(badRequest, '', '')
+const appConfig = getSunstoneConfig()
+const prependCommand = appConfig.vcenter_prepend_command || ''
+const regexExclude = [
+ /^Connecting to.*/gi,
+ /^Exploring vCenter.*/gi,
+ // eslint-disable-next-line no-control-regex
+ /^\u001b\[.*?m\u001b\[.*?m# vCenter.*/gi
+]
+const validObjects = Object.values(resources)
+
+/**
+ * Import the the desired vCenter object.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const importVcenter = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ // check params
+ if (params && params.vobject && validObjects.includes(params.vobject) && params.host) {
+ const vobject = `${params.vobject}`.toLowerCase()
+
+ let paramsCommand = [
+ params.answers ? 'import' : 'import_defaults'
+ ]
+
+ if (params.id) {
+ paramsCommand.push(
+ `${params.id}`
+ )
+ }
+
+ let vobjectAndHost = [
+ '-o',
+ `${vobject}`,
+ '-h',
+ `${params.host}`
+ ]
+
+ if (vobject === resources.IMAGES && params.datastore) {
+ const datastoreParameter = ['-d', params.datastore]
+ vobjectAndHost = [...vobjectAndHost, ...datastoreParameter]
+ }
+
+ // flags by questions import command
+ /* if (params.answers && questions[vobject]) {
+ const answers = params.answers.split(',')
+ } */
+
+ paramsCommand = [...paramsCommand, ...vobjectAndHost]
+ const executedCommand = executeCommand(defaultCommandVcenter, paramsCommand, prependCommand)
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = consoleParseToString(
+ executedCommand.data,
+ regexExclude
+ )
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+/**
+ * Show a list with unimported vCenter objects excluding all filters.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const list = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ if (params && params.vobject && validObjects.includes(params.vobject) && params.host) {
+ const vobject = `${params.vobject}`.toLowerCase()
+ let paramsCommand = [
+ 'list',
+ '-o',
+ `${vobject}`,
+ '-h',
+ `${params.host}`,
+ '--csv'
+ ]
+ if (vobject === resources.IMAGES && params.datastore) {
+ const newParameters = ['-d', params.datastore]
+ paramsCommand = [...paramsCommand, ...newParameters]
+ }
+ const executedCommand = executeCommand(defaultCommandVcenter, paramsCommand, prependCommand)
+
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = consoleParseToJSON(
+ consoleParseToString(
+ executedCommand.data,
+ regexExclude
+ ),
+ /^IMID,.*/gi
+ )
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+/**
+ * Show a list with unimported vCenter objects excluding all filters.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const listAll = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ if (params && params.vobject && validObjects.includes(params.vobject) && params.host) {
+ const vobject = `${params.vobject}`.toLowerCase()
+ let paramsCommand = [
+ 'list_all',
+ '-o',
+ `${vobject}`,
+ '-h',
+ `${params.host}`,
+ '--csv'
+ ]
+ if (vobject === resources.IMAGES && params.datastore) {
+ const newParameters = ['-d', params.datastore]
+ paramsCommand = [...paramsCommand, ...newParameters]
+ }
+ const executedCommand = executeCommand(defaultCommandVcenter, paramsCommand, prependCommand)
+
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = consoleParseToJSON(
+ consoleParseToString(
+ executedCommand.data,
+ regexExclude
+ ),
+ /^IMID,.*/gi
+ )
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+/**
+ * Clear extraconfig tags from a vCenter VM, useful when a VM has been launched by OpenNebula and needs to be reimported.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const cleartags = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ // check params
+ if (params && params.id) {
+ const paramsCommand = [
+ 'cleartags',
+ `${params.id}`
+ ]
+ const executedCommand = executeCommand(defaultCommandVcenter, paramsCommand, prependCommand)
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = consoleParseToString(
+ executedCommand.data,
+ regexExclude
+ )
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+/**
+ * Import vCenter cluster as Opennebula host.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const hosts = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ // check params
+ if (params && params.vcenter && params.user && params.pass) {
+ const paramsCommand = [
+ 'hosts',
+ '--vcenter',
+ `${params.vcenter}`.toLowerCase(),
+ '--vuser',
+ `${params.user}`,
+ '--vpass',
+ `${params.pass}`,
+ '--use-defaults'
+ ]
+ const executedCommand = executeCommand(defaultCommandVcenter, paramsCommand, prependCommand)
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = consoleParseToString(
+ executedCommand.data,
+ regexExclude
+ )
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+const functionRoutes = {
+ importVcenter,
+ list,
+ listAll,
+ cleartags,
+ hosts
+}
+module.exports = functionRoutes
diff --git a/src/fireedge/src/server/routes/api/vcenter/index.js b/src/fireedge/src/server/routes/api/vcenter/index.js
index 1f041f5df1..6b4c17b2f0 100644
--- a/src/fireedge/src/server/routes/api/vcenter/index.js
+++ b/src/fireedge/src/server/routes/api/vcenter/index.js
@@ -14,12 +14,46 @@
* limitations under the License. *
* ------------------------------------------------------------------------- */
-const privateRoutes = []
+const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server')
+const { routes: vcenterRoutes } = require('./vcenter')
+const { VCENTER } = require('./string-routes')
+const privateRoutes = []
const publicRoutes = []
+/**
+ * Set private routes.
+ *
+ * @param {object} routes - object of routes
+ * @param {string} path - principal route
+ * @param {Function} action - function of route
+ */
+const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => {
+ if (Object.keys(routes).length > 0 && routes.constructor === Object) {
+ Object.keys(routes).forEach((route) => {
+ privateRoutes.push(
+ setFunctionRoute(route, path,
+ (req, res, next, connection, userId, user) => {
+ action(req, res, next, routes[route], user, connection)
+ }
+ )
+ )
+ })
+ }
+}
+
+/**
+ * Add routes.
+ *
+ * @returns {Array} routes
+ */
+const generatePrivateRoutes = () => {
+ setPrivateRoutes(vcenterRoutes, VCENTER, addFunctionAsRoute)
+ return privateRoutes
+}
+
const functionRoutes = {
- private: privateRoutes,
+ private: generatePrivateRoutes(),
public: publicRoutes
}
diff --git a/src/fireedge/src/server/routes/api/vcenter/string-routes.js b/src/fireedge/src/server/routes/api/vcenter/string-routes.js
new file mode 100644
index 0000000000..2596a74e55
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vcenter/string-routes.js
@@ -0,0 +1,23 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const VCENTER = 'vcenter'
+
+const Actions = {
+ VCENTER
+}
+
+module.exports = Actions
diff --git a/src/fireedge/src/server/routes/api/vcenter/vcenter.js b/src/fireedge/src/server/routes/api/vcenter/vcenter.js
new file mode 100644
index 0000000000..43a1388d03
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vcenter/vcenter.js
@@ -0,0 +1,116 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const { httpMethod, from: fromData } = require('server/utils/constants/defaults')
+const { importVcenter, list, listAll, cleartags, hosts } = require('./functions')
+const { POST, GET } = httpMethod
+
+const routes = {
+ [POST]: {
+ import: {
+ action: importVcenter,
+ params: {
+ vobject: {
+ from: fromData.resource,
+ name: 'id'
+ },
+ host: {
+ from: fromData.postBody,
+ name: 'host'
+ },
+ datastore: {
+ from: fromData.postBody,
+ name: 'datastore'
+ },
+ id: {
+ from: fromData.postBody,
+ name: 'id'
+ },
+ answers: {
+ from: fromData.postBody,
+ name: 'answers'
+ }
+ }
+ },
+ cleartags: {
+ action: cleartags,
+ params: {
+ id: {
+ from: fromData.resource,
+ name: 'id'
+ }
+ }
+ },
+ hosts: {
+ action: hosts,
+ params: {
+ vcenter: {
+ from: fromData.postBody,
+ name: 'vcenter'
+ },
+ user: {
+ from: fromData.postBody,
+ name: 'user'
+ },
+ pass: {
+ from: fromData.postBody,
+ name: 'pass'
+ }
+ }
+ }
+ },
+ [GET]: {
+ list: {
+ action: list,
+ params: {
+ vobject: {
+ from: fromData.resource,
+ name: 'id'
+ },
+ host: {
+ from: fromData.query,
+ name: 'host'
+ },
+ datastore: {
+ from: fromData.query,
+ name: 'datastore'
+ }
+ }
+ },
+ listall: {
+ action: listAll,
+ params: {
+ vobject: {
+ from: fromData.resource,
+ name: 'id'
+ },
+ host: {
+ from: fromData.query,
+ name: 'host'
+ },
+ datastore: {
+ from: fromData.query,
+ name: 'datastore'
+ }
+ }
+ }
+ }
+}
+
+const authApi = {
+ routes
+}
+module.exports = authApi
diff --git a/src/fireedge/src/server/routes/api/vm/functions.js b/src/fireedge/src/server/routes/api/vm/functions.js
new file mode 100644
index 0000000000..b8d3a4e11b
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vm/functions.js
@@ -0,0 +1,65 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const {
+ defaultEmptyFunction,
+ defaultCommandVM
+} = require('server/utils/constants/defaults')
+
+const {
+ ok,
+ internalServerError,
+ badRequest
+} = require('server/utils/constants/http-codes')
+const { httpResponse, executeCommand } = require('server/utils/server')
+
+const { getSunstoneConfig } = require('server/utils/yml')
+
+const httpBadRequest = httpResponse(badRequest, '', '')
+const appConfig = getSunstoneConfig()
+const prependCommand = appConfig.sunstone_prepend || ''
+const regexpSplitLine = /\r|\n/
+
+/**
+ * Save as template.
+ *
+ * @param {object} res - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const saveAsTemplate = (res = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ let rtn = httpBadRequest
+ if (params && params.id && params.name) {
+ const paramsCommand = ['save', `${params.id}`, `${params.name}`]
+
+ const executedCommand = executeCommand(defaultCommandVM, paramsCommand, prependCommand)
+
+ const response = executedCommand.success ? ok : internalServerError
+ let message = ''
+ if (executedCommand.data) {
+ message = executedCommand.data.replace(regexpSplitLine, '')
+ }
+ rtn = httpResponse(response, message)
+ }
+ res.locals.httpCode = rtn
+ next()
+}
+
+const functionRoutes = {
+ saveAsTemplate
+}
+module.exports = functionRoutes
diff --git a/src/fireedge/src/server/routes/api/vm/index.js b/src/fireedge/src/server/routes/api/vm/index.js
new file mode 100644
index 0000000000..7171d7df8f
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vm/index.js
@@ -0,0 +1,60 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server')
+const { routes: vmRoutes } = require('./vm')
+const { VM } = require('./string-routes')
+
+const privateRoutes = []
+const publicRoutes = []
+
+/**
+ * Set private routes.
+ *
+ * @param {object} routes - object of routes
+ * @param {string} path - principal route
+ * @param {Function} action - function of route
+ */
+const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => {
+ if (Object.keys(routes).length > 0 && routes.constructor === Object) {
+ Object.keys(routes).forEach((route) => {
+ privateRoutes.push(
+ setFunctionRoute(route, path,
+ (req, res, next, connection, userId, user) => {
+ action(req, res, next, routes[route], user, connection)
+ }
+ )
+ )
+ })
+ }
+}
+
+/**
+ * Add routes.
+ *
+ * @returns {Array} routes
+ */
+const generatePrivateRoutes = () => {
+ setPrivateRoutes(vmRoutes, VM, addFunctionAsRoute)
+ return privateRoutes
+}
+
+const functionRoutes = {
+ private: generatePrivateRoutes(),
+ public: publicRoutes
+}
+
+module.exports = functionRoutes
diff --git a/src/fireedge/src/server/routes/api/vm/string-routes.js b/src/fireedge/src/server/routes/api/vm/string-routes.js
new file mode 100644
index 0000000000..44fc057baf
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vm/string-routes.js
@@ -0,0 +1,23 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const VM = 'vm'
+
+const Actions = {
+ VM
+}
+
+module.exports = Actions
diff --git a/src/fireedge/src/server/routes/api/vm/vm.js b/src/fireedge/src/server/routes/api/vm/vm.js
new file mode 100644
index 0000000000..1f80190736
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/vm/vm.js
@@ -0,0 +1,42 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const { httpMethod, from: fromData } = require('server/utils/constants/defaults')
+const { saveAsTemplate } = require('./functions')
+const { POST } = httpMethod
+
+const routes = {
+ [POST]: {
+ save: {
+ action: saveAsTemplate,
+ params: {
+ id: {
+ from: fromData.resource,
+ name: 'id'
+ },
+ name: {
+ from: fromData.postBody,
+ name: 'name'
+ }
+ }
+ }
+ }
+}
+
+const authApi = {
+ routes
+}
+module.exports = authApi
diff --git a/src/fireedge/src/server/routes/api/zendesk/functions.js b/src/fireedge/src/server/routes/api/zendesk/functions.js
new file mode 100644
index 0000000000..0cb1d78ac7
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/zendesk/functions.js
@@ -0,0 +1,48 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+const { global } = require('window-or-global')
+
+/**
+ * Get data fireedge session.
+ *
+ * @param {string} username - username
+ * @param {string} token - pass
+ * @returns {object} user session
+ */
+const getSession = (username = '', token = '') => {
+ if (
+ username &&
+ token &&
+ global &&
+ global.users &&
+ username &&
+ global.users[username] &&
+ global.users[username].tokens
+ ) {
+ const session = global.users[username].tokens.find(
+ (curr = {}, index = 0) => {
+ return curr.token && curr.token === token
+ }
+ )
+ return session
+ }
+}
+
+const functions = {
+ getSession
+}
+
+module.exports = functions
diff --git a/src/fireedge/src/server/routes/api/zendesk/index.js b/src/fireedge/src/server/routes/api/zendesk/index.js
index 1f041f5df1..474bb2df28 100644
--- a/src/fireedge/src/server/routes/api/zendesk/index.js
+++ b/src/fireedge/src/server/routes/api/zendesk/index.js
@@ -14,12 +14,46 @@
* limitations under the License. *
* ------------------------------------------------------------------------- */
-const privateRoutes = []
+const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server')
+const { routes: zendeskRoutes } = require('./zendesk')
+const { ZENDESK } = require('./string-routes')
+const privateRoutes = []
const publicRoutes = []
+/**
+ * Set private routes.
+ *
+ * @param {object} routes - object of routes
+ * @param {string} path - principal route
+ * @param {Function} action - function of route
+ */
+const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => {
+ if (Object.keys(routes).length > 0 && routes.constructor === Object) {
+ Object.keys(routes).forEach((route) => {
+ privateRoutes.push(
+ setFunctionRoute(route, path,
+ (req, res, next, connection, userId, user) => {
+ action(req, res, next, routes[route], user, connection)
+ }
+ )
+ )
+ })
+ }
+}
+
+/**
+ * Add routes.
+ *
+ * @returns {Array} routes
+ */
+const generatePrivateRoutes = () => {
+ setPrivateRoutes(zendeskRoutes, ZENDESK, addFunctionAsRoute)
+ return privateRoutes
+}
+
const functionRoutes = {
- private: privateRoutes,
+ private: generatePrivateRoutes(),
public: publicRoutes
}
diff --git a/src/fireedge/src/server/routes/api/zendesk/string-routes.js b/src/fireedge/src/server/routes/api/zendesk/string-routes.js
new file mode 100644
index 0000000000..5b81ffe225
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/zendesk/string-routes.js
@@ -0,0 +1,23 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const ZENDESK = 'zendesk'
+
+const Actions = {
+ ZENDESK
+}
+
+module.exports = Actions
diff --git a/src/fireedge/src/server/routes/api/zendesk/zendesk-functions.js b/src/fireedge/src/server/routes/api/zendesk/zendesk-functions.js
new file mode 100644
index 0000000000..623057ba35
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/zendesk/zendesk-functions.js
@@ -0,0 +1,407 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const { env } = require('process')
+const zendesk = require('node-zendesk')
+const { getSunstoneConfig } = require('server/utils/yml')
+const { defaultEmptyFunction, defaultSeverities, defaultWebpackMode } = require('server/utils/constants/defaults')
+const { httpResponse } = require('server/utils/server')
+const { getSession } = require('./functions')
+
+const {
+ ok,
+ internalServerError,
+ badRequest,
+ unauthorized
+} = require('server/utils/constants/http-codes')
+
+const formatCreate = (
+ {
+ subject = '',
+ body = '',
+ version = '',
+ severity = ''
+ }
+) => {
+ let rtn
+ if (subject && body && version && severity) {
+ rtn = {
+ request: {
+ subject,
+ comment: {
+ body
+ },
+ custom_fields: [
+ { id: 391130, value: version }, // version
+ { id: 391197, value: severity } // severity
+ ],
+ can_be_solved_by_me: false,
+ tags: [severity]
+ }
+ }
+ }
+ return rtn
+}
+
+const formatComment = ({ body = '', solved = '', attachments = [] }) => {
+ let rtn
+ if (body) {
+ rtn = {
+ request: {
+ comment: {
+ body,
+ public: true
+ }
+ }
+ }
+ if (solved) {
+ rtn.solved = 'true'
+ }
+ if (attachments && Array.isArray(attachments) && attachments.length > 0) {
+ rtn.request.comment.uploads = attachments.filter(att => att)
+ }
+ }
+ return rtn
+}
+
+const parseBufferError = (err) => {
+ let rtn = ''
+ let errorJson = {}
+ if (err && err.result) {
+ try {
+ errorJson = JSON.parse(
+ err.result.toString()
+ )
+ } catch {}
+ if (errorJson && errorJson.error) {
+ rtn = errorJson.error.title ? `${errorJson.error.title}: ` : ''
+ rtn += errorJson.error.message ? errorJson.error.message : ''
+ }
+ }
+ return rtn
+}
+
+const httpBadRequest = httpResponse(badRequest, '', '')
+
+/**
+ * Login on Zendesk.
+ *
+ * @param {object} response - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const login = (response = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ const sunstoneConfig = getSunstoneConfig()
+ const remoteUri = sunstoneConfig.support_url || ''
+
+ if (
+ remoteUri &&
+ params &&
+ params.user &&
+ params.pass &&
+ userData &&
+ userData.user &&
+ userData.password
+ ) {
+ const zendeskData = {
+ username: params.user,
+ password: params.pass,
+ remoteUri,
+ debug: env.NODE_ENV === defaultWebpackMode
+ }
+ const session = getSession(userData.user, userData.password)
+ /** ZENDESK AUTH */
+ const zendeskClient = zendesk.createClient(zendeskData)
+ zendeskClient.users.auth((err, res, result) => {
+ let method = ok
+ let data = result
+ if (err) {
+ if (session.zendesk) {
+ delete session.zendesk
+ }
+ method = internalServerError
+ data = parseBufferError(err)
+ }
+ if (result && result.authenticity_token) {
+ const zendeskUserData = {
+ ...zendeskData,
+ id: result.id
+ }
+ session.zendesk = zendeskUserData
+ }
+
+ response.locals.httpCode = httpResponse(method, data)
+ next()
+ })
+ } else {
+ response.locals.httpCode = httpBadRequest
+ next()
+ }
+}
+
+/**
+ * List on Zendesk.
+ *
+ * @param {object} response - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const list = (response = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ if (
+ userData &&
+ userData.user &&
+ userData.password
+ ) {
+ const session = getSession(userData.user, userData.password)
+ if (session.zendesk && session.zendesk.id) {
+ /** LIST ZENDESK */
+ const zendeskClient = zendesk.createClient(session.zendesk)
+ zendeskClient.requests.getRequest(
+ { status: 'open,pending' },
+ (err, req, result) => {
+ let method = ok
+ let data = ''
+
+ if (err) {
+ method = internalServerError
+ data = parseBufferError(err)
+ } else if (result) {
+ let pendings = 0
+ let opens = 0
+ const tickets = Array.isArray(result) ? result : result
+ tickets.forEach(ticket => {
+ if (ticket && ticket.status) {
+ switch (ticket.status) {
+ case 'pending':
+ pendings += 1
+ break
+ default:
+ opens += 1
+ break
+ }
+ }
+ })
+ data = {
+ tickets: result,
+ pendings,
+ opens
+ }
+ }
+
+ response.locals.httpCode = httpResponse(
+ method,
+ data
+ )
+ next()
+ }
+ )
+ } else {
+ response.locals.httpCode = httpResponse(unauthorized)
+ next()
+ }
+ } else {
+ response.locals.httpCode = httpBadRequest
+ next()
+ }
+}
+
+/**
+ * Get Comments on ticket.
+ *
+ * @param {object} response - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const comments = (response = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ if (
+ params.id &&
+ userData &&
+ userData.user &&
+ userData.password
+ ) {
+ const session = getSession(userData.user, userData.password)
+ if (session.zendesk) {
+ /** GET COMMENTS ON TICKET ZENDESK */
+ const zendeskClient = zendesk.createClient(session.zendesk)
+ zendeskClient.requests.listComments(
+ params.id,
+ (err, req, result) => {
+ let method = ok
+ let data = ''
+
+ if (err) {
+ method = internalServerError
+ data = parseBufferError(err)
+ } else if (result) {
+ data = result
+ }
+
+ response.locals.httpCode = httpResponse(method, data)
+ next()
+ }
+ )
+ } else {
+ response.locals.httpCode = httpResponse(unauthorized)
+ next()
+ }
+ } else {
+ response.locals.httpCode = httpBadRequest
+ next()
+ }
+}
+
+/**
+ * Create ticket.
+ *
+ * @param {object} response - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const create = (response = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ if (
+ params &&
+ params.subject &&
+ params.body &&
+ params.version &&
+ params.severity &&
+ defaultSeverities.includes(params.severity) &&
+ userData &&
+ userData.user &&
+ userData.password
+ ) {
+ const session = getSession(userData.user, userData.password)
+ if (session.zendesk && session.zendesk.id) {
+ /** CREATE TICKET ZENDESK */
+ const zendeskClient = zendesk.createClient(session.zendesk)
+ const ticket = formatCreate(params)
+ zendeskClient.requests.create(
+ ticket,
+ (err, req, result) => {
+ let method = ok
+ let data = ''
+ if (err) {
+ method = internalServerError
+ data = parseBufferError(err)
+ } else if (result) {
+ data = result
+ }
+ response.locals.httpCode = httpResponse(method, data)
+ next()
+ }
+ )
+ } else {
+ response.locals.httpCode = httpResponse(unauthorized)
+ next()
+ }
+ } else {
+ response.locals.httpCode = httpBadRequest
+ next()
+ }
+}
+
+/**
+ * Update Ticket.
+ *
+ * @param {object} response - http response
+ * @param {Function} next - express stepper
+ * @param {object} params - params of http request
+ * @param {object} userData - user of http request
+ */
+const update = (response = {}, next = defaultEmptyFunction, params = {}, userData = {}) => {
+ if (
+ params.id &&
+ params.body &&
+ userData &&
+ userData.user &&
+ userData.password
+ ) {
+ const session = getSession(userData.user, userData.password)
+ if (session.zendesk && session.zendesk.id) {
+ const zendeskClient = zendesk.createClient(session.zendesk)
+
+ const sendRequest = (params = {}) => {
+ /** UPDATE TICKET ZENDESK */
+ const ticket = formatComment(params)
+ zendeskClient.requests.update(
+ params.id,
+ ticket,
+ (err, req, result) => {
+ let method = ok
+ let data = ''
+
+ if (err) {
+ method = internalServerError
+ data = parseBufferError(err)
+ } else if (result) {
+ data = result
+ }
+ response.locals.httpCode = httpResponse(method, data)
+ next()
+ }
+ )
+ }
+
+ /** UPLOAD FILES */
+ let attachments
+ if (params && params.attachments && zendeskClient.attachments && typeof zendeskClient.attachments.upload === 'function') {
+ params.attachments.forEach((att = {}) => {
+ if (att && att.originalname && att.path) {
+ zendeskClient.attachments.upload(
+ att.path,
+ {
+ filename: att.originalname
+ },
+ (err, req, result) => {
+ const token = (result && result.upload && result.upload.token) || ''
+ if (attachments) {
+ attachments.push(token)
+ } else {
+ attachments = [token]
+ }
+ if (!err && token) {
+ if (attachments && attachments.length === params.attachments.length) {
+ sendRequest({ ...params, attachments })
+ }
+ }
+ }
+ )
+ }
+ })
+ } else {
+ sendRequest({ ...params, attachments })
+ }
+ } else {
+ response.locals.httpCode = httpResponse(unauthorized)
+ next()
+ }
+ } else {
+ response.locals.httpCode = httpBadRequest
+ next()
+ }
+}
+
+const functionRoutes = {
+ login,
+ list,
+ comments,
+ create,
+ update
+}
+module.exports = functionRoutes
diff --git a/src/fireedge/src/server/routes/api/zendesk/zendesk.js b/src/fireedge/src/server/routes/api/zendesk/zendesk.js
new file mode 100644
index 0000000000..b93dc46510
--- /dev/null
+++ b/src/fireedge/src/server/routes/api/zendesk/zendesk.js
@@ -0,0 +1,101 @@
+/* ------------------------------------------------------------------------- *
+ * Copyright 2002-2021, OpenNebula Project, OpenNebula Systems *
+ * *
+ * 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. *
+ * ------------------------------------------------------------------------- */
+
+const { httpMethod, from: fromData } = require('server/utils/constants/defaults')
+const { login, list, comments, create, update } = require('./zendesk-functions')
+const { POST, GET, PUT } = httpMethod
+
+const routes = {
+ [POST]: {
+ login: {
+ action: login,
+ params: {
+ user: {
+ from: fromData.postBody,
+ name: 'user'
+ },
+ pass: {
+ from: fromData.postBody,
+ name: 'pass'
+ }
+ }
+ },
+ create: {
+ action: create,
+ params: {
+ subject: {
+ from: fromData.postBody,
+ name: 'subject'
+ },
+ body: {
+ from: fromData.postBody,
+ name: 'body'
+ },
+ version: {
+ from: fromData.postBody,
+ name: 'version'
+ },
+ severity: {
+ from: fromData.postBody,
+ name: 'severity'
+ }
+ }
+ }
+ },
+ [PUT]: {
+ update: {
+ action: update,
+ params: {
+ id: {
+ from: fromData.resource,
+ name: 'id'
+ },
+ body: {
+ from: fromData.postBody,
+ name: 'body'
+ },
+ solved: {
+ from: fromData.postBody,
+ name: 'solved'
+ },
+ attachments: {
+ from: 'files',
+ name: 'attachments'
+ }
+ }
+ }
+ },
+ [GET]: {
+ list: {
+ action: list,
+ params: {}
+ },
+ comments: {
+ action: comments,
+ params: {
+ id: {
+ from: fromData.resource,
+ name: 'id'
+ }
+ }
+ }
+ }
+}
+
+const authApi = {
+ routes
+}
+module.exports = authApi
diff --git a/src/fireedge/src/server/routes/entrypoints/Api.js b/src/fireedge/src/server/routes/entrypoints/Api.js
index baa53dca92..c8c0fcea02 100644
--- a/src/fireedge/src/server/routes/entrypoints/Api.js
+++ b/src/fireedge/src/server/routes/entrypoints/Api.js
@@ -128,9 +128,10 @@ router.all(
routeFunction,
httpMethod
)
+ req.serverDataSource = dataSources
if (valRouteFunction) {
valRouteFunction(
- dataSources,
+ req,
res,
next,
connectOpennebula,
diff --git a/src/fireedge/src/server/utils/constants/defaults.js b/src/fireedge/src/server/utils/constants/defaults.js
index e4d0e670d1..d90cbfe5d2 100644
--- a/src/fireedge/src/server/utils/constants/defaults.js
+++ b/src/fireedge/src/server/utils/constants/defaults.js
@@ -22,7 +22,6 @@ const internalProvisionPath = `${appName}/${appNameProvision}`
const baseUrl = `${appName ? `/${appName}/` : '/'}`
const baseUrlWebsockets = 'websockets/'
const severityPrepend = 'severity_'
-const assetsClient = '/lib/one/fireedge/dist/client'
const apps = {
[appNameSunstone]: {
theme: appNameSunstone,
@@ -71,6 +70,7 @@ const defaults = {
'oneflow',
'support',
'vcenter',
+ 'vm',
'zendesk',
appNameProvision,
appNameSunstone
@@ -114,6 +114,7 @@ const defaults = {
defaultCommandProvisionTemplate: 'oneprovision-template',
defaultCommandProvider: 'oneprovider',
defaultCommandVcenter: 'onevcenter',
+ defaultCommandVM: 'onevm',
defaultFolderTmpProvision: 'tmp',
defaultHideCredentials: true,
defaultHideCredentialReplacer: '****',
@@ -150,6 +151,7 @@ const defaults = {
defaultGetMethod: 'info',
defaultMessageProblemOpennebula: 'Problem with connection or xml parser',
defaultIP: defaultIp,
+ defaultSeverities: [`${severityPrepend}1`, `${severityPrepend}2`, `${severityPrepend}3`, `${severityPrepend}4`],
defaultProtocolHotReload: 'http',
defaultHost: '0.0.0.0',
defaultPort: 2616,
diff --git a/src/fireedge/src/server/utils/opennebula.js b/src/fireedge/src/server/utils/opennebula.js
index 9cf46507c6..4e7c9f9e58 100644
--- a/src/fireedge/src/server/utils/opennebula.js
+++ b/src/fireedge/src/server/utils/opennebula.js
@@ -467,15 +467,8 @@ const generateNewResourceTemplate = (
const consoleParseToString = (stringConsole = '', excludeRegexs = []) => {
const rtn = []
if (stringConsole) {
- console.log('all -->', JSON.stringify(stringConsole))
const lines = stringConsole.split(regexLine)
lines.forEach(line => {
- let test = ''
- for (const c of line) {
- test += c.charCodeAt(0) + ' '
- }
- console.log('-->', test)
-
let pass = true
if (Array.isArray(excludeRegexs)) {
excludeRegexs.forEach(rex => {
diff --git a/src/fireedge/src/server/utils/server.js b/src/fireedge/src/server/utils/server.js
index d0c5d76b79..3ac0580d83 100644
--- a/src/fireedge/src/server/utils/server.js
+++ b/src/fireedge/src/server/utils/server.js
@@ -16,6 +16,7 @@
const { env } = require('process')
const { Map } = require('immutable')
+const multer = require('multer')
const { global } = require('window-or-global')
const { resolve } = require('path')
// eslint-disable-next-line node/no-deprecated-api
@@ -53,6 +54,8 @@ const {
defaultEmptyFunction
} = require('./constants/defaults')
+const upload = multer({ dest: '/tmp' })
+
let cert = ''
let key = ''
@@ -70,6 +73,55 @@ const setFunctionRoute = (method, endpoint, action) => ({
action
})
+/**
+ * Execute actions Function routes
+ *
+ * @param {Function} action - action.
+ * @param {object} res - response http.
+ * @param {Function} next - stepper.
+ * @param {object} routeParams - params for actions.
+ * @param {object} serverDataSource - server params.
+ * @param {user} user - user.
+ * @param {Function} oneConnection - ONE connection xmlrpc.
+ */
+
+const executeAction = (
+ action = defaultEmptyFunction,
+ res = {},
+ next = defaultEmptyFunction,
+ routeParams = {},
+ serverDataSource = {},
+ user = {},
+ oneConnection = defaultEmptyFunction
+) => {
+ action(
+ res,
+ next,
+ getRequestParameters(routeParams, serverDataSource),
+ user,
+ oneConnection
+ )
+}
+
+/**
+ * Parse files for actions.
+ *
+ * @param {Array} files - files
+ * @returns {Array} files
+ */
+const parseFiles = (files = []) => {
+ let rtn
+ if (files && Array.isArray(files)) {
+ rtn = {}
+ files.forEach(file => {
+ if (file.fieldname) {
+ rtn[file.fieldname] ? rtn[file.fieldname].push(file) : rtn[file.fieldname] = [file]
+ }
+ })
+ }
+ return rtn
+}
+
/**
* Add function as express route.
*
@@ -82,14 +134,37 @@ const setFunctionRoute = (method, endpoint, action) => ({
* @param {string} index - resource index
*/
const addFunctionAsRoute = (req = {}, res = {}, next = defaultEmptyFunction, routes = {}, user = {}, oneConnection = defaultEmptyFunction, index = 0) => {
- const resources = Object.keys(req[fromData.resource])
- if (req && res && next && routes) {
- const route = routes[`${req[fromData.resource][resources[index]]}`.toLowerCase()]
- if (req && fromData && fromData.resource && req[fromData.resource] && route) {
+ if (req && req.serverDataSource && res && next && routes) {
+ const serverDataSource = req.serverDataSource
+ const resources = Object.keys(serverDataSource[fromData.resource])
+ const route = routes[`${serverDataSource[fromData.resource][resources[index]]}`.toLowerCase()]
+ if (fromData && fromData.resource && serverDataSource[fromData.resource] && route) {
if (Object.keys(route).length > 0 && route.constructor === Object) {
if (route.action && route.params && typeof route.action === 'function') {
- const params = getRequestParameters(route.params, req)
- route.action(res, next, params, user, oneConnection)
+ const uploadFiles = getRequestFiles(route.params)
+ if (uploadFiles && uploadFiles.length) {
+ const files = upload.array(uploadFiles)
+ files(req, res, (err) => {
+ if (err) {
+ const errorData = (err && err.message) || ''
+ writeInLogger(errorData)
+ messageTerminal({
+ color: 'red',
+ message: 'Error: %s',
+ error: errorData
+ })
+ }
+ const dataSources = {
+ [fromData.resource]: serverDataSource[fromData.resource],
+ [fromData.query]: req.query,
+ [fromData.postBody]: req.body
+ }
+ dataSources.files = parseFiles(req && req.files)
+ executeAction(route.action, res, next, route.params, dataSources, user, oneConnection)
+ })
+ } else {
+ executeAction(route.action, res, next, route.params, serverDataSource, user, oneConnection)
+ }
} else {
addFunctionAsRoute(req, res, next, route, user, oneConnection, index + 1)
}
@@ -528,6 +603,22 @@ const genPathResources = () => {
}
}
+/**
+ * Get files into params.
+ *
+ * @param {object} params - finder params
+ * @returns {Array} - params file
+ */
+const getRequestFiles = (params = {}) => {
+ if (params && Object.keys(params).length > 0 && params.constructor === Object) {
+ const arrayParams = Object.keys(params)
+ const fileParams = arrayParams.filter((key = '') => {
+ return key && params[key] && params[key].from === 'files'
+ })
+ return fileParams
+ }
+}
+
/**
* Get http params.
*
@@ -831,6 +922,7 @@ module.exports = {
getCert,
getKey,
parsePostData,
+ getRequestFiles,
getRequestParameters,
getQueryData,
getResourceDataForRequest,