Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release - Infra HPC w3 #14888

Merged
merged 14 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Besondere Vertragsbedingungen des Dienstes",
"dedicatedCloud_vmware_cloud_director_new": "Neu",
"dedicatedCloud_vmware_cloud_director_migration": "Migration",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration bestΓ€tigt",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Besondere Bedingungen genehmigt",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Die Migration bestΓ€tigen",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Dokumentation – Migrationsprozess",
"dedicatedCloud_vmware_cloud_director_useful_links": "NΓΌtzliche Links",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "BestΓ€tigen Sie die Migration Ihres Dienstes zu Managed VCD on OVHcloud und akzeptieren Sie die besonderen Vertragsbedingungen des Dienstes.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Die Migration Ihres Dienstes zum Managed VCD Angebot wurde registriert. Unsere Teams werden Sie bezΓΌglich der Planung und der ModalitΓ€ten des Vorgangs kontaktieren.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Die Anfrage zur Migration Ihrer Dienstleistung auf das Angebot Managed VCD wurde erfolgreich durchgefΓΌhrt. Unsere Teams werden Sie bezΓΌglich der Planung und der ModalitΓ€ten des Vorgangs kontaktieren.",
"dedicatedCloud_vmware_cloud_director_validate": "BestΓ€tigen"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Special Terms and Conditions of Service",
"dedicatedCloud_vmware_cloud_director_new": "New",
"dedicatedCloud_vmware_cloud_director_migration": "Migration",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmed",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Approved Terms and Conditions",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Confirm migration",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Migration process",
"dedicatedCloud_vmware_cloud_director_useful_links": "Useful links",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Confirm the migration of your service to the Managed VCD on OVHcloud solution, and accept its Special Terms and Conditions of Service.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Your service has been migrated to the Managed VCD solution. Our teams will get back to you regarding the schedule and details of the migration",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Your service migration request to the Managed VCD solution has been processed. Our teams will get back to you regarding the schedule and details of the migration",
"dedicatedCloud_vmware_cloud_director_validate": "Confirm"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Condiciones Particulares del Servicio",
"dedicatedCloud_vmware_cloud_director_new": "Nuevo",
"dedicatedCloud_vmware_cloud_director_migration": "MigraciΓ³n",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "MigraciΓ³n confirmada",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Condiciones Particulares aprobadas",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Confirmar la migraciΓ³n",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "DocumentaciΓ³n - Proceso de migraciΓ³n",
"dedicatedCloud_vmware_cloud_director_useful_links": "Enlaces ΓΊtiles",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Confirme la migraciΓ³n de su servicio hacia la soluciΓ³n Managed VCD on OVHcloud y acepte las Condiciones Particulares del Servicio.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migraciΓ³n del servicio hacia la soluciΓ³n Managed VCD se ha realizado correctamente. Nuestros equipos se pondrΓ‘n en contacto con usted en relaciΓ³n con la planificaciΓ³n y las modalidades de esta operaciΓ³n.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La solicitud de migraciΓ³n de su servicio hacia la soluciΓ³n Managed VCD se ha registrado correctamente. Nuestros equipos se pondrΓ‘n en contacto con usted en relaciΓ³n con la planificaciΓ³n y las modalidades de esta operaciΓ³n.",
"dedicatedCloud_vmware_cloud_director_validate": "Confirmar"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Conditions particulières du service",
"dedicatedCloud_vmware_cloud_director_new": "New",
"dedicatedCloud_vmware_cloud_director_migration": "Migration",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmΓ©e",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Conditions particulières approuvées",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Valider la migration",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Process de migration",
"dedicatedCloud_vmware_cloud_director_useful_links": "Liens utiles",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Validez la migration de votre service vers l'offre Managed VCD on OVHcloud et acceptez les conditions particulières du service.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos Γ©quipes reviendront vers vous concernant la planification et les modalitΓ©s de l'opΓ©ration.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La demande de migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos Γ©quipes reviendront vers vous concernant la planification et les modalitΓ©s de l'opΓ©ration.",
"dedicatedCloud_vmware_cloud_director_validate": "Valider"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Conditions particulières du service",
"dedicatedCloud_vmware_cloud_director_new": "New",
"dedicatedCloud_vmware_cloud_director_migration": "Migration",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migration confirmΓ©e",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Conditions particulières approuvées",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Valider la migration",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentation - Process de migration",
"dedicatedCloud_vmware_cloud_director_useful_links": "Liens utiles",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Validez la migration de votre service vers l'offre Managed VCD on OVHcloud et acceptez les conditions particulières du service.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos Γ©quipes reviendront vers vous concernant la planification et les modalitΓ©s de l'opΓ©ration.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La demande de migration de votre service vers l'offre Managed VCD est bien prise en compte. Nos Γ©quipes reviendront vers vous concernant la planification et les modalitΓ©s de l'opΓ©ration.",
"dedicatedCloud_vmware_cloud_director_validate": "Valider"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Condizioni Particolari del Servizio",
"dedicatedCloud_vmware_cloud_director_new": "Nuovo",
"dedicatedCloud_vmware_cloud_director_migration": "Migrazione",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migrazione confermata",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Condizioni particolari accettate",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Confermare la migrazione",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentazione - Processo di migrazione",
"dedicatedCloud_vmware_cloud_director_useful_links": "Link utili",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Conferma la migrazione del tuo servizio verso la soluzione Managed VCD on OVHcloud e accetta le Condizioni Particolari del Servizio.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La migrazione del tuo servizio verso la soluzione Managed VCD Γ¨ stata presa in carico. I nostri team ti informeranno sulla pianificazione e le modalitΓ  dell'operazione.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "La richiesta di migrazione del tuo servizio verso la soluzione Managed VCD Γ¨ stata presa in carico. I nostri team ti informeranno sulla pianificazione e le modalitΓ  dell'operazione.",
"dedicatedCloud_vmware_cloud_director_validate": "Confermare"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "SzczegΓ³Ε‚owe warunki korzystania z usΕ‚ugi",
"dedicatedCloud_vmware_cloud_director_new": "NowoΕ›Δ‡",
"dedicatedCloud_vmware_cloud_director_migration": "Migracja",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migracja zostaΕ‚a potwierdzona",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Zatwierdzone szczegΓ³Ε‚owe warunki korzystania z usΕ‚ug",
"dedicatedCloud_vmware_cloud_director_validate_migration": "PotwierdΕΊ migracjΔ™",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Dokumentacja - proces migracji",
"dedicatedCloud_vmware_cloud_director_useful_links": "Przydatne linki",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "PotwierdΕΊ migracjΔ™ Twojej usΕ‚ugi do oferty Managed VCD on OVHcloud i zaakceptuj szczegΓ³Ε‚owe warunki korzystania z usΕ‚ugi.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "Dyspozycja migracji Twojej usługi do oferty Managed VCD została przyjęta. Nasz zespół skontaktuje się z Tobą, aby ustalić kiedy i w jaki sposób zostanie przeprowadzona operacja.",
"dedicatedCloud_vmware_cloud_director_validate": "ZatwierdΕΊ"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"dedicatedCloud_vmware_cloud_director_offer_terms_and_conditions": "Condiçáes particulares do serviço",
"dedicatedCloud_vmware_cloud_director_new": "Novo",
"dedicatedCloud_vmware_cloud_director_migration": "Migração",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Migração confirmada",
"dedicatedCloud_vmware_cloud_director_migration_confirmed": "Condiçáes particulares aprovadas",
"dedicatedCloud_vmware_cloud_director_validate_migration": "Validar a migração",
"dedicatedCloud_vmware_cloud_director_migration_documentation": "Documentação - Processo de migração",
"dedicatedCloud_vmware_cloud_director_useful_links": "Ligaçáes úteis",
"dedicatedCloud_vmware_cloud_director_validate_migration_detail": "Valide a migração do seu serviço para a oferta Managed VCD on OVHcloud e aceite as condiçáes particulares do serviço.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "A migração do seu serviço para a oferta Managed VCD foi corretamente tomada em conta. As nossas equipas irão entrar em contacto consigo relativamente ao planeamento e às modalidades da operação.",
"dedicatedCloud_vmware_cloud_director_migration_confirmed_detail": "O pedido de migração do seu serviço para a oferta Managed VCD foi corretamente registado. As nossas equipas irão entrar em contacto consigo relativamente ao planeamento e às modalidades da operação.",
"dedicatedCloud_vmware_cloud_director_validate": "Validar"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class {
this.$translate.instant(
'dedicatedCloud_datacenter_convert_to_global_success',
{
t0: this.datacenterId,
t0: this.datastoreId,
},
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
data-valid="$ctrl.model.vdc"
data-prevent-next
>
<div class="col-sm-12 mt-2 mb-4 d-flex flex-wrap align-content-stretch">
<div class="row">
<oui-select-picker
data-ng-repeat="datacenter in $ctrl.vdcList track by $index"
class="col-md-4"
class="col-sm-12 col-md-4 my-3"
data-model="$ctrl.model.vdc"
data-label="{{ :: 'dedicatedCloud_configuration_add_datacenter_card_vdc_' + datacenter.vdc + '_label' | translate }}"
data-values="[datacenter]"
Expand Down Expand Up @@ -55,19 +55,19 @@
data-translate="dedicatedCloud_configuration_add_datacenter_message_edge_information"
></p>
</oui-message>
<div class="col-sm-12 mt-2 mb-4 d-flex flex-wrap align-content-stretch">
<div class="row">
<oui-select-picker
data-ng-repeat="host in $ctrl.hostList track by $index"
class="col-md-3"
class="col-sm-12 col-md-4 my-3"
data-model="$ctrl.model.host"
data-label="{{ :: 'dedicatedCloud_configuration_add_datacenter_card_host_' + host.name + '_label' | translate }}"
data-label="{{ 'dedicatedCloud_configuration_add_datacenter_card_host_' + host.name + '_label' | translate }}"
data-values="[host]"
data-disabled="$ctrl.submitting"
data-required
>
<oui-select-picker-section>
<p
data-translate="{{ :: 'dedicatedCloud_configuration_add_datacenter_card_host_' + host.name + '_description' }}"
data-translate="{{ 'dedicatedCloud_configuration_add_datacenter_card_host_' + host.name + '_description' }}"
></p>
</oui-select-picker-section>
</oui-select-picker>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dedicatedCloud_configuration_add_datacenter_card_host_nsx-t_vsan_description": "Your new virtual datacentre will comprise hosts that are suited for the Software-Defined Datacentre environment (you can choose host specifications in the next step).",
"dedicatedCloud_configuration_add_datacenter_card_host_nsx-t_saphana_label": "SAP HANA hosts (with NSX)",
"dedicatedCloud_configuration_add_datacenter_card_host_nsx-t_saphana_description": "Your new virtual datacentre will comprise a Software-Defined Datacentre infrastructure that is specially designed and SAP HANA-certified (you can choose host specifications in the next step).",
"dedicatedCloud_configuration_add_datacenter_card_host_vsphere_label": "Standard Hosts",
"dedicatedCloud_configuration_add_datacenter_card_host_vsphere_label": "Standard hosts",
"dedicatedCloud_configuration_add_datacenter_card_host_vsphere_description": "Your new virtual datacentre will comprise standard hosts (you can choose host specifications in the next step).",
"dedicatedCloud_configuration_add_datacenter_card_host_vsphere_vsan_label": "vSAN hosts",
"dedicatedCloud_configuration_add_datacenter_card_host_vsphere_vsan_description": "Your new virtual datacentre will comprise hosts that are suited for hyperconverged storage (you can choose host specifications in the next step).",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,15 +551,15 @@ class DedicatedCloudService {

/* ------- ICEBERG -------*/

icebergQuery(url, params) {
icebergQuery(url, paginationParams, urlParams) {
const {
filters,
pageSize,
offset,
sort,
sortOrder,
defaultFilterColumn,
} = params;
} = paginationParams;

let request = this.iceberg(url)
.query()
Expand All @@ -573,7 +573,7 @@ class DedicatedCloudService {
}

return this.$q
.resolve(request.execute(null, true).$promise)
.resolve(request.execute(urlParams, true).$promise)
.then(({ data, headers }) => ({
data,
meta: {
Expand Down Expand Up @@ -1468,8 +1468,12 @@ class DedicatedCloudService {

/* ------- Operations -------*/

getOperations(serviceName, params) {
return this.icebergQuery(`/dedicatedCloud/${serviceName}/task`, params);
getOperations(serviceName, paginationParams, urlParams) {
return this.icebergQuery(
`/dedicatedCloud/${serviceName}/task`,
paginationParams,
urlParams,
);
}

getOperation(serviceName, opts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"dedicatedCloud_subscribe_mailing": "Sign up to the mailing list",
"dedicatedCloud_subscribe_mailing_disabled_EPCC": "Unable to sign up to the Hosted Private Cloud mailing list ({{t0}}).",
"dedicatedCloud_subscribe_mailing_step1_EPCC": "Enter your email address to sign up to the Hosted Private Cloud mailing list ({{t0}}) :",
"dedicatedCloud_subscribe_mailing_step2_EPCC": "You are about to sign up {{t0}}to the Hosted Private Cloud mailing list ({{t1}})",
"dedicatedCloud_subscribe_mailing_step2_EPCC": "You are about to sign up {{t0}} to the Hosted Private Cloud mailing list ({{t1}})",
"dedicatedCloud_subscribe_mailing_step2_success": "Your request to sign up to <b>{{t0}}</b> has been registered",
"dedicatedCloud_subscribe_mailing_step2_error": "An error has occurred requesting to sign up to <b>{{t0}}</b>",
"dedicatedCloud_subscribe_mailing_disabled_MBM": "Unable to subscribe to the Managed Bare Metal mailing list ({{t0}}).",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class {
return this.DedicatedCloud.getModels()
.then((data) => {
this.stateEnum = data.models['dedicatedCloud.TaskStateEnum'].enum;
this.progressionFilter = null;
this.progressionFilter = 'doing';
this.progressionFilterList = map(this.stateEnum, (state) => ({
value: state,
label: this.$translate.instant(
Expand Down Expand Up @@ -57,23 +57,25 @@ export default class {
}

loadOperations({ offset, pageSize, sort }) {
const params = {
const paginationParams = {
offset,
pageSize,
sort: sort.property,
sortOrder: sort.dir === 1 ? 'ASC' : 'DESC',
defaultFilterColumn: 'executionDate',
filters: this.progressionFilter
? [
{
field: 'state',
comparator: 'is',
reference: [this.progressionFilter],
},
]
: [],
};
return this.DedicatedCloud.getOperations(this.productId, params);
// limitation to one year in case of too many data
const executionDate = new Date();
executionDate.setFullYear(executionDate.getFullYear() - 1);
const urlParams = {
state: this.progressionFilter,
executionDate: executionDate.toISOString(),
};
return this.DedicatedCloud.getOperations(
this.productId,
paginationParams,
urlParams,
);
}

setRelatedServices(operation) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ <h2 data-translate="dedicatedCloud_tab_operation"></h2>
data-ng-if="!$ctrl.loading"
data-rows-loader="$ctrl.loadOperations($config)"
data-row-loader="$ctrl.loadOperationAdditionalData($row)"
data-pagination-mode="select"
>
<oui-datagrid-column
data-title=":: 'dedicatedCloud_OPERATIONS_taskId' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class {
$onInit() {
this.user.tokenValidator = this.user.isTokenValidator;
this.originUser = this.pickUserInformationToSend();
this.emailRegExp = /^(?:[\w-.]+@[\w-.]+\.[\w-]+)?$/;
this.emailRegExp = /^(?:[\w-.]+(\+[\w-.]+)*@[\w-.]+\.[\w-]+)?$/;
if (this.coreConfig.isRegion('US')) {
this.phoneRegExp = /\+1\.\d{10}/;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const SERVICE_WITH_AGORA_TERMINATION = [
'vrack-services',
'okms',
'logs-account',
'nutanix',
];

export const SERVICE_GROUP_WITH_AGORA_TERMINATION_REGEX = /hycu-vms-*|(logs-enterprise(-hds)?$)/;
Expand Down
Loading
Loading