+
{t('dashboard_table_title')}
diff --git a/packages/manager/apps/pci-savings-plan/src/components/Dashboard/ConsumptionDatagrid/ConsumptionResourceList.tsx b/packages/manager/apps/pci-savings-plan/src/components/Dashboard/ConsumptionDatagrid/ConsumptionResourceList.tsx
new file mode 100644
index 000000000000..9a7c0b16d205
--- /dev/null
+++ b/packages/manager/apps/pci-savings-plan/src/components/Dashboard/ConsumptionDatagrid/ConsumptionResourceList.tsx
@@ -0,0 +1,104 @@
+import { usePciUrl } from '@ovh-ux/manager-pci-common';
+import { Drawer } from '@ovh-ux/manager-react-components';
+import { ODS_ICON_NAME, OdsInputChangeEvent } from '@ovhcloud/ods-components';
+import React, { useMemo, useState } from 'react';
+import { OdsText, OdsInput, OdsLink } from '@ovhcloud/ods-components/react';
+import { useTranslation } from 'react-i18next';
+
+type ConsumptionResourceListProps = {
+ isDrawerOpen: boolean;
+ resources: string[];
+ handleCloseDrawer: () => void;
+ isInstanceFlavor: boolean;
+};
+
+const ConsumptionResourceList = ({
+ isDrawerOpen,
+ resources,
+ isInstanceFlavor,
+ handleCloseDrawer,
+}: ConsumptionResourceListProps) => {
+ const pciUrl = usePciUrl();
+ const { t } = useTranslation('dashboard');
+
+ const [searchQuery, setSearchQuery] = useState('');
+
+ const handleSearchChange = (event: OdsInputChangeEvent) => {
+ const { value } = event.detail;
+ setSearchQuery(typeof value === 'string' ? value : '');
+ };
+
+ const filteredPlanIds = useMemo(() => {
+ if (!resources) return [];
+ if (!searchQuery) return resources;
+ return resources.filter((id) =>
+ id.toLowerCase().includes(searchQuery.toLowerCase()),
+ );
+ }, [resources, searchQuery]);
+
+ const onClose = () => {
+ setSearchQuery('');
+ handleCloseDrawer();
+ };
+
+ const getResourceUrl = (planId: string) =>
+ isInstanceFlavor
+ ? `${pciUrl}/instances/${planId}`
+ : `${pciUrl}/rancher/${planId}`;
+
+ return (
+
+
+
+
+ {t('dashboard_resource_list_title')}
+
+
+
+ {resources.length > 0 ? (
+ <>
+
+ {t('dashboard_resource_list_search')}
+
+
+
+
+ {filteredPlanIds.length > 0 ? (
+ filteredPlanIds.map((planId) => (
+
+
+
+ ))
+ ) : (
+
+ {t('dashboard_resource_list_no_results', { searchQuery })}
+
+ )}
+
+
+ ) : (
+
+ {t('dashboard_resource_list_no_resources')}
+
+ )}
+
+ );
+};
+
+export default ConsumptionResourceList;
diff --git a/packages/manager/apps/pci-savings-plan/src/index.scss b/packages/manager/apps/pci-savings-plan/src/index.scss
index 7ae3d9be3e64..381073f15522 100644
--- a/packages/manager/apps/pci-savings-plan/src/index.scss
+++ b/packages/manager/apps/pci-savings-plan/src/index.scss
@@ -33,6 +33,10 @@ ods-tag.org-tag::part(tag) {
transform: translateY(-10%);
}
+button[data-testid='drawer-backdrop'] {
+ opacity: 0.8;
+}
+
.dns-field {
width: 100%;
diff --git a/packages/manager/apps/pci-savings-plan/src/pages/dashboard/index.tsx b/packages/manager/apps/pci-savings-plan/src/pages/dashboard/index.tsx
index e5c046d8da59..6bd64d5babf9 100644
--- a/packages/manager/apps/pci-savings-plan/src/pages/dashboard/index.tsx
+++ b/packages/manager/apps/pci-savings-plan/src/pages/dashboard/index.tsx
@@ -1,7 +1,7 @@
import { ErrorBanner } from '@ovh-ux/manager-react-components';
import React, { useContext, useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
import { ShellContext } from '@ovh-ux/manager-react-shell-client';
import { OdsText, OdsMessage } from '@ovhcloud/ods-components/react';
import ConsumptionDatagrid from '@/components/Dashboard/ConsumptionDatagrid/ConsumptionDatagrid';
@@ -13,6 +13,7 @@ import GenericChart from '@/components/Chart/Chart';
import { useFilteredConsumption } from '@/hooks/useFilteredConsumption';
import Header from '@/components/Header/Header';
import { useProjectId } from '@/hooks/useProject';
+import { isInstanceFlavor } from '@/utils/savingsPlan';
const Dashboard: React.FC = () => {
const projectId = useProjectId();
@@ -44,6 +45,7 @@ const Dashboard: React.FC = () => {
() => consumption?.flavors?.find((f) => f.flavor === flavor),
[consumption, flavor],
);
+ const isInstance = useMemo(() => isInstanceFlavor(flavor), [flavor]);
useEffect(() => {
if (!isLoading && !isPending && savingsPlan?.length === 0) {
@@ -65,6 +67,7 @@ const Dashboard: React.FC = () => {
return (
<>
+
{t('dashboard_description')}
@@ -102,6 +105,7 @@ const Dashboard: React.FC = () => {
/>
)}
diff --git a/packages/manager/modules/pci/.eslintrc.json b/packages/manager/modules/pci/.eslintrc.json
index c12d22beb416..b5c87a06876b 100644
--- a/packages/manager/modules/pci/.eslintrc.json
+++ b/packages/manager/modules/pci/.eslintrc.json
@@ -1,5 +1,8 @@
{
"globals": {
"moment": true
+ },
+ "rules": {
+ "class-methods-use-this": "off"
}
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/images-list.controller.js b/packages/manager/modules/pci/src/components/project/images-list/images-list.controller.js
index 0bfd1361e51f..259a19c189e1 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/images-list.controller.js
+++ b/packages/manager/modules/pci/src/components/project/images-list/images-list.controller.js
@@ -5,21 +5,23 @@ import keys from 'lodash/keys';
import partition from 'lodash/partition';
import reduce from 'lodash/reduce';
import some from 'lodash/some';
+import groupBy from 'lodash/groupBy';
import { IMAGE_ASSETS } from './images.constants';
+import { DISTANT_BACKUP_FEATURE } from '../../../projects/project/instances/instances.constants';
export default class ImagesListController {
/* @ngInject */
constructor(
$q,
- OvhApiCloudProjectImage,
- OvhApiCloudProjectSnapshot,
+ PciProjectsProjectInstanceService,
PciProjectImages,
+ ovhFeatureFlipping,
) {
this.$q = $q;
- this.OvhApiCloudProjectImage = OvhApiCloudProjectImage;
- this.OvhApiCloudProjectSnapshot = OvhApiCloudProjectSnapshot;
+ this.PciProjectsProjectInstanceService = PciProjectsProjectInstanceService;
this.PciProjectImages = PciProjectImages;
+ this.ovhFeatureFlipping = ovhFeatureFlipping;
this.IMAGE_ASSETS = IMAGE_ASSETS;
}
@@ -33,8 +35,11 @@ export default class ImagesListController {
this.isLoading = true;
return this.$q
- .all([this.getImages(), this.getSnapshots()])
- .then(() => this.findDefaultImage())
+ .all([this.getImages(), this.getSnapshots(), this.loadSnapshotRegions()])
+ .then(() => {
+ this.computeUnavailableSnapshots();
+ this.findDefaultImage();
+ })
.finally(() => {
this.isLoading = false;
});
@@ -112,15 +117,48 @@ export default class ImagesListController {
getSnapshots() {
return this.PciProjectImages.getSnapshots(this.serviceName).then(
(snapshots) => {
- this.snapshots = snapshots;
- this.unavailableSnapshotsPresent = some(
- snapshots,
- (snapshot) => !this.isCompatible(snapshot),
+ this.snapshots = groupBy(snapshots, (s) =>
+ s.region === this.region ? 'local' : 'distant',
);
},
);
}
+ loadSnapshotRegions() {
+ return this.$q
+ .all([
+ this.PciProjectsProjectInstanceService.getProductAvailability(
+ this.serviceName,
+ undefined,
+ 'snapshot',
+ ),
+ this.ovhFeatureFlipping.checkFeatureAvailability(
+ DISTANT_BACKUP_FEATURE,
+ ),
+ ])
+ .then(([productAvailability, feature]) => {
+ this.snapshotsPlans = productAvailability.plans.filter((p) =>
+ p.code.startsWith('snapshot.consumption'),
+ );
+ this.distantBackupAvailability = feature.isFeatureAvailable(
+ DISTANT_BACKUP_FEATURE,
+ );
+ });
+ }
+
+ computeUnavailableSnapshots() {
+ this.unavailableSnapshotsPresent = {
+ local: some(
+ this.snapshots.local,
+ (snapshot) => !this.isCompatible(snapshot),
+ ),
+ distant: some(
+ this.snapshots.distant,
+ (snapshot) => !this.isCompatible(snapshot),
+ ),
+ };
+ }
+
findDefaultImage() {
if (this.defaultImageId) {
// To cover case where image is deprecated
@@ -162,12 +200,12 @@ export default class ImagesListController {
}
if (!this.image) {
- const snapshot = find(this.snapshots, {
+ const snapshot = find(this.snapshots.local, {
region: this.region,
id: this.defaultImageId,
});
if (snapshot) {
- this.selectedTab = 'snapshots';
+ this.selectedTab = 'snapshots-local';
this.image = snapshot;
this.onImageChange(snapshot);
@@ -199,10 +237,13 @@ export default class ImagesListController {
}
isCompatible(image) {
- return (
- image.isAvailableInRegion(this.region) &&
- image.isCompatibleWithFlavor(this.flavorType) &&
- image.isCompatibleWithOsTypes(this.osTypes)
+ return this.PciProjectImages.isImageCompatible(
+ image,
+ this.region,
+ this.flavorType,
+ this.osTypes,
+ this.snapshotsPlans,
+ this.distantBackupAvailability,
);
}
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/images-list.html b/packages/manager/modules/pci/src/components/project/images-list/images-list.html
index 72ce3d9f5648..89a72b573f02 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/images-list.html
+++ b/packages/manager/modules/pci/src/components/project/images-list/images-list.html
@@ -116,15 +116,16 @@
- image.isAvailableInRegion(region) &&
- image.isCompatibleWithFlavor(flavorType),
+ // eslint-disable-next-line class-methods-use-this
+ isImageCompatible(
+ image,
+ targetRegionName,
+ flavorType,
+ osTypes,
+ snapshotsPlans,
+ distantBackupAvailability,
+ ) {
+ if (image.isBackup()) {
+ const targetRegion = snapshotsPlans
+ .flatMap((p) => p.regions)
+ .find((r) => r.name === targetRegionName);
+
+ if (targetRegionName !== image.region) {
+ if (!distantBackupAvailability) return false;
+
+ if (![ONE_AZ_REGION, THREE_AZ_REGION].includes(targetRegion.type))
+ return false;
+
+ const imageRegion = snapshotsPlans
+ .find((p) => p.code === image.planCode)
+ .regions.find((r) => r.name === image.region);
+
+ if (![ONE_AZ_REGION, THREE_AZ_REGION].includes(imageRegion.type))
+ return false;
+ }
+ } else if (!image.isAvailableInRegion(targetRegionName)) {
+ return false;
+ }
+
+ return (
+ image.isCompatibleWithFlavor(flavorType) &&
+ image.isCompatibleWithOsTypes(osTypes)
);
}
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_de_DE.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_de_DE.json
index dc9031d83f2a..07c4caad5aeb 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_de_DE.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_de_DE.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2016",
- "pci_project_instances_distribution_baremetal_windows_other": "Andere Windows-Distributionen"
+ "pci_project_instances_distribution_baremetal_windows_other": "Andere Windows-Distributionen",
+ "pci_project_instances_shapshots_local": "Lokales Backup",
+ "pci_project_instances_shapshots_distant": "Remote-Backup"
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_en_GB.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_en_GB.json
index 44edf0935826..0f86fa5048fe 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_en_GB.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_en_GB.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2016",
- "pci_project_instances_distribution_baremetal_windows_other": "Other Windows operating systems"
+ "pci_project_instances_distribution_baremetal_windows_other": "Other Windows operating systems",
+ "pci_project_instances_shapshots_local": "Local Backup",
+ "pci_project_instances_shapshots_distant": "Remote Backup"
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_es_ES.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_es_ES.json
index f1e9f79dc5c8..8af5e620d113 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_es_ES.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_es_ES.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2016",
- "pci_project_instances_distribution_baremetal_windows_other": "Otras distribuciones Windows"
+ "pci_project_instances_distribution_baremetal_windows_other": "Otras distribuciones Windows",
+ "pci_project_instances_shapshots_local": "Backup local",
+ "pci_project_instances_shapshots_distant": "Backup remoto"
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_CA.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_CA.json
index 12d114deacb2..9fda0e7e3e20 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_CA.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_CA.json
@@ -5,7 +5,8 @@
"pci_project_instances_os_baremetal-linux": "Bare Metal distributions",
"pci_project_instances_distribution_unknown": "Bare Metal distributions",
"pci_project_instances_apps": "Distributions + Apps",
- "pci_project_instances_shapshots": "Backups",
+ "pci_project_instances_shapshots_local": "Backup Local",
+ "pci_project_instances_shapshots_distant": "Backup Distant",
"pci_project_instances_licence": "L'utilisation d'une image est soumise à l'acceptation préalable du Contrat de license utilisateur du fournisseur.",
"pci_project_instances_distribution_linux": "Linux",
"pci_project_instances_distribution_linux_other": "Arch Linux",
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_FR.json
index 12d114deacb2..9fda0e7e3e20 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_FR.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_fr_FR.json
@@ -5,7 +5,8 @@
"pci_project_instances_os_baremetal-linux": "Bare Metal distributions",
"pci_project_instances_distribution_unknown": "Bare Metal distributions",
"pci_project_instances_apps": "Distributions + Apps",
- "pci_project_instances_shapshots": "Backups",
+ "pci_project_instances_shapshots_local": "Backup Local",
+ "pci_project_instances_shapshots_distant": "Backup Distant",
"pci_project_instances_licence": "L'utilisation d'une image est soumise à l'acceptation préalable du Contrat de license utilisateur du fournisseur.",
"pci_project_instances_distribution_linux": "Linux",
"pci_project_instances_distribution_linux_other": "Arch Linux",
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_it_IT.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_it_IT.json
index 8c168f6b3581..5f7823770752 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_it_IT.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_it_IT.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2016",
- "pci_project_instances_distribution_baremetal_windows_other": "Altre distribuzioni Windows"
+ "pci_project_instances_distribution_baremetal_windows_other": "Altre distribuzioni Windows",
+ "pci_project_instances_shapshots_local": "Backup locale",
+ "pci_project_instances_shapshots_distant": "Backup remoto"
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pl_PL.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pl_PL.json
index 8de2f9ff7016..2ba97dec993e 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pl_PL.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pl_PL.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2012",
- "pci_project_instances_distribution_baremetal_windows_other": "Inne dystrybucje Windows"
+ "pci_project_instances_distribution_baremetal_windows_other": "Inne dystrybucje Windows",
+ "pci_project_instances_shapshots_local": "Lokalny backup",
+ "pci_project_instances_shapshots_distant": "Zdalny backup"
}
diff --git a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pt_PT.json b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pt_PT.json
index 988c2648556d..5656f895cb61 100644
--- a/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pt_PT.json
+++ b/packages/manager/modules/pci/src/components/project/images-list/translations/Messages_pt_PT.json
@@ -29,5 +29,7 @@
"pci_project_instances_distribution_baremetal_ubuntu": "Ubuntu",
"pci_project_instances_distribution_baremetal_windows_server_2012": "Windows Server 2012",
"pci_project_instances_distribution_baremetal_windows_server_2016": "Windows Server 2016",
- "pci_project_instances_distribution_baremetal_windows_other": "Outras distribuições Windows"
+ "pci_project_instances_distribution_baremetal_windows_other": "Outras distribuições Windows",
+ "pci_project_instances_shapshots_local": "Backup local",
+ "pci_project_instances_shapshots_distant": "Backup remoto"
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/add.component.js b/packages/manager/modules/pci/src/projects/project/instances/add/add.component.js
index 71c12bc79256..ecd2b9fb4b89 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/add.component.js
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/add.component.js
@@ -14,7 +14,6 @@ export default {
includeCategories: ' {
@@ -809,21 +797,24 @@ export default class PciInstancesAddController {
onImageChange() {
this.displaySelectedImage = true;
+
if (this.model.image.isBackup()) {
this.instance.imageId = this.model.image.id;
+ this.instance.imageRegionName = this.model.image.region;
} else {
this.instance.imageId = this.model.image.getIdByRegion(
this.instance.region,
);
+ this.instance.imageRegionName = this.instance.region;
}
this.onFlexChange(false);
if (!this.isLinuxImageType()) {
this.model.sshKey = null;
- this.instance.sshKeyId = null;
+ this.instance.sshKey = null;
} else {
- this.instance.sshKeyId = get(this.model.sshKey, 'id');
+ this.instance.sshKey = this.model.sshKey;
}
this.trackAddInstance([
@@ -1220,33 +1211,7 @@ export default class PciInstancesAddController {
}
}
- getPrivateNetworkOnChange() {
- if (get(this.selectedPrivateNetwork, 'id')) {
- this.instance.networks = [
- {
- networkId: get(this.selectedPrivateNetwork, 'id'),
- },
- ];
- if (!this.isPrivateMode() && !this.isLocalPrivateMode()) {
- this.instance.networks = [
- ...this.instance.networks,
- {
- networkId: this.publicNetwork.find((network) => {
- if (FLAVORS_BAREMETAL.test(this.flavor.type)) {
- return network.name === PUBLIC_NETWORK_BAREMETAL;
- }
- return network.name === PUBLIC_NETWORK;
- })?.id,
- },
- ];
- }
- } else {
- this.instance.networks = [];
- }
- }
-
onPrivateNetworkChange(modelValue) {
- this.getPrivateNetworkOnChange();
if (
modelValue &&
modelValue.subnet &&
@@ -1505,17 +1470,9 @@ export default class PciInstancesAddController {
}
onCreateFormStepperSubmit() {
- if (this.isPrivateMode()) {
- this.confirmPrivateInstanceCreation = true;
- return null;
- }
return this.create();
}
- onCancelCreateInstanceConfirmation() {
- this.confirmPrivateInstanceCreation = false;
- }
-
create() {
this.isLoading = true;
this.trackAction('create');
@@ -1523,52 +1480,6 @@ export default class PciInstancesAddController {
if (!this.isLinuxImageType()) {
this.instance.userData = null;
}
- if (this.isLocalPrivateMode()) {
- const publicNetworkAlreadyExist = this.instance?.networks?.some(
- (instanceNetwork) => {
- return this.publicNetwork?.find(
- (network) => network.id === instanceNetwork.networkId,
- );
- },
- );
-
- if (
- this.isLocalPrivateModeLocalZone &&
- this.isCreatingNewPrivateNetwork &&
- this.privateNetworkName
- ) {
- this.instance.networks = [
- ...(this.instance.networks || []),
- {
- networkId: this.availableLocalPrivateNetworks.find(({ name }) => {
- return name === this.privateNetworkName;
- })?.id,
- },
- ];
- }
-
- if (this.isAttachPublicNetwork && !publicNetworkAlreadyExist) {
- // if attach check box is ticked, add public network if not added one
- this.instance.networks = [
- ...(this.instance.networks || []),
- {
- networkId: this.publicNetwork?.find(
- (network) => network.name === PUBLIC_NETWORK,
- )?.id,
- },
- ];
- }
- if (!this.isAttachPublicNetwork && publicNetworkAlreadyExist) {
- // if attach check box is not ticked, remove public network if already added one
- this.instance.networks = this.instance?.networks?.filter(
- (instanceNetwork) => {
- return !this.publicNetwork?.find(
- (network) => network.id === instanceNetwork.networkId,
- );
- },
- );
- }
- }
if (
this.PciProjectsProjectInstanceService.automatedBackupIsAvailable(
@@ -1587,108 +1498,76 @@ export default class PciInstancesAddController {
this.instance.availabilityZone = this.model.threeAzRegion.zone;
}
- // @TODO: GS Use post /cloud/project/{serviceName}/region/{regionName}/instance
- // for local zone instance creation
+ const network = {
+ private:
+ this.isPrivateMode() || this.isLocalPrivateMode()
+ ? {
+ floatingIp: this.selectedFloatingIP?.id
+ ? {
+ id: this.selectedFloatingIP.id,
+ }
+ : null,
+ floatingIpCreate:
+ !!this.selectedFloatingIP && !this.selectedFloatingIP.id
+ ? {
+ description: '',
+ }
+ : null,
+ gatewayCreate:
+ this.subnetGateways?.length === 0 && this.isAttachFloatingIP
+ ? {
+ model: this.defaultGateway.size,
+ name: getAutoGeneratedName(
+ `gateway-${this.model.datacenter.name.toLowerCase()}`,
+ ),
+ }
+ : null,
+ ip: null,
+
+ network: {
+ id: this.selectedPrivateNetwork.regions.find(
+ (r) => r.region === this.instance.region,
+ ).openstackId,
+ subnetId: this.selectedPrivateNetwork.subnet?.[0]?.id,
+ },
+ }
+ : null,
+ public:
+ this.selectedMode.name === PUBLIC_NETWORK_MODE ||
+ this.isAttachPublicNetwork,
+ };
return this.PciProjectsProjectInstanceService.save(
this.projectId,
- this.instance,
+ this.instance.region,
+ { ...this.instance, network },
this.model.number,
- this.isPrivateMode(),
)
- .then((result) => {
- const availabilityZone =
- result.availabilityZone ?? this.instance.availabilityZone;
- let message;
- if (this.model.number === 1) {
- if (availabilityZone) {
- message = this.$translate.instant(
- this.addInstance3azSuccessMessage,
- {
- instance: this.instance.name,
- zone: availabilityZone,
- },
- );
- } else {
- message = this.$translate.instant(this.addInstanceSuccessMessage, {
- instance: this.instance.name,
- });
- }
- } else {
- message = this.$translate.instant(this.addInstancesSuccessMessage);
- }
-
- if (Array.isArray(result) && result.length > 1) {
- return this.goBack(message, 'success');
+ .then(() => {
+ let messageType = null;
+ if (
+ this.model.image.isBackup() &&
+ !this.model.image.isAvailableInRegion(this.instance.region)
+ ) {
+ messageType = 'distant_backup';
+ } else if (this.isPrivateMode()) {
+ messageType = 'private_network';
}
- const { id: instanceId, ipAddresses: ips } = result;
- if (!this.isPrivateMode()) {
- return this.goBack(message, 'success');
- }
- if (this.subnetGateways?.length === 0 && this.isAttachFloatingIP) {
- return this.createGateway(instanceId, ips, message);
- }
- return this.onCreateInstanceSuccess(instanceId, ips, message);
+ return this.goBack(
+ this.$translate.instant(
+ `pci_projects_project_instances_add_success_message${
+ messageType ? `_${messageType}` : ''
+ }`,
+ ),
+ 'success',
+ );
})
.catch((error) => {
this.createInstanceError(error);
})
.finally(() => {
- if (!this.isPrivateMode()) {
- this.isLoading = false;
- } else {
- this.confirmPrivateInstanceCreation = false;
- }
- });
- }
-
- onCreateInstanceSuccess(instanceId, ips, message) {
- const filteredIp = ips.find(({ version: ipv4 }) => ipv4 === 4);
- if (this.isAttachFloatingIP && filteredIp) {
- if (this.isCreateFloatingIPClicked && !this.selectedFloatingIP.id) {
- return this.createAndAttachFloatingIp(
- instanceId,
- filteredIp.ip,
- message,
- );
- }
- if (this.selectedFloatingIP) {
- return this.associateFloatingIp(
- instanceId,
- this.selectedFloatingIP.id,
- filteredIp.ip,
- message,
- );
- }
- }
- return this.goBack(message, 'success');
- }
-
- createGateway(instanceId, ips, message) {
- this.gatewayName = getAutoGeneratedName(
- `gateway-${this.model.datacenter.name.toLowerCase()}`,
- );
-
- this.selectedGatewaySize = this.defaultGateway.size;
- this.gatewayModel = {
- name: this.gatewayName,
- model: this.selectedGatewaySize,
- };
- const network = this.selectedPrivateNetwork.regions.find(
- (networkRegion) => networkRegion.region === this.model.datacenter.name,
- );
- return this.PciProjectsProjectInstanceService.createGateway(
- this.projectId,
- this.model.datacenter.name,
- network.openstackId,
- this.selectedPrivateNetwork?.subnet[0]?.id,
- this.gatewayModel,
- )
- .then(() => this.onCreateInstanceSuccess(instanceId, ips, message))
- .catch((err) => {
this.isLoading = false;
- return this.handleError(err);
});
}
@@ -1732,47 +1611,6 @@ export default class PciInstancesAddController {
);
}
- createAndAttachFloatingIp(instanceId, ip, message) {
- this.isLoading = true;
- this.floatingIpModel = {
- ip,
- };
- return this.PciProjectsProjectInstanceService.createAndAttachFloatingIp(
- this.projectId,
- this.model.datacenter.name,
- instanceId,
- this.floatingIpModel,
- )
- .then(() => this.goBack(message, 'success'))
- .catch((err) => {
- this.handleError(err);
- })
- .finally(() => {
- this.isLoading = false;
- });
- }
-
- associateFloatingIp(instanceId, floatingIpId, ip, message) {
- this.isLoading = true;
- this.floatingIpModel = {
- floatingIpId,
- ip,
- };
- return this.PciProjectsProjectInstanceService.associateFloatingIp(
- this.projectId,
- this.model.datacenter.name,
- instanceId,
- this.floatingIpModel,
- )
- .then(() => this.goBack(message, 'success'))
- .catch((err) => {
- this.handleError(err);
- })
- .finally(() => {
- this.isLoading = false;
- });
- }
-
cancel() {
this.trackAction('cancel');
return this.goBack();
@@ -1836,12 +1674,16 @@ export default class PciInstancesAddController {
this.isAddingPrivateNetwork = true;
return this.createPrivateNetwork()
- .then(() => {
+ .then((networkId) => {
return this.PciProjectsProjectInstanceService.getLocalPrivateNetworks(
this.projectId,
this.model.datacenter.name,
).then((networks) => {
this.availableLocalPrivateNetworks = networks;
+ this.selectedPrivateNetwork = networks.find(
+ (n) => n.id === networkId,
+ );
+ this.isCreatingNewPrivateNetwork = false;
return this.getLocalPrivateNetworkSubnet()
.then(() => {
this.CucCloudMessage.success(
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/add.html b/packages/manager/modules/pci/src/projects/project/instances/add/add.html
index c338da7cec37..48d4713263a7 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/add.html
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/add.html
@@ -437,6 +437,16 @@
+
+
+
+
+
@@ -1252,45 +1262,3 @@
>
-
-
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/add.routing.js b/packages/manager/modules/pci/src/projects/project/instances/add/add.routing.js
index 45607a165f73..66b6ca6402fa 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/add.routing.js
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/add.routing.js
@@ -23,11 +23,6 @@ export default /* @ngInject */ ($stateProvider) => {
projectId,
) => PciProjectsProjectInstanceService.getPrivateNetworks(projectId),
- publicNetwork: /* @ngInject */ (
- PciProjectsProjectInstanceService,
- projectId,
- ) => PciProjectsProjectInstanceService.getPublicNetwork(projectId),
-
regions: /* @ngInject */ (
PciProjectsProjectInstanceService,
projectId,
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json
index 5c007dff65d3..426951906867 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Die erste Adresse eines CIDR als Standard-Gateway anzeigen (DHCP-Option 3)",
"pci_projects_project_network_private_create_configure_api": "Sie können Ihre IP-Bereiche über die API anpassen.",
"pci_projects_project_instances_add_numInstances_3az_help": "Wenn Sie mehrere Instanzen in einer 3AZ-Region erstellen, befinden sich alle in derselben Availability Zone, unabhängig davon, ob Sie eine Zone oder die Option „Für mich auswählen“ wählen.",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Ihnen werden {{ floatingIpPrice }} zzgl. MwSt./Stunde berechnet."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Ihnen werden {{ floatingIpPrice }} zzgl. MwSt./Stunde berechnet.",
+ "pci_projects_project_instances_add_image_distant_warning": "Die Erstellung Ihrer Instanz von einem Remote-Backup aus erfordert eine lokale Kopie des Remote-Images, die zum üblichen Preis abgerechnet wird."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json
index a4996e17adec..4f45592a5dd0 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Declare the first address of a CIDR given as the default gateway (DHCP option 3)",
"pci_projects_project_network_private_create_configure_api": "You can customise your ranges via the API.",
"pci_projects_project_instances_add_numInstances_3az_help": "Creating multiple instances in a 3-AZ region places them within the same availability zone, regardless of whether you choose a zone or the “choose for me” option.",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "You will be charged {{ floatingIpPrice }} ex. VAT/hour."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "You will be charged {{ floatingIpPrice }} ex. VAT/hour.",
+ "pci_projects_project_instances_add_image_distant_warning": "Creating your instance from a remote backup will require a local copy of the remote image, which will be invoiced at the usual rate."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json
index e44f26462b56..4c7562ea4bb1 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Anunciar la primera dirección de un CIDR determinado como puerta de enlace predeterminada (DHCP opción 3)",
"pci_projects_project_network_private_create_configure_api": "Puede personalizar los rangos desde la API.",
"pci_projects_project_instances_add_numInstances_3az_help": "Al crear varias instancias en una región 3AZ, todas estarán en la misma zona de disponibilidad, independientemente de que elija una zona o la opción «elegir por mí».",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Se facturará {{ floatingIpPrice }}/hora + IVA."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Se facturará {{ floatingIpPrice }}/hora + IVA.",
+ "pci_projects_project_instances_add_image_distant_warning": "Para crear su instancia a partir de un backup remoto, deberá realizar una copia local de la imagen remota, que se facturará al precio habitual."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json
index a1a83a8a1b0b..9b0d654fadc5 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json
@@ -20,6 +20,7 @@
"pci_projects_project_instances_add_image_title": "Sélectionnez une image",
"pci_projects_project_instances_add_image_not_available": "Ces images sont disponibles sur d'autre modèles.",
+ "pci_projects_project_instances_add_image_distant_warning": "La création de votre instance à partir d’un backup distant nécessitera une copie locale de l’image distante qui sera facturée au tarif habituel.",
"pci_projects_project_instances_add_instance_is_iops": "La sauvegarde automatique s’applique strictement aux données du disque local de votre instance. Les données des disques NVMe ne seront pas sauvegardées.",
"pci_projects_project_instances_add_instance_title": "Configurez votre instance",
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json
index a1a83a8a1b0b..d404c3827b77 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json
@@ -20,6 +20,7 @@
"pci_projects_project_instances_add_image_title": "Sélectionnez une image",
"pci_projects_project_instances_add_image_not_available": "Ces images sont disponibles sur d'autre modèles.",
+ "pci_projects_project_instances_add_image_distant_warning": "La création de votre instance à partir d’un backup distant nécessitera une copie locale de l’image distante qui sera facturée au tarif habituel.",
"pci_projects_project_instances_add_instance_is_iops": "La sauvegarde automatique s’applique strictement aux données du disque local de votre instance. Les données des disques NVMe ne seront pas sauvegardées.",
"pci_projects_project_instances_add_instance_title": "Configurez votre instance",
@@ -113,11 +114,9 @@
"pci_projects_project_instances_add_private_mode1": "Votre instance est en cours de création. La configuration de tous les composants peut prendre quelques minutes.",
"pci_projects_project_instances_add_private_mode2": "Veuillez ne pas quitter ou rafraîchir cette page car cela pourrait avoir un impact sur le processus de création.",
- "pci_projects_project_instances_add_success_message": "L'instance {{ instance }} a été ajoutée.",
- "pci_projects_project_instances_3az_add_success_message": "L'instance {{ instance }} a été ajoutée avec succès dans la zone de disponibilité : {{ zone }}",
- "pci_projects_project_instances_add_success_multiple_message": "Les instances ont été ajoutées.",
- "pci_projects_project_instances_add_error_save": "Une erreur est survenue lors de l'ajout de l'instance {{ instance }} : {{ message }}",
- "pci_projects_project_instances_add_error_multiple_save": "Une erreur est survenue lors de l'ajout des instances : {{ message }}",
+ "pci_projects_project_instances_add_success_message_private_network": "L'opération de création d'instance(s) est en cours, la création de l'instance(s) peut prendre quelques minutes",
+ "pci_projects_project_instances_add_success_message_distant_backup": "L'opération de création d'instance est en cours, la création de l'instance à partir d'un backup distant entraîne un temps de traitement plus long en fonction de la taille de l'image et de la région distante",
+ "pci_projects_project_instances_add_success_message": "L(es) opération(s) de création d'instance(s) est en cours",
"pci_projects_project_instances_add_modal_title": "Créer un réseau privé",
"pci_projects_project_instances_add_modal_description": "Merci de selectionner un nom de réseau privé et votre sous-réseau afin de créer votre nouveau réseau privé.",
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json
index ba05aef66d9a..41209ae086be 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Annunciare il primo indirizzo di un CIDR come gateway predefinito (DHCP opzione 3)",
"pci_projects_project_network_private_create_configure_api": "È possibile personalizzare le classi via API.",
"pci_projects_project_instances_add_numInstances_3az_help": "Quando crei più istanze in una Region 3-AZ, saranno tutte nella stessa zona di disponibilità, sia che tu scelga una zona o l'opzione \"Scegli per me\".",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Sarà fatturato un importo di {{ floatingIpPrice }} +IVA/ora."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Sarà fatturato un importo di {{ floatingIpPrice }} +IVA/ora.",
+ "pci_projects_project_instances_add_image_distant_warning": "La creazione della tua istanza a partire da un backup remoto richiederà una copia locale dell'immagine remota, che sarà fatturata alla tariffa abituale."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json
index 79ece0c503da..dd803dd9b101 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Ustaw pierwszy adres danego CIDR jako bramę domyślną (DHCP opcja 3)",
"pci_projects_project_network_private_create_configure_api": "Możesz dostosować zakresy adresów za pomocą API.",
"pci_projects_project_instances_add_numInstances_3az_help": "Jeśli tworzysz wiele instancji w regionie 3AZ, wszystkie znajdą się w tej samej strefie – niezależnie od tego, czy wybierzesz ją samodzielnie, czy skorzystasz z opcji „wybierz za mnie”.",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Otrzymasz fakturę na kwotę {{floatingIpPrice}} netto/godz."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Otrzymasz fakturę na kwotę {{floatingIpPrice}} netto/godz.",
+ "pci_projects_project_instances_add_image_distant_warning": "Utworzenie instancji z kopii zapasowej w zdalnym regionie wymaga wcześniejszego skopiowania obrazu do lokalnej przestrzeni. Operacja ta będzie zafakturowana zgodnie ze standardowym cennikiem."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json
index cde61cd194b0..f9ca006d0abd 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json
+++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json
@@ -140,5 +140,6 @@
"pci_projects_project_network_private_create_announce_first_address": "Anunciar o primeiro endereço de um CIDR dado como gateway predefinido (DHCP opção 3)",
"pci_projects_project_network_private_create_configure_api": "Pode personalizar os seus intervalos através da API.",
"pci_projects_project_instances_add_numInstances_3az_help": "Quando criar várias instâncias numa região 3-AZ, todas elas estarão na mesma zona de disponibilidade, quer opte por uma zona ou pela opção \"escolher por mim\".",
- "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Será faturada a {{ floatingIpPrice }} + IVA/hora."
+ "pci_projects_project_instances_add_billing_floating_ip_detail_price_hourly": "Será faturada a {{ floatingIpPrice }} + IVA/hora.",
+ "pci_projects_project_instances_add_image_distant_warning": "A criação da sua instância a partir de um backup remoto exigirá uma cópia local da imagem remota, que será faturada ao preço habitual."
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.controller.js b/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.controller.js
index 8196156e4d36..889216f94ae8 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.controller.js
+++ b/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.controller.js
@@ -1,21 +1,35 @@
import get from 'lodash/get';
+import { formatISO } from 'date-fns';
import { FLAVORS_TYPE, HOURS_PER_MONTH } from './backup.contants';
+import {
+ LOCAL_ZONE_REGION,
+ ONE_AZ_REGION,
+ THREE_AZ_REGION,
+} from '../../../project.constants';
export default class PciInstanceBackupController {
/* @ngInject */
constructor(
$filter,
$translate,
+ $scope,
+ $q,
CucCloudMessage,
PciProjectsProjectInstanceService,
+ OvhApiCloudProjectRegion,
+ ovhManagerRegionService,
atInternet,
coreConfig,
) {
this.$filter = $filter;
this.$translate = $translate;
+ this.$scope = $scope;
+ this.$q = $q;
this.CucCloudMessage = CucCloudMessage;
this.PciProjectsProjectInstanceService = PciProjectsProjectInstanceService;
+ this.OvhApiCloudProjectRegion = OvhApiCloudProjectRegion;
+ this.ovhManagerRegionService = ovhManagerRegionService;
this.atInternet = atInternet;
this.FLAVORS_TYPE = FLAVORS_TYPE;
this.coreConfig = coreConfig;
@@ -23,28 +37,116 @@ export default class PciInstanceBackupController {
$onInit() {
this.backup = {
- name: `${this.instance.name} ${this.$filter('date')(
- new Date(),
- 'short',
- )}`,
+ name: `${this.instance.name} ${formatISO(new Date())}`,
+ distantRegion: null,
+ distantSnapshotName: `${this.instance.name} ${formatISO(new Date())}`,
};
- this.isLoading = false;
+ this.distantSnapshot = false;
+
+ this.isLoading = true;
+ this.$q
+ .all([
+ this.PciProjectsProjectInstanceService.getDistantBackupAvailableRegions(
+ this.projectId,
+ this.instance.region,
+ ).then((regions) => {
+ this.distantBackupRegions = regions
+ .map((r) => {
+ let badgeClass = '';
+ let badgeName = '';
+
+ if (r.type === THREE_AZ_REGION) {
+ badgeClass = 'oui-3az';
+ badgeName = 'pci_project_flavors_zone_3az_region';
+ } else if (r.type === ONE_AZ_REGION) {
+ badgeClass = 'oui-1az';
+ badgeName = 'pci_project_flavors_zone_global_region';
+ } else if (r.type === LOCAL_ZONE_REGION) {
+ badgeClass = 'oui-localzone';
+ badgeName = 'pci_project_flavors_zone_localzone';
+ }
+
+ return {
+ ...r,
+ badgeClass,
+ badgeName,
+ };
+ })
+ .sort((a, b) =>
+ a.microRegion.text.localeCompare(b.microRegion.text),
+ );
+ }),
+ ])
+ .then(() => {
+ this.isLoading = false;
+ });
+
+ const updateShowActivateRegionWarning = () => {
+ this.showActivateRegionWarning =
+ this.distantSnapshot &&
+ this.shouldEnableRegion(this.backup.distantRegion);
+ };
+
+ this.$scope.$watch(
+ '$ctrl.backup.distantRegion',
+ updateShowActivateRegionWarning,
+ );
+ this.$scope.$watch(
+ '$ctrl.distantSnapshot',
+ updateShowActivateRegionWarning,
+ );
}
createBackup() {
this.isLoading = true;
this.trackBackupCreate();
- return this.PciProjectsProjectInstanceService.createBackup(
- this.projectId,
- this.instance,
- this.backup,
+
+ const backupToCreate = {
+ ...this.backup,
+ };
+ if (!this.distantSnapshot) {
+ delete backupToCreate.distantSnapshotName;
+ delete backupToCreate.distantRegion;
+ }
+
+ return (this.shouldEnableRegion(backupToCreate.distantRegion)
+ ? this.OvhApiCloudProjectRegion.v6()
+ .addRegion(
+ { serviceName: this.projectId },
+ { region: backupToCreate.distantRegion },
+ )
+ .$promise.then(() => {
+ return this.$q.all([
+ this.OvhApiCloudProjectRegion.AvailableRegions()
+ .v6()
+ .resetQueryCache(),
+ this.PciProjectsProjectInstanceService.getSnapshotAvailability(
+ this.projectId,
+ this.catalogEndpoint,
+ ).then((snapshotAvailability) => {
+ this.snapshotAvailability[backupToCreate.distantRegion] =
+ snapshotAvailability[backupToCreate.distantRegion];
+ }),
+ ]);
+ })
+ : Promise.resolve()
)
+ .then(() => {
+ return this.PciProjectsProjectInstanceService.createBackup(
+ this.projectId,
+ this.instance,
+ backupToCreate,
+ );
+ })
.then(() =>
this.goBack(
this.$translate.instant(
- 'pci_projects_project_instances_instance_backup_success_message',
+ backupToCreate.distantRegion
+ ? 'pci_projects_project_instances_instance_backup_with_distant_success_message'
+ : 'pci_projects_project_instances_instance_backup_success_message',
{
- backup: this.backup.name,
+ backup: backupToCreate.name,
+ distantName: backupToCreate.distantSnapshotName,
},
),
),
@@ -55,7 +157,7 @@ export default class PciInstanceBackupController {
'pci_projects_project_instances_instance_backup_error_backup',
{
message: get(err, 'data.message', null),
- backup: this.backup.name,
+ backup: backupToCreate.name,
},
),
'error',
@@ -86,4 +188,16 @@ export default class PciInstanceBackupController {
},
).format(value * HOURS_PER_MONTH)}`;
}
+
+ getRegionGroup(region) {
+ return region.continent;
+ }
+
+ shouldEnableRegion(regionName) {
+ if (!regionName) return false;
+
+ const region = this.distantBackupRegions.find((r) => r.name === regionName);
+
+ return !!region && !region.enabled;
+ }
}
diff --git a/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.html b/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.html
index c3106589951a..8563763a1b9e 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.html
+++ b/packages/manager/modules/pci/src/projects/project/instances/instance/backup/backup.html
@@ -15,12 +15,10 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
data-type="warning"
data-ng-if="$ctrl.editInstance.imageId && $ctrl.instance.image.id !== $ctrl.editInstance.imageId && $ctrl.model.isImageCompatible"
>
-
+
i.isShelving(),
diff --git a/packages/manager/modules/pci/src/projects/project/instances/instances.service.js b/packages/manager/modules/pci/src/projects/project/instances/instances.service.js
index f1e0df13f2e7..33548c06e3f4 100644
--- a/packages/manager/modules/pci/src/projects/project/instances/instances.service.js
+++ b/packages/manager/modules/pci/src/projects/project/instances/instances.service.js
@@ -17,12 +17,14 @@ import {
BANDWIDTH_LIMIT,
BANDWIDTH_OUT_INVOICE,
DEFAULT_IP,
+ DISTANT_BACKUP_FEATURE,
FLAVORS_WITHOUT_ADDITIONAL_IPS,
FLAVORS_WITHOUT_AUTOMATED_BACKUP,
FLAVORS_WITHOUT_SOFT_REBOOT,
FLAVORS_WITHOUT_SUSPEND,
FLAVORS_WITHOUT_VNC,
} from './instances.constants';
+import { ONE_AZ_REGION, THREE_AZ_REGION } from '../project.constants';
/* eslint class-methods-use-this: ["error", { "exceptMethods": ["getBaseApiRoute"] }] */
export default class PciProjectInstanceService {
@@ -47,6 +49,7 @@ export default class PciProjectInstanceService {
OvhApiOrderCatalogPublic,
PciProjectRegions,
PciProject,
+ ovhFeatureFlipping,
) {
this.$http = $http;
this.$q = $q;
@@ -71,6 +74,7 @@ export default class PciProjectInstanceService {
this.FLAVORS_WITHOUT_VNC = FLAVORS_WITHOUT_VNC;
this.FLAVORS_WITHOUT_ADDITIONAL_IPS = FLAVORS_WITHOUT_ADDITIONAL_IPS;
this.FLAVORS_WITHOUT_AUTOMATED_BACKUP = FLAVORS_WITHOUT_AUTOMATED_BACKUP;
+ this.ovhFeatureFlipping = ovhFeatureFlipping;
this.licensePriceFormatter = new Intl.NumberFormat(
this.coreConfig.getUserLocale().replace('_', '-'),
@@ -251,6 +255,18 @@ export default class PciProjectInstanceService {
).$promise;
}
+ reinstallFromRegion(
+ projectId,
+ instanceRegion,
+ instanceId,
+ { imageId, region },
+ ) {
+ return this.$http.post(
+ `/cloud/project/${projectId}/region/${instanceRegion}/instance/${instanceId}/reinstall`,
+ { imageId, imageRegionName: region },
+ );
+ }
+
start(projectId, instance) {
return this.$http.post(
`${this.getBaseApiRoute(projectId, instance)}/instance/${
@@ -378,7 +394,11 @@ export default class PciProjectInstanceService {
);
}
- createBackup(projectId, { id: instanceId }, { name: snapshotName }) {
+ createBackup(
+ projectId,
+ { id: instanceId },
+ { name: snapshotName, distantRegion, distantSnapshotName },
+ ) {
return this.OvhApiCloudProjectInstance.v6().backup(
{
serviceName: projectId,
@@ -386,6 +406,8 @@ export default class PciProjectInstanceService {
},
{
snapshotName,
+ distantRegionName: distantRegion,
+ distantSnapshotName,
},
).$promise;
}
@@ -618,6 +640,47 @@ export default class PciProjectInstanceService {
});
}
+ getDistantBackupAvailableRegions(projectId, instanceRegionName) {
+ return Promise.all([
+ this.getProductAvailability(projectId, undefined, 'snapshot'),
+ this.ovhFeatureFlipping.checkFeatureAvailability(DISTANT_BACKUP_FEATURE),
+ ]).then(([productAvailability, feature]) => {
+ if (!feature.isFeatureAvailable(DISTANT_BACKUP_FEATURE)) return [];
+
+ const instancePlan = productAvailability.plans.find(
+ (p) =>
+ p.code.startsWith('snapshot.consumption') &&
+ p.regions.some((r) => r.name === instanceRegionName),
+ );
+
+ const instanceRegion = instancePlan?.regions.find(
+ (r) => r.name === instanceRegionName,
+ );
+
+ if (
+ !instanceRegion ||
+ (instanceRegion.type !== THREE_AZ_REGION &&
+ instanceRegion.type !== ONE_AZ_REGION)
+ )
+ return [];
+
+ const regions = productAvailability.plans
+ .filter((p) => p.code.startsWith('snapshot.consumption'))
+ .flatMap((p) => p.regions);
+
+ return regions
+ .filter(
+ (r) =>
+ r.name !== instanceRegionName &&
+ (r.type === THREE_AZ_REGION || r.type === ONE_AZ_REGION),
+ )
+ .map((r) => ({
+ ...r,
+ ...this.ovhManagerRegionService.getRegion(r.name),
+ }));
+ });
+ }
+
getProductAvailability(
projectId,
ovhSubsidiary = this.coreConfig.getUser().ovhSubsidiary,
@@ -650,67 +713,40 @@ export default class PciProjectInstanceService {
save(
serviceName,
+ region,
{
autobackup,
flavorId,
imageId,
+ imageRegionName,
monthlyBilling,
name,
- networks,
- region,
- sshKeyId,
+ network,
+ sshKey,
userData,
availabilityZone,
},
number = 1,
- isPrivateMode,
) {
- const saveInstanceNamespace = 'instance-creation';
- const status = 'ACTIVE';
- if (number > 1) {
- return this.$http
- .post(`/cloud/project/${serviceName}/instance/bulk`, {
- autobackup,
- flavorId,
- imageId,
- monthlyBilling,
- name,
- networks,
- region,
- sshKeyId,
- userData,
- number,
- availabilityZone,
- })
- .then(({ data }) => {
- return data;
- });
- }
return this.$http
- .post(`/cloud/project/${serviceName}/instance`, {
+ .post(`/cloud/project/${serviceName}/region/${region}/instance`, {
+ bulk: number,
autobackup,
- flavorId,
- imageId,
- monthlyBilling,
+ flavor: {
+ id: flavorId,
+ },
+ bootFrom: {
+ imageId,
+ imageRegionName,
+ },
+ billingPeriod: monthlyBilling ? 'monthly' : 'hourly',
name,
- networks,
- region,
- sshKeyId,
+ network,
+ sshKey: sshKey ? { name: sshKey.name } : null,
userData,
availabilityZone,
})
.then(({ data }) => {
- if (isPrivateMode) {
- const url = `/cloud/project/${serviceName}/instance/${data.id}`;
- return this.checkOperationStatus(
- url,
- saveInstanceNamespace,
- status,
- ).then((res) => {
- this.Poller.kill({ namespace: saveInstanceNamespace });
- return res;
- });
- }
return data;
});
}
@@ -1007,7 +1043,7 @@ export default class PciProjectInstanceService {
)
.then(({ resourceId }) => {
this.Poller.kill({ namespace: 'private-network-creation' });
- return this.getCreatedSubnet(projectId, region, resourceId);
+ return resourceId;
});
}
@@ -1025,14 +1061,6 @@ export default class PciProjectInstanceService {
);
}
- getCreatedSubnet(projectId, region, networkId) {
- return this.$http
- .get(
- `/cloud/project/${projectId}/region/${region}/network/${networkId}/subnet`,
- )
- .then(({ data }) => data);
- }
-
associateGatewayToNetwork(projectId, region, gatewayId, subnetId) {
return this.$http
.post(
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.component.js b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.component.js
index 31acfca2af64..aba8e8f5bd38 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.component.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.component.js
@@ -8,7 +8,6 @@ export default {
excludeCategories: '<',
backup: '<',
goBack: '<',
- publicNetworks: '<',
privateNetworks: '<',
projectId: '<',
quota: '<',
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.controller.js b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.controller.js
index b576c4422789..74c1e6681aa0 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.controller.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.controller.js
@@ -5,7 +5,6 @@ import Datacenter from '../../../../../components/project/regions-list/datacente
import Quota from '../../../../../components/project/instance/quota/quota.class';
import { PATTERN } from '../../../../../components/project/instance/name/constants';
import Instance from '../../../../../components/project/instance/instance.class';
-import { BAREMETAL_LABEL, PUBLIC_NETWORK_TYPE_NAMES } from './add.constants';
import { THREE_AZ_REGION } from '../../../project.constants';
export default class PciInstancesAddController {
@@ -28,7 +27,7 @@ export default class PciInstancesAddController {
imageId: this.backup.id,
region: this.backup.region,
monthlyBilling: false,
- sshKeyId: null,
+ sshKey: null,
});
this.region = new Datacenter({
@@ -141,30 +140,6 @@ export default class PciInstancesAddController {
this.messages = this.messageHandler.getMessages();
}
- isBareMetalBackup() {
- return !!this.backup.type.includes(BAREMETAL_LABEL);
- }
-
- onPrivateNetworkChange(modelValue) {
- const networkId = get(modelValue, 'id');
- const publicNetwork = this.publicNetworks?.find((network) => {
- const networkName = this.isBareMetalBackup()
- ? PUBLIC_NETWORK_TYPE_NAMES.BAREMETAL
- : PUBLIC_NETWORK_TYPE_NAMES.CLASSIC;
- return network.name === networkName;
- });
- this.instance.networks = networkId
- ? [
- {
- networkId,
- },
- {
- networkId: publicNetwork?.id,
- },
- ]
- : [];
- }
-
create() {
this.isLoading = true;
@@ -172,26 +147,54 @@ export default class PciInstancesAddController {
this.instance.userData = null;
}
- this.instance.sshKeyId = get(this.model.sshKey, 'id');
+ this.instance.sshKey = this.model.sshKey;
- return this.PciProjectsProjectInstanceService.save(
- this.projectId,
- this.instance,
- this.model.number,
+ return (this.model.privateNetwork.id
+ ? this.PciProjectsProjectInstanceService.getSubnets(
+ this.projectId,
+ this.model.privateNetwork.id,
+ )
+ : Promise.resolve()
)
- .then(() => {
- const message =
- this.model.number === 1
- ? this.$translate.instant(
- 'pci_projects_project_instances_backup_add_success_message',
- {
- instance: this.instance.name,
+ .then((data) => {
+ const network = {
+ private: this.model.privateNetwork.id
+ ? {
+ network: {
+ id: this.model.privateNetwork.regions.find(
+ (r) => r.region === this.instance.region,
+ ).openstackId,
+ subnetId: data.find(
+ (subnet) =>
+ subnet.ipPools[0].region === this.instance.region,
+ )?.id,
},
- )
- : this.$translate.instant(
- 'pci_projects_project_instances_backup_add_success_multiple_message',
- );
- return this.goBack(message);
+ }
+ : null,
+ public: true,
+ };
+
+ return this.PciProjectsProjectInstanceService.save(
+ this.projectId,
+ this.instance.region,
+ { ...this.instance, network },
+ this.model.number,
+ );
+ })
+ .then(() => {
+ let messageType = null;
+ if (this.model.privateNetwork.id) {
+ messageType = 'private_network';
+ }
+
+ return this.goBack(
+ this.$translate.instant(
+ `pci_projects_project_instances_backup_add_success_message${
+ messageType ? `_${messageType}` : ''
+ }`,
+ ),
+ 'success',
+ );
})
.catch((error) => {
let message;
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.html b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.html
index a8bbd256556c..6908b2863a32 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.html
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.html
@@ -143,7 +143,6 @@
data-items="$ctrl.availablePrivateNetworks"
data-match="name"
data-searchable
- data-on-change="$ctrl.onPrivateNetworkChange(modelValue)"
>
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.routing.js b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.routing.js
index f6dd3e924bda..d87665cbf342 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.routing.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/add.routing.js
@@ -35,11 +35,6 @@ export default /* @ngInject */ ($stateProvider) => {
projectId,
}),
- publicNetworks: /* @ngInject */ (
- PciProjectsProjectInstanceService,
- projectId,
- ) => PciProjectsProjectInstanceService.getPublicNetwork(projectId),
-
privateNetworks: /* @ngInject */ (
backup,
PciProjectsProjectInstanceService,
@@ -64,7 +59,7 @@ export default /* @ngInject */ ($stateProvider) => {
});
},
- goBack: /* @ngInject */ (goToInstanceBackups) => goToInstanceBackups,
+ goBack: /* @ngInject */ (goToInstances) => goToInstances,
},
});
};
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/translations/Messages_fr_FR.json
index 4dca2ac813cb..a21d4f4d2e91 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/translations/Messages_fr_FR.json
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/add/translations/Messages_fr_FR.json
@@ -17,8 +17,10 @@
"pci_projects_project_instances_backup_add_cancel": "Annuler",
"pci_projects_project_instances_backup_add_save_form": "Création de l'instance en cours",
"pci_projects_project_instances_backup_add_save_multiple_form": "Création des instances en cours",
- "pci_projects_project_instances_backup_add_success_message": "L'instance {{ instance }} a été ajoutée.",
- "pci_projects_project_instances_backup_add_success_multiple_message": "Les instances ont été ajoutées.",
+
+ "pci_projects_project_instances_backup_add_success_message_private_network": "L'opération de création d'instance(s) est en cours, la création de l'instance(s) peut prendre quelques minutes",
+ "pci_projects_project_instances_backup_add_success_message": "L(es) opération(s) de création d'instance(s) est en cours",
+
"pci_projects_project_instances_backup_add_error_save": "Une erreur est survenue lors de l'ajout de l'instance {{ instance }} : {{ message }}",
"pci_projects_project_instances_backup_add_error_multiple_save": "Une erreur est survenue lors de l'ajout des instances : {{ message }}",
"pci_projects_project_instances_backup_add_flex": "Instance flexible",
diff --git a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/instance-backups.routing.js b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/instance-backups.routing.js
index dff61bbc28f0..c4a69b9c179e 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/instance-backups/instance-backups.routing.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/instance-backups/instance-backups.routing.js
@@ -68,6 +68,30 @@ export default /* @ngInject */ ($stateProvider) => {
return promise;
},
+ goToInstances: /* @ngInject */ (CucCloudMessage, $state, projectId) => (
+ message = false,
+ type = 'success',
+ ) => {
+ const reload = message && type === 'success';
+
+ const promise = $state.go(
+ 'pci.projects.project.instances',
+ {
+ projectId,
+ },
+ {
+ reload,
+ },
+ );
+
+ if (message) {
+ promise.then(() =>
+ CucCloudMessage[type](message, 'pci.projects.project.instances'),
+ );
+ }
+
+ return promise;
+ },
breadcrumb: /* @ngInject */ ($translate) =>
$translate
.refresh()