Skip to content

Commit f9d3771

Browse files
lolottetheclashlolottetheclash
committed
fix(compute): update metal instance handling
ref;: #TAPC-6452 Signed-off-by: Lauren Olivier <lauren.olivier@corp.ovh.com>
1 parent e4cb8df commit f9d3771

18 files changed

Lines changed: 1018 additions & 52 deletions

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_de_DE.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
"pci_instance_creation_network_add_new_vlanID_warning": "Die VLAN-ID 0 wird standardmäßig für andere Produkte verwendet, auch außerhalb des Public-Cloud-Universums. Private IPs müssen mit Bedacht verwaltet werden.",
120120
"pci_instance_creation_network_add_new_cidr_error": "Gültige IP-Adresse angeben",
121121
"pci_instance_creation_network_add_new_vlanId_error": "Die VLAN-ID muss zwischen 0 und 4000 liegen. Bitte überprüfen Sie den eingegebenen Wert, bevor Sie fortfahren.",
122+
"pci_instance_creation_network_metal_dropdown_tooltip": "Metal Instances sind nur mit einem privaten Netzwerk kompatibel, dessen vLAN-ID 0 ist.",
123+
"pci_instance_creation_network_metal_vlanid_tooltip": "Der vLAN-ID-Wert bei Metal Instances ist immer auf 0 festgelegt.",
122124
"pci_instance_creation_create_my_instance": "Instanz starten",
123125
"pci_instance_creation_select_billing_choice_title": "Abrechnung",
124126
"pci_instance_creation_windows_image_hourly_price": "+ {{ price }} zzgl. MwSt./Stunde",
@@ -165,12 +167,12 @@
165167
"pci_instance_creation_network_public_connectivity_help_basic_ip": "<h6>Basic IP</h6><p>Eine Basic IP ermöglicht eingehende und ausgehende Konnektivität ohne Nutzungseinschränkungen. Diese IP ist nicht persistent und wird nach der Löschung der zugehörigen Instanz neu zugewiesen. Sie kann keiner anderen Instanz zugewiesen werden.</p>",
166168
"pci_instance_creation_network_add_public_connectivity": {
167169
"title": "Öffentliche Konnektivität zuweisen",
168-
"description": "<p>Die Zuweisung einer öffentlichen IP-Adresse ermöglicht den Zugriff auf Ihre Instanz von außerhalb des OVHcloud Netzwerks.<br/><span>Die Floating IP wird am Ende der Konfiguration erstellt.</span></p>",
170+
"description": "<p>Die Zuweisung einer öffentlichen IP-Adresse ermöglicht den Zugriff auf Ihre Instanz von außerhalb des OVHcloud Netzwerks.</p>",
169171
"toggle_label": "Öffentliche IP-Adresse zuweisen",
170172
"basic_ip_label": "Basic Public IP (an Instanz gebunden) – <sb>{{ price }}</sb>",
171173
"basic_ip_description": "Eine Basic Public IP ist eine IP-Adresse, die nur für die Lebensdauer der Ressource bestehen bleibt. ",
172174
"basic_ip_warning": "Die Aktivierung der Basic Public IP ist mit einem Gateway nicht kompatibel.",
173-
"floating_ip_label": "Floating IP erstellen (wiederverwendbar) – <sb>{{ price }}</sb>",
175+
"floating_ip_label": "Floating IP erstellen (wiederverwendbar)",
174176
"floating_ip_description": "Durch das Reservieren einer Floating IP wird die Adresse Ihrem Projekt zugewiesen, bis Sie sie explizit freigeben. ",
175177
"floating_ip_warning": "Wenn Sie diese Option auswählen, werden wir Ihnen ein Gateway der Größe {{ size }} zuweisen.",
176178
"floating_ip_create_new_label": "Eine neue erstellen – <sb>{{ price }}</sb>",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_en_GB.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
"pci_instance_creation_network_add_new_vlanID_warning": "VLAN id 0 is used by default for other products, including non-Public Cloud products and solutions. Private IPs must be carefully managed",
120120
"pci_instance_creation_network_add_new_cidr_error": "Please enter a valid IP address",
121121
"pci_instance_creation_network_add_new_vlanId_error": "The vLAN ID must be between 0 and 4000. Please check the value entered before continuing.",
122+
"pci_instance_creation_network_metal_dropdown_tooltip": "Metal Instances are only compatible with a private network whose vLAN ID is 0.",
123+
"pci_instance_creation_network_metal_vlanid_tooltip": "The vLAN ID value on Metal Instances is always set to 0.",
122124
"pci_instance_creation_create_my_instance": "Launch my instance",
123125
"pci_instance_creation_select_billing_choice_title": "Billing",
124126
"pci_instance_creation_windows_image_hourly_price": "+ {{price}} ex. VAT/hour",
@@ -165,12 +167,12 @@
165167
"pci_instance_creation_network_public_connectivity_help_basic_ip": "<h6>Basic IP</h6><p>A Basic IP allows inbound and outbound connectivity with no usage restrictions. This IP is not persistent and is reallocated after the associated instance is deleted. It cannot be allocated to another instance.</p>",
166168
"pci_instance_creation_network_add_public_connectivity": {
167169
"title": "Assign public connectivity",
168-
"description": "<p>By assigning a public IP address, you can access your instance from outside the OVHcloud network.<br/><span>The Floating IP will be created at the end of the configuration.</span></p>",
170+
"description": "<p>By assigning a public IP address, you can access your instance from outside the OVHcloud network.</p>",
169171
"toggle_label": "Assign a public IP",
170172
"basic_ip_label": "Basic Public IP (linked to the instance) - <sb>{{ price }}</sb>",
171173
"basic_ip_description": "A basic public IP is an IP address that only lasts as long as the lifetime of the resource. ",
172174
"basic_ip_warning": "Enabling a basic public IP is not compatible with a gateway.",
173-
"floating_ip_label": "Create a Floating IP (Reusable) - <sb>{{ price }}</sb>",
175+
"floating_ip_label": "Create a Floating IP (Reusable)",
174176
"floating_ip_description": "Reserving a floating IP address assigns the address to your project until you explicitly release it. ",
175177
"floating_ip_warning": "By selecting this option, we will assign you a {{ size }} sized gateway.",
176178
"floating_ip_create_new_label": "Create new - <sb>{{ price }}</sb>",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_es_ES.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
"pci_instance_creation_network_add_new_vlanID_warning": "La VLAN ID 0 se utiliza por defecto en otros productos, inclusive fuera del universo Public Cloud. Por favor, preste atención al gestionar sus IP privadas.",
120120
"pci_instance_creation_network_add_new_cidr_error": "Introduzca una dirección IP válida",
121121
"pci_instance_creation_network_add_new_vlanId_error": "El VLAN ID debe estar comprendido entre 0 y 4000. Compruebe el valor introducido antes de continuar.",
122+
"pci_instance_creation_network_metal_dropdown_tooltip": "Las Instancias Metal solo son compatibles con una red privada cuyo vLAN ID sea 0.",
123+
"pci_instance_creation_network_metal_vlanid_tooltip": "El valor del vLAN ID en las Instancias Metal siempre está fijado en 0.",
122124
"pci_instance_creation_create_my_instance": "Lanzar mi instancia",
123125
"pci_instance_creation_select_billing_choice_title": "Facturación",
124126
"pci_instance_creation_windows_image_hourly_price": "+ {{price}}/hora + IVA",
@@ -165,12 +167,12 @@
165167
"pci_instance_creation_network_public_connectivity_help_basic_ip": "<h6>Basic IP</h6><p>Una Basic IP permite la conectividad entrante y saliente sin restricciones de uso. Esta IP no es persistente y se reasigna tras la eliminación de la instancia asociada. No es posible asignarla a otra instancia.</p>",
166168
"pci_instance_creation_network_add_public_connectivity": {
167169
"title": "Asignar conectividad pública",
168-
"description": "<p>La asignación de una dirección IP pública permite el acceso a su instancia desde fuera de la red de OVHcloud.<br/><span>La Floating IP se creará una vez completado el proceso de configuración.</span></p>",
170+
"description": "<p>La asignación de una dirección IP pública permite el acceso a su instancia desde fuera de la red de OVHcloud.</p>",
169171
"toggle_label": "Asignar una IP pública",
170172
"basic_ip_label": "Basic Public IP (Asociada a la instancia) - <sb>{{ price }}</sb>",
171173
"basic_ip_description": "Una IP pública básica es una dirección IP que no persiste más allá de la duración del recurso. ",
172174
"basic_ip_warning": "La activación de la Basic Public IP no es compatible con un servicio Gateway.",
173-
"floating_ip_label": "Crear una Floating IP (Reutilizable) - <sb>{{ price }}</sb>",
175+
"floating_ip_label": "Crear una Floating IP (Reutilizable)",
174176
"floating_ip_description": "La reserva de una dirección IP flotante asigna la dirección a su proyecto hasta que la libere explícitamente. ",
175177
"floating_ip_warning": "Si selecciona esta opción, le asignaremos un servicio Gateway de tamaño {{ size }}.",
176178
"floating_ip_create_new_label": "Crear una nueva - <sb>{{ price }}</sb>",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_fr_CA.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
"pci_instance_creation_network_add_new_vlanID_warning": "Le VLAN id 0 est utilisé par défaut sur d'autres produits y compris en dehors de l'univers Public Cloud. Les IP privées doivent être gérées avec attention",
146146
"pci_instance_creation_network_add_new_cidr_error": "Veuillez saisir une adresse IP valide",
147147
"pci_instance_creation_network_add_new_vlanId_error": "Le vLAN ID doit être compris entre 0 et 4000. Veuillez vérifier la valeur saisie avant de continuer.",
148+
"pci_instance_creation_network_metal_dropdown_tooltip": "Les Instances Metal ne sont compatibles qu'avec un réseau privé dont le vLAN ID est 0.",
149+
"pci_instance_creation_network_metal_vlanid_tooltip": "La valeur du vLAN ID sur les Instances Metal est toujours fixée à 0.",
148150
"pci_instance_creation_network_full_private_warning": "<p>Cette instance n'aura pas d'accès public à Internet. Vous ne pourrez pas vous y connecter ni atteindre des services externes, sauf si vous utilisez un bastion ou ajoutez une passerelle.</p><p>Cela améliore la sécurité mais limite la connectivité. Sur vos instances Windows , <semibold>vous devez activer la licence manuellement afin d'avoir accès à tous les services</semibold>.</p><Link>Consulter le guide</Link>",
149151
"pci_instance_creation_select_billing_hourly": "Horaire",
150152
"pci_instance_creation_select_billing_monthly": "Mensuel",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_fr_FR.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
"pci_instance_creation_network_add_new_vlanID_warning": "Le VLAN id 0 est utilisé par défaut sur d'autres produits y compris en dehors de l'univers Public Cloud. Les IP privées doivent être gérées avec attention",
146146
"pci_instance_creation_network_add_new_cidr_error": "Veuillez saisir une adresse IP valide",
147147
"pci_instance_creation_network_add_new_vlanId_error": "Le vLAN ID doit être compris entre 0 et 4000. Veuillez vérifier la valeur saisie avant de continuer.",
148+
"pci_instance_creation_network_metal_dropdown_tooltip": "Les Instances Metal ne sont compatibles qu'avec un réseau privé dont le vLAN ID est 0.",
149+
"pci_instance_creation_network_metal_vlanid_tooltip": "La valeur du vLAN ID sur les Instances Metal est toujours fixée à 0.",
148150
"pci_instance_creation_network_full_private_warning": "<p>Cette instance n'aura pas d'accès public à Internet. Vous ne pourrez pas vous y connecter ni atteindre des services externes, sauf si vous utilisez un bastion ou ajoutez une passerelle.</p><p>Cela améliore la sécurité mais limite la connectivité. Sur vos instances Windows , <semibold>vous devez activer la licence manuellement afin d'avoir accès à tous les services</semibold>.</p><Link>Consulter le guide</Link>",
149151
"pci_instance_creation_select_billing_hourly": "Horaire",
150152
"pci_instance_creation_select_billing_monthly": "Mensuel",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_it_IT.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
"pci_instance_creation_network_add_new_vlanID_warning": "Il VLAN id 0 è utilizzato di default su altri prodotti, anche al di fuori dell'universo Public Cloud. Gli IP privati devono essere gestiti con attenzione",
120120
"pci_instance_creation_network_add_new_cidr_error": "Inserisci un indirizzo IP valido",
121121
"pci_instance_creation_network_add_new_vlanId_error": "Il vLAN ID deve essere compreso tra 0 e 4000. Verifica il valore inserito prima di continuare.",
122+
"pci_instance_creation_network_metal_dropdown_tooltip": "Le Istanze Metal sono compatibili solo con una rete privata il cui vLAN ID è 0.",
123+
"pci_instance_creation_network_metal_vlanid_tooltip": "Il valore del vLAN ID sulle Istanze Metal è sempre fissato a 0.",
122124
"pci_instance_creation_create_my_instance": "Avvia l’istanza",
123125
"pci_instance_creation_select_billing_choice_title": "Fatturazione",
124126
"pci_instance_creation_windows_image_hourly_price": "+ {{ price }} + IVA/ora",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_pl_PL.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118
"pci_instance_creation_network_add_new_used_vlanID_warning": "Użycie tego samego identyfikatora VLAN dla kilku prywatnych sieci wymaga ostrożnego zarządzania prywatnymi adresami IP. Sposobem na rozwiązanie tego problemu może być użycie nienakładającej się puli alokacji DHCP.",
119119
"pci_instance_creation_network_add_new_vlanID_warning": "Identyfikator VLAN 0 jest domyślnie używany w innych produktach, w tym także tych spoza środowiska Public Cloud. Prywatnymi adresami IP należy zarządzać ostrożnie.",
120120
"pci_instance_creation_network_add_new_cidr_error": "Wprowadź poprawny adres IP",
121+
"pci_instance_creation_network_metal_dropdown_tooltip": "Instancje Metal są kompatybilne tylko z siecią prywatną, której vLAN ID wynosi 0.",
122+
"pci_instance_creation_network_metal_vlanid_tooltip": "Wartość vLAN ID w Instancjach Metal jest zawsze ustawiona na 0.",
121123
"pci_instance_creation_network_add_new_vlanId_error": "VLAN ID musi zawierać się w przedziale między 0 a 4000. Sprawdź podaną wartość, zanim przejdziesz dalej.",
122124
"pci_instance_creation_create_my_instance": "Uruchom instancję",
123125
"pci_instance_creation_select_billing_choice_title": "Płatności",
@@ -165,12 +167,12 @@
165167
"pci_instance_creation_network_public_connectivity_help_basic_ip": "<h6>Basic IP</h6><p>Basic IP umożliwia łączność przychodzącą i wychodzącą bez ograniczeń użytkowania. Ten adres IP nie jest trwały i jest ponownie przydzielany po usunięciu powiązanej instancji. Nie można go przypisać do innej instancji.</p>",
166168
"pci_instance_creation_network_add_public_connectivity": {
167169
"title": "Przypisz połączenie z siecią publiczną",
168-
"description": "<p>Przypisanie publicznego adresu IP umożliwia dostęp do Twojej instancji spoza sieci OVHcloud.<br/><span>Adres Floating IP zostanie utworzony na koniec konfiguracji.</span></p>",
170+
"description": "<p>Przypisanie publicznego adresu IP umożliwia dostęp do Twojej instancji spoza sieci OVHcloud.</p>",
169171
"toggle_label": "Przypisz publiczny adres IP",
170172
"basic_ip_label": "Basic Public IP (powiązany z instancją) - <sb>{{price}}</sb>",
171173
"basic_ip_description": "Podstawowy publiczny adres IP to adres IP, który przestaje być aktywny po upływie cyklu życia zasobu. ",
172174
"basic_ip_warning": "Włączenie Basic Public IP nie jest kompatybilne z Gateway.",
173-
"floating_ip_label": "Tworzenie adresu Floating IP (do wielokrotnego użycia) - <sb>{{price}}</sb>",
175+
"floating_ip_label": "Tworzenie adresu Floating IP (do wielokrotnego użycia)",
174176
"floating_ip_description": "Rezerwacja pływającego adresu IP przypisuje adres do Twojego projektu do momentu, gdy adres ten zwolnisz. ",
175177
"floating_ip_warning": "Jeśli wybierzesz tę opcję, przypiszemy do Twojego projektu Gateway o rozmiarze {{size}}.",
176178
"floating_ip_create_new_label": "Utwórz nowy - <sb>{{price}}</sb>",

‎packages/manager/apps/pci-instances/public/translations/creation/Messages_pt_PT.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118
"pci_instance_creation_network_add_new_used_vlanID_warning": "A utilização de uma mesma VLAN id para várias redes privadas implica gerir com atenção os IP privados. A utilização da alocação de pool DHCP sem sobreposição pode ser uma forma de gerir esta problemática.",
119119
"pci_instance_creation_network_add_new_vlanID_warning": "O VLAN id 0 é utilizado por predefinição noutros produtos, mesmo fora do universo Public Cloud. Os IP privados devem ser geridos com atenção",
120120
"pci_instance_creation_network_add_new_cidr_error": "Introduza um endereço IP válido",
121+
"pci_instance_creation_network_metal_dropdown_tooltip": "As Instâncias Metal são compatíveis apenas com uma rede privada cujo vLAN ID seja 0.",
122+
"pci_instance_creation_network_metal_vlanid_tooltip": "O valor do vLAN ID nas Instâncias Metal é sempre fixado em 0.",
121123
"pci_instance_creation_network_add_new_vlanId_error": "O vLAN ID deve estar compreendido entre 0 e 4000. Queira verificar o valor introduzido antes de continuar.",
122124
"pci_instance_creation_create_my_instance": "Lançar a minha instância",
123125
"pci_instance_creation_select_billing_choice_title": "Faturação",
@@ -165,12 +167,12 @@
165167
"pci_instance_creation_network_public_connectivity_help_basic_ip": "<h6>Basic IP</h6><p>Uma Basic IP permite conectividade de entrada e saída sem restrições de utilização. Esta IP não é persistente e é realocada após a eliminação da instância associada. Não é possível alocá-la a outra instância.</p>",
166168
"pci_instance_creation_network_add_public_connectivity": {
167169
"title": "Atribuir uma ligação pública",
168-
"description": "<p>A atribuição de um endereço IP público permite o acesso à sua instância a partir do exterior da rede OVHcloud.<br/><span>A criação do IP Flutuante será efetuada no final da configuração.</span></p>",
170+
"description": "<p>A atribuição de um endereço IP público permite o acesso à sua instância a partir do exterior da rede OVHcloud.</p>",
169171
"toggle_label": "Atribuir um IP público",
170172
"basic_ip_label": "Basic Public IP (Ligado à instância) - <sb>{{ price }}</sb>",
171173
"basic_ip_description": "Um IP público de base é um endereço IP que não persiste para além da duração de vida do recurso. ",
172174
"basic_ip_warning": "A ativação do basic public IP não é compatível com um gateway.",
173-
"floating_ip_label": "Criar um IP Flutuante (Reutilizável) - <sb>{{ price }}</sb>",
175+
"floating_ip_label": "Criar um IP Flutuante (Reutilizável)",
174176
"floating_ip_description": "A reserva de um endereço IP flutuante atribui o endereço ao seu projeto até que o liberte explicitamente. ",
175177
"floating_ip_warning": "Ao selecionar esta opção, vamos atribuir-lhe um gateway de tamanho {{ size }}.",
176178
"floating_ip_create_new_label": "Criar um novo - <sb>{{ price }}</sb>",

‎packages/manager/apps/pci-instances/src/__mocks__/instance/constants.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,7 @@ export const mockedPrivateNetworks: TPrivateNetworkData[] = [
11041104
networkId: 'networkId-1',
11051105
hasGateway: false,
11061106
capabilities: ['PublicIP', 'FloatingIP'],
1107+
vlanId: 0,
11071108
},
11081109
},
11091110
{
@@ -1113,6 +1114,7 @@ export const mockedPrivateNetworks: TPrivateNetworkData[] = [
11131114
networkId: 'networkId-2',
11141115
hasGateway: true,
11151116
capabilities: ['FloatingIP'],
1117+
vlanId: 1,
11161118
},
11171119
},
11181120
{
@@ -1122,6 +1124,7 @@ export const mockedPrivateNetworks: TPrivateNetworkData[] = [
11221124
networkId: 'networkId-3',
11231125
hasGateway: false,
11241126
capabilities: ['PublicIP'],
1127+
vlanId: 2,
11251128
},
11261129
},
11271130
{
@@ -1131,6 +1134,7 @@ export const mockedPrivateNetworks: TPrivateNetworkData[] = [
11311134
networkId: 'networkId-4',
11321135
hasGateway: false,
11331136
capabilities: [],
1137+
vlanId: null,
11341138
},
11351139
},
11361140
];
@@ -1506,6 +1510,46 @@ export const mockedPrivateNetworkEntity: TPrivateNetwork = {
15061510
},
15071511
};
15081512

1513+
export const mockedPrivateNetworkEntityWithMetal: TPrivateNetwork = {
1514+
networks: {
1515+
byId: new Map([
1516+
...mockedPrivateNetworkEntity.networks.byId,
1517+
[
1518+
'metal-network-vlan0',
1519+
{
1520+
id: 'metal-network-vlan0',
1521+
name: 'test-network-metal',
1522+
region: 'BHS5',
1523+
vlanId: 0,
1524+
subnets: ['metal-subnet-vlan0'],
1525+
},
1526+
],
1527+
]),
1528+
allIds: [
1529+
...mockedPrivateNetworkEntity.networks.allIds,
1530+
'metal-network-vlan0',
1531+
],
1532+
},
1533+
subnets: {
1534+
byId: new Map([
1535+
...mockedPrivateNetworkEntity.subnets.byId,
1536+
[
1537+
'metal-subnet-vlan0',
1538+
{
1539+
id: 'metal-subnet-vlan0',
1540+
cidr: '10.0.0.0/16',
1541+
capabilities: ['FloatingIP'],
1542+
hasGateway: false,
1543+
},
1544+
],
1545+
]),
1546+
allIds: [
1547+
...mockedPrivateNetworkEntity.subnets.allIds,
1548+
'metal-subnet-vlan0',
1549+
],
1550+
},
1551+
};
1552+
15091553
const mockedNetworkCatalogPrice = {
15101554
currencyCode: 'EUR',
15111555
priceInUcents: 100,

0 commit comments

Comments
 (0)