diff --git a/@xen-orchestra/lite/src/locales/cs.json b/@xen-orchestra/lite/src/locales/cs.json index 57dc074bba0..1a79d89f0f3 100644 --- a/@xen-orchestra/lite/src/locales/cs.json +++ b/@xen-orchestra/lite/src/locales/cs.json @@ -59,7 +59,6 @@ "descending": "sestupně", "description": "Popis", - "dhcp": "DHCP", "disabled": "Zakázáno", "display": "Zobrazení", "dns": "DNS", diff --git a/@xen-orchestra/lite/src/locales/de.json b/@xen-orchestra/lite/src/locales/de.json index e5d13c7e705..f132f383f66 100644 --- a/@xen-orchestra/lite/src/locales/de.json +++ b/@xen-orchestra/lite/src/locales/de.json @@ -57,7 +57,6 @@ "descending": "absteigend", "description": "Beschreibung", - "dhcp": "DHCP", "disabled": "deaktiviert", "display": "Display", "dns": "DNS", @@ -118,7 +117,6 @@ "n-hosts-awaiting-patch": "Der Host {n} benötigt dieses Patch | Die Hosts {n} benötigen dieses Patch", "n-missing": "{n} verbleibend", "name": "Name", - "netmask": "Netzmaske", "network-download": "Download", "network-throughput": "Netzwerkdurchsatz", "network-upload": "Upload", diff --git a/@xen-orchestra/lite/src/locales/en.json b/@xen-orchestra/lite/src/locales/en.json index a9217ed7ae1..15213ae213b 100644 --- a/@xen-orchestra/lite/src/locales/en.json +++ b/@xen-orchestra/lite/src/locales/en.json @@ -43,7 +43,6 @@ "cpu-provisioning": "CPU provisioning", "cpu-provisioning-warning": "The number of vCPUs allocated exceeds the number of physical CPUs available. System performance could be affected", "cpu-usage": "CPU usage", - "delete": "Delete", "delete-vms": "Delete 1 VM | Delete {n} VMs", "deploy": "Deploy", "deploy-xoa": "Deploy XOA", @@ -59,10 +58,8 @@ "descending": "descending", "description": "Description", - "dhcp": "DHCP", "disabled": "Disabled", "display": "Display", - "dns": "DNS", "do-you-have-needs": "You have needs and/or expectations? Let us know", "documentation": "Documentation", "edit-config": "Edit config", @@ -179,7 +176,6 @@ "n-hosts-awaiting-patch": "{n} host is awaiting this patch | {n} hosts are awaiting this patch", "n-missing": "{n} missing", "name": "Name", - "netmask": "Netmask", "network-download": "Download", "network-throughput": "Network throughput", "network-upload": "Upload", @@ -241,7 +237,6 @@ "start": "Start", "start-on-host": "Start on specific host", "static-ip": "Static IP", - "status": "Status", "storage-usage": "Storage usage", "support": "Support", "suspend": "Suspend", diff --git a/@xen-orchestra/lite/src/locales/fa.json b/@xen-orchestra/lite/src/locales/fa.json index f057084aa93..d38abfd754d 100644 --- a/@xen-orchestra/lite/src/locales/fa.json +++ b/@xen-orchestra/lite/src/locales/fa.json @@ -58,7 +58,6 @@ "descending": "نزولی", "description": "توصیف", - "dhcp": "DHCP", "disabled": "غیر فعال", "display": "نمایش", "dns": "DNS", diff --git a/@xen-orchestra/lite/src/locales/fr.json b/@xen-orchestra/lite/src/locales/fr.json index d9f86ea546e..c07a574eda5 100644 --- a/@xen-orchestra/lite/src/locales/fr.json +++ b/@xen-orchestra/lite/src/locales/fr.json @@ -43,7 +43,6 @@ "cpu-provisioning": "Provisionnement CPU", "cpu-provisioning-warning": "Le nombre de vCPU alloués dépasse le nombre de CPU physique disponible. Les performances du système pourraient être affectées", "cpu-usage": "Utilisation CPU", - "delete": "Supprimer", "delete-vms": "Supprimer 1 VM | Supprimer {n} VMs", "deploy": "Déployer", "deploy-xoa": "Déployer XOA", @@ -59,8 +58,6 @@ "descending": "descendant", "description": "Description", - "dhcp": "DHCP", - "dns": "DNS", "disabled": "Désactivé", "display": "Affichage", "do-you-have-needs": "Vous avez des besoins et/ou des attentes ? Faites le nous savoir", @@ -179,7 +176,6 @@ "n-hosts-awaiting-patch": "{n} hôte attend ce patch | {n} hôtes attendent ce patch", "n-missing": "{n} manquant | {n} manquants", "name": "Nom", - "netmask": "Masque réseau", "network-download": "Descendant", "network-throughput": "Débit du réseau", "network-upload": "Montant", @@ -241,7 +237,6 @@ "start": "Démarrer", "start-on-host": "Démarrer sur un hôte spécifique", "static-ip": "IP statique", - "status": "Statut", "storage-usage": "Utilisation du stockage", "support": "Support", "suspend": "Suspendre", diff --git a/@xen-orchestra/web-core/lib/components/card/VtsCardRowKeyValue.vue b/@xen-orchestra/web-core/lib/components/card/VtsCardRowKeyValue.vue index 513e358fd97..f9dd28f7281 100644 --- a/@xen-orchestra/web-core/lib/components/card/VtsCardRowKeyValue.vue +++ b/@xen-orchestra/web-core/lib/components/card/VtsCardRowKeyValue.vue @@ -25,11 +25,11 @@ const slots = defineSlots<{ diff --git a/@xen-orchestra/web/src/components/pif/PifStatus.vue b/@xen-orchestra/web/src/components/pif/PifStatus.vue new file mode 100644 index 00000000000..308db323acc --- /dev/null +++ b/@xen-orchestra/web/src/components/pif/PifStatus.vue @@ -0,0 +1,48 @@ + + + {{ getStatusProps(status).text }} + + + + + + diff --git a/@xen-orchestra/web/src/components/pif/PifTable.vue b/@xen-orchestra/web/src/components/pif/PifTable.vue new file mode 100644 index 00000000000..7eb600813bf --- /dev/null +++ b/@xen-orchestra/web/src/components/pif/PifTable.vue @@ -0,0 +1,272 @@ + + + + {{ $t('pifs') }} + + + {{ $t('scan-pifs') }} + + + + + (searchQuery = value)" /> + + + {{ $t('edit') }} + + + {{ $t('delete') }} + + + {{ $t('table-actions') }} + + + + + + + + + + + + + + + {{ column.label }} + + + {{ column.label }} + + + + + + + + + + + + + + {{ getNetworkName(row.value) }} + + {{ row.value.device }} + + + + + {{ getPifData(row.value, 'vlan') }} + + {{ row.value.ip }} + {{ row.value.mac }} + {{ getPifData(row.value, 'mode') }} + + + + + + + + + + + + + + + diff --git a/@xen-orchestra/web/src/pages/host/[id]/network.vue b/@xen-orchestra/web/src/pages/host/[id]/network.vue new file mode 100644 index 00000000000..b7b7be8afbb --- /dev/null +++ b/@xen-orchestra/web/src/pages/host/[id]/network.vue @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + diff --git a/@xen-orchestra/web/src/utils/xo-api-definition.util.ts b/@xen-orchestra/web/src/utils/xo-api-definition.util.ts index acf73b5eef9..1df34d6323e 100644 --- a/@xen-orchestra/web/src/utils/xo-api-definition.util.ts +++ b/@xen-orchestra/web/src/utils/xo-api-definition.util.ts @@ -41,7 +41,7 @@ export const xoApiDefinition = { pif: { type: 'collection', path: 'pifs', - fields: '$host,$network,attached,carrier,device,dns,gateway,id,ip,ipv6,mac,mode,mtu,netmask,speed', + fields: '$host,$network,attached,carrier,device,dns,gateway,id,ip,ipv6,mac,mode,mtu,netmask,speed,vlan', handler: (record: XoPif) => record, }, network: { diff --git a/@xen-orchestra/web/typed-router.d.ts b/@xen-orchestra/web/typed-router.d.ts index e3a1a98ebf1..0abcb49c534 100644 --- a/@xen-orchestra/web/typed-router.d.ts +++ b/@xen-orchestra/web/typed-router.d.ts @@ -26,6 +26,7 @@ declare module 'vue-router/auto-routes' { '/host/[id]': RouteRecordInfo<'/host/[id]', '/host/:id', { id: ParamValue }, { id: ParamValue }>, '/host/:id': RouteRecordInfo<'/host/:id', '/host/:id', { id: ParamValue }, { id: ParamValue }>, '/host/[id]/console': RouteRecordInfo<'/host/[id]/console', '/host/:id/console', { id: ParamValue }, { id: ParamValue }>, + '/host/[id]/network': RouteRecordInfo<'/host/[id]/network', '/host/:id/network', { id: ParamValue }, { id: ParamValue }>, '/host/[id]/vms': RouteRecordInfo<'/host/[id]/vms', '/host/:id/vms', { id: ParamValue }, { id: ParamValue }>, '/pool/[id]': RouteRecordInfo<'/pool/[id]', '/pool/:id', { id: ParamValue }, { id: ParamValue }>, '/pool/:id': RouteRecordInfo<'/pool/:id', '/pool/:id', { id: ParamValue }, { id: ParamValue }>,
{{ getStatusProps(status).text }}
{{ getNetworkName(row.value) }}