diff --git a/src/fireedge/src/client/assets/images/providers/VULTR.png b/src/fireedge/src/client/assets/images/providers/VULTR.png new file mode 100644 index 0000000000..14411f3b57 Binary files /dev/null and b/src/fireedge/src/client/assets/images/providers/VULTR.png differ diff --git a/src/fireedge/src/client/assets/images/providers/VULTR.webp b/src/fireedge/src/client/assets/images/providers/VULTR.webp new file mode 100644 index 0000000000..0d52f9da76 Binary files /dev/null and b/src/fireedge/src/client/assets/images/providers/VULTR.webp differ diff --git a/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.png b/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.png new file mode 100644 index 0000000000..cdebaff379 Binary files /dev/null and b/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.png differ diff --git a/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.webp b/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.webp new file mode 100644 index 0000000000..2b158e0a56 Binary files /dev/null and b/src/fireedge/src/client/assets/images/provisions/OPENNEBULA-VULTR.webp differ diff --git a/src/fireedge/src/client/components/HOC/MainLayout.js b/src/fireedge/src/client/components/HOC/MainLayout.js index 6cf2b354db..fdcaacdc8d 100644 --- a/src/fireedge/src/client/components/HOC/MainLayout.js +++ b/src/fireedge/src/client/components/HOC/MainLayout.js @@ -44,7 +44,6 @@ const MainLayout = ({ endpoints, children }) => { } = useAuth() useEffect(() => { - console.log({ isLoading }) if (isLogged && !isLoginInProcess && !isLoading) { getAuthInfo() } diff --git a/src/fireedge/src/client/constants/provision.js b/src/fireedge/src/client/constants/provision.js index 89a83d4eec..c42124be98 100644 --- a/src/fireedge/src/client/constants/provision.js +++ b/src/fireedge/src/client/constants/provision.js @@ -65,15 +65,25 @@ export const PROVIDERS_TYPES = { name: 'Dummy', color: '#436637' }, - google: { - id: 'google', - name: 'Google Cloud', - color: '#dc382b' - }, digitalocean: { id: 'digitalocean', name: 'Digital Ocean', color: '#2381f5' + }, + vultr_virtual: { + id: 'vultr_virtual', + name: 'Vultr Cloud Compute', + color: '#7ea3ca' + }, + vultr_metal: { + id: 'vultr_metal', + name: 'Vultr Bare Metal', + color: '#7ea3ca' + }, + google: { + id: 'google', + name: 'Google Cloud', + color: '#dc382b' } } diff --git a/src/fireedge/src/client/types/provision.js b/src/fireedge/src/client/types/provision.js index 570bdcff65..11fccdd78f 100644 --- a/src/fireedge/src/client/types/provision.js +++ b/src/fireedge/src/client/types/provision.js @@ -1,4 +1,8 @@ import PropTypes from 'prop-types' +import { PROVIDERS_TYPES, PROVISIONS_TYPES } from 'client/constants' + +const providerTypes = Object.values(PROVIDERS_TYPES).map(({ id }) => id) +const provisionTypes = Object.values(PROVISIONS_TYPES).map(({ id }) => id) export const UserInput = PropTypes.shape({ name: PropTypes.string.isRequired, @@ -27,19 +31,9 @@ export const UserInput = PropTypes.shape({ ]) }) -export const ProviderType = PropTypes.oneOf([ - 'aws', - 'packet', - 'dummy', - 'google', - 'digitalocean' -]) +export const ProviderType = PropTypes.oneOf(providerTypes) -export const ProvisionType = PropTypes.oneOf([ - 'metal', - 'virtual', - 'onprem' -]) +export const ProvisionType = PropTypes.oneOf(provisionTypes) export const ProvisionHost = PropTypes.shape({ im_mad: PropTypes.string.isRequired, diff --git a/src/fireedge/src/server/routes/api/provision/schemas.js b/src/fireedge/src/server/routes/api/provision/schemas.js index d196abdc63..7d2a6310b5 100644 --- a/src/fireedge/src/server/routes/api/provision/schemas.js +++ b/src/fireedge/src/server/routes/api/provision/schemas.js @@ -12,7 +12,15 @@ /* See the License for the specific language governing permissions and */ /* limitations under the License. */ /* -------------------------------------------------------------------------- */ -const providers = ['aws', 'packet', 'dummy', 'google', 'digitalocean'] +const providers = [ + 'aws', + 'packet', + 'dummy', + 'google', + 'digitalocean', + 'vultr_virtual', + 'vultr_metal' +] const provider = { id: '/Provider',