Mentions légales du service

Skip to content
Snippets Groups Projects
Commit b4cedff6 authored by PAULIN Nathan's avatar PAULIN Nathan
Browse files

Merge branch 'testing-mercantour5' into 'master' 

[sophia][mercantour5] add kavlan support && add network topology conf

See merge request !1082
parents 0fd5200f 3577ae9b
No related branches found
No related tags found
1 merge request!1082[sophia][mercantour5] add kavlan support && add network topology conf
Pipeline #1130878 passed
Stage: .pre
Stage: deploy-to-api-servers
Stage: check
Stage: generate-access-history
Stage: resources-explorer
Stage: .post
Pipeline: Resources Explorer

#1130883

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 214 additions and 14 deletions
    data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
    + 1
    − 1
    View file @ b4cedff6
    ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
    "boot_type": "bios", "boot_type": "bios",
    "created_at": "Mon, 24 Feb 2025 00:00:00 GMT", "created_at": "Mon, 24 Feb 2025 00:00:00 GMT",
    "exotic": false, "exotic": false,
    "kavlan": false, "kavlan": true,
    "manufactured_at": "2019-07-30", "manufactured_at": "2019-07-30",
    "metrics": [ "metrics": [
    { {
    ......
    data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
    + 47
    − 3
    View file @ b4cedff6
    ...@@ -20,6 +20,50 @@ ...@@ -20,6 +20,50 @@
    "warranty_end": "2026-07-31" "warranty_end": "2026-07-31"
    }, },
    "exotic": false, "exotic": false,
    "kavlan": {
    "eth0": {
    "kavlan-1": "192.168.196.42",
    "kavlan-11": "10.7.229.42",
    "kavlan-12": "10.11.229.42",
    "kavlan-13": "10.15.229.42",
    "kavlan-14": "10.19.229.42",
    "kavlan-16": "10.27.229.42",
    "kavlan-17": "10.31.229.42",
    "kavlan-18": "10.35.229.42",
    "kavlan-2": "192.168.212.42",
    "kavlan-20": "10.43.229.42",
    "kavlan-21": "10.47.229.42",
    "kavlan-3": "192.168.228.42",
    "kavlan-4": "10.32.4.42",
    "kavlan-5": "10.32.68.42",
    "kavlan-6": "10.32.132.42",
    "kavlan-7": "10.32.196.42",
    "kavlan-8": "10.33.4.42",
    "kavlan-9": "10.33.68.42"
    }
    },
    "kavlan6": {
    "eth0": {
    "kavlan-1": "2001:660:4406:880:3::2a",
    "kavlan-11": "2001:660:4406:1a0:803::2a",
    "kavlan-12": "2001:660:4406:2a0:803::2a",
    "kavlan-13": "2001:660:4406:4a0:803::2a",
    "kavlan-14": "2001:660:4406:5a0:803::2a",
    "kavlan-16": "2001:660:4406:7a0:803::2a",
    "kavlan-17": "2001:660:4406:9a0:803::2a",
    "kavlan-18": "2001:660:4406:8a0:803::2a",
    "kavlan-2": "2001:660:4406:881:3::2a",
    "kavlan-20": "2001:660:4406:3a0:803::2a",
    "kavlan-21": "2001:660:4406:6a0:803::2a",
    "kavlan-3": "2001:660:4406:882:3::2a",
    "kavlan-4": "2001:660:4406:890:3::2a",
    "kavlan-5": "2001:660:4406:891:3::2a",
    "kavlan-6": "2001:660:4406:892:3::2a",
    "kavlan-7": "2001:660:4406:893:3::2a",
    "kavlan-8": "2001:660:4406:894:3::2a",
    "kavlan-9": "2001:660:4406:895:3::2a"
    }
    },
    "main_memory": { "main_memory": {
    "ram_size": 412316860416 "ram_size": 412316860416
    }, },
    ...@@ -100,7 +144,7 @@ ...@@ -100,7 +144,7 @@
    "interface": "Ethernet", "interface": "Ethernet",
    "ip": "172.16.130.42", "ip": "172.16.130.42",
    "ip6": "2001:660:4406:800:3::2a", "ip6": "2001:660:4406:800:3::2a",
    "kavlan": false, "kavlan": true,
    "mac": "6c:2b:59:9c:4a:32", "mac": "6c:2b:59:9c:4a:32",
    "management": false, "management": false,
    "model": "I350 Gigabit Network Connection", "model": "I350 Gigabit Network Connection",
    ...@@ -111,8 +155,8 @@ ...@@ -111,8 +155,8 @@
    "rate": 1000000000, "rate": 1000000000,
    "sriov": false, "sriov": false,
    "sriov_totalvfs": 0, "sriov_totalvfs": 0,
    "switch": null, "switch": "sw-3",
    "switch_port": null, "switch_port": "1/1/28",
    "vendor": "Intel" "vendor": "Intel"
    }, },
    { {
    ......
    data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
    + 47
    − 3
    View file @ b4cedff6
    ...@@ -20,6 +20,50 @@ ...@@ -20,6 +20,50 @@
    "warranty_end": "2026-07-31" "warranty_end": "2026-07-31"
    }, },
    "exotic": false, "exotic": false,
    "kavlan": {
    "eth0": {
    "kavlan-1": "192.168.196.43",
    "kavlan-11": "10.7.229.43",
    "kavlan-12": "10.11.229.43",
    "kavlan-13": "10.15.229.43",
    "kavlan-14": "10.19.229.43",
    "kavlan-16": "10.27.229.43",
    "kavlan-17": "10.31.229.43",
    "kavlan-18": "10.35.229.43",
    "kavlan-2": "192.168.212.43",
    "kavlan-20": "10.43.229.43",
    "kavlan-21": "10.47.229.43",
    "kavlan-3": "192.168.228.43",
    "kavlan-4": "10.32.4.43",
    "kavlan-5": "10.32.68.43",
    "kavlan-6": "10.32.132.43",
    "kavlan-7": "10.32.196.43",
    "kavlan-8": "10.33.4.43",
    "kavlan-9": "10.33.68.43"
    }
    },
    "kavlan6": {
    "eth0": {
    "kavlan-1": "2001:660:4406:880:3::2b",
    "kavlan-11": "2001:660:4406:1a0:803::2b",
    "kavlan-12": "2001:660:4406:2a0:803::2b",
    "kavlan-13": "2001:660:4406:4a0:803::2b",
    "kavlan-14": "2001:660:4406:5a0:803::2b",
    "kavlan-16": "2001:660:4406:7a0:803::2b",
    "kavlan-17": "2001:660:4406:9a0:803::2b",
    "kavlan-18": "2001:660:4406:8a0:803::2b",
    "kavlan-2": "2001:660:4406:881:3::2b",
    "kavlan-20": "2001:660:4406:3a0:803::2b",
    "kavlan-21": "2001:660:4406:6a0:803::2b",
    "kavlan-3": "2001:660:4406:882:3::2b",
    "kavlan-4": "2001:660:4406:890:3::2b",
    "kavlan-5": "2001:660:4406:891:3::2b",
    "kavlan-6": "2001:660:4406:892:3::2b",
    "kavlan-7": "2001:660:4406:893:3::2b",
    "kavlan-8": "2001:660:4406:894:3::2b",
    "kavlan-9": "2001:660:4406:895:3::2b"
    }
    },
    "main_memory": { "main_memory": {
    "ram_size": 412316860416 "ram_size": 412316860416
    }, },
    ...@@ -100,7 +144,7 @@ ...@@ -100,7 +144,7 @@
    "interface": "Ethernet", "interface": "Ethernet",
    "ip": "172.16.130.43", "ip": "172.16.130.43",
    "ip6": "2001:660:4406:800:3::2b", "ip6": "2001:660:4406:800:3::2b",
    "kavlan": false, "kavlan": true,
    "mac": "6c:2b:59:9c:3f:3a", "mac": "6c:2b:59:9c:3f:3a",
    "management": false, "management": false,
    "model": "I350 Gigabit Network Connection", "model": "I350 Gigabit Network Connection",
    ...@@ -111,8 +155,8 @@ ...@@ -111,8 +155,8 @@
    "rate": 1000000000, "rate": 1000000000,
    "sriov": false, "sriov": false,
    "sriov_totalvfs": 0, "sriov_totalvfs": 0,
    "switch": null, "switch": "sw-3",
    "switch_port": null, "switch_port": "1/1/29",
    "vendor": "Intel" "vendor": "Intel"
    }, },
    { {
    ......
    data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
    + 47
    − 3
    View file @ b4cedff6
    ...@@ -20,6 +20,50 @@ ...@@ -20,6 +20,50 @@
    "warranty_end": "2026-07-31" "warranty_end": "2026-07-31"
    }, },
    "exotic": false, "exotic": false,
    "kavlan": {
    "eth0": {
    "kavlan-1": "192.168.196.44",
    "kavlan-11": "10.7.229.44",
    "kavlan-12": "10.11.229.44",
    "kavlan-13": "10.15.229.44",
    "kavlan-14": "10.19.229.44",
    "kavlan-16": "10.27.229.44",
    "kavlan-17": "10.31.229.44",
    "kavlan-18": "10.35.229.44",
    "kavlan-2": "192.168.212.44",
    "kavlan-20": "10.43.229.44",
    "kavlan-21": "10.47.229.44",
    "kavlan-3": "192.168.228.44",
    "kavlan-4": "10.32.4.44",
    "kavlan-5": "10.32.68.44",
    "kavlan-6": "10.32.132.44",
    "kavlan-7": "10.32.196.44",
    "kavlan-8": "10.33.4.44",
    "kavlan-9": "10.33.68.44"
    }
    },
    "kavlan6": {
    "eth0": {
    "kavlan-1": "2001:660:4406:880:3::2c",
    "kavlan-11": "2001:660:4406:1a0:803::2c",
    "kavlan-12": "2001:660:4406:2a0:803::2c",
    "kavlan-13": "2001:660:4406:4a0:803::2c",
    "kavlan-14": "2001:660:4406:5a0:803::2c",
    "kavlan-16": "2001:660:4406:7a0:803::2c",
    "kavlan-17": "2001:660:4406:9a0:803::2c",
    "kavlan-18": "2001:660:4406:8a0:803::2c",
    "kavlan-2": "2001:660:4406:881:3::2c",
    "kavlan-20": "2001:660:4406:3a0:803::2c",
    "kavlan-21": "2001:660:4406:6a0:803::2c",
    "kavlan-3": "2001:660:4406:882:3::2c",
    "kavlan-4": "2001:660:4406:890:3::2c",
    "kavlan-5": "2001:660:4406:891:3::2c",
    "kavlan-6": "2001:660:4406:892:3::2c",
    "kavlan-7": "2001:660:4406:893:3::2c",
    "kavlan-8": "2001:660:4406:894:3::2c",
    "kavlan-9": "2001:660:4406:895:3::2c"
    }
    },
    "main_memory": { "main_memory": {
    "ram_size": 412316860416 "ram_size": 412316860416
    }, },
    ...@@ -100,7 +144,7 @@ ...@@ -100,7 +144,7 @@
    "interface": "Ethernet", "interface": "Ethernet",
    "ip": "172.16.130.44", "ip": "172.16.130.44",
    "ip6": "2001:660:4406:800:3::2c", "ip6": "2001:660:4406:800:3::2c",
    "kavlan": false, "kavlan": true,
    "mac": "6c:2b:59:9c:4a:6d", "mac": "6c:2b:59:9c:4a:6d",
    "management": false, "management": false,
    "model": "I350 Gigabit Network Connection", "model": "I350 Gigabit Network Connection",
    ...@@ -111,8 +155,8 @@ ...@@ -111,8 +155,8 @@
    "rate": 1000000000, "rate": 1000000000,
    "sriov": false, "sriov": false,
    "sriov_totalvfs": 0, "sriov_totalvfs": 0,
    "switch": null, "switch": "sw-3",
    "switch_port": null, "switch_port": "1/1/30",
    "vendor": "Intel" "vendor": "Intel"
    }, },
    { {
    ......
    data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
    + 47
    − 3
    View file @ b4cedff6
    ...@@ -20,6 +20,50 @@ ...@@ -20,6 +20,50 @@
    "warranty_end": "2026-07-31" "warranty_end": "2026-07-31"
    }, },
    "exotic": false, "exotic": false,
    "kavlan": {
    "eth0": {
    "kavlan-1": "192.168.196.45",
    "kavlan-11": "10.7.229.45",
    "kavlan-12": "10.11.229.45",
    "kavlan-13": "10.15.229.45",
    "kavlan-14": "10.19.229.45",
    "kavlan-16": "10.27.229.45",
    "kavlan-17": "10.31.229.45",
    "kavlan-18": "10.35.229.45",
    "kavlan-2": "192.168.212.45",
    "kavlan-20": "10.43.229.45",
    "kavlan-21": "10.47.229.45",
    "kavlan-3": "192.168.228.45",
    "kavlan-4": "10.32.4.45",
    "kavlan-5": "10.32.68.45",
    "kavlan-6": "10.32.132.45",
    "kavlan-7": "10.32.196.45",
    "kavlan-8": "10.33.4.45",
    "kavlan-9": "10.33.68.45"
    }
    },
    "kavlan6": {
    "eth0": {
    "kavlan-1": "2001:660:4406:880:3::2d",
    "kavlan-11": "2001:660:4406:1a0:803::2d",
    "kavlan-12": "2001:660:4406:2a0:803::2d",
    "kavlan-13": "2001:660:4406:4a0:803::2d",
    "kavlan-14": "2001:660:4406:5a0:803::2d",
    "kavlan-16": "2001:660:4406:7a0:803::2d",
    "kavlan-17": "2001:660:4406:9a0:803::2d",
    "kavlan-18": "2001:660:4406:8a0:803::2d",
    "kavlan-2": "2001:660:4406:881:3::2d",
    "kavlan-20": "2001:660:4406:3a0:803::2d",
    "kavlan-21": "2001:660:4406:6a0:803::2d",
    "kavlan-3": "2001:660:4406:882:3::2d",
    "kavlan-4": "2001:660:4406:890:3::2d",
    "kavlan-5": "2001:660:4406:891:3::2d",
    "kavlan-6": "2001:660:4406:892:3::2d",
    "kavlan-7": "2001:660:4406:893:3::2d",
    "kavlan-8": "2001:660:4406:894:3::2d",
    "kavlan-9": "2001:660:4406:895:3::2d"
    }
    },
    "main_memory": { "main_memory": {
    "ram_size": 412316860416 "ram_size": 412316860416
    }, },
    ...@@ -100,7 +144,7 @@ ...@@ -100,7 +144,7 @@
    "interface": "Ethernet", "interface": "Ethernet",
    "ip": "172.16.130.45", "ip": "172.16.130.45",
    "ip6": "2001:660:4406:800:3::2d", "ip6": "2001:660:4406:800:3::2d",
    "kavlan": false, "kavlan": true,
    "mac": "6c:2b:59:9a:05:c4", "mac": "6c:2b:59:9a:05:c4",
    "management": false, "management": false,
    "model": "I350 Gigabit Network Connection", "model": "I350 Gigabit Network Connection",
    ...@@ -111,8 +155,8 @@ ...@@ -111,8 +155,8 @@
    "rate": 1000000000, "rate": 1000000000,
    "sriov": false, "sriov": false,
    "sriov_totalvfs": 0, "sriov_totalvfs": 0,
    "switch": null, "switch": "sw-3",
    "switch_port": null, "switch_port": "1/1/31",
    "vendor": "Intel" "vendor": "Intel"
    }, },
    { {
    ......
    data/grid5000/sites/sophia/network_equipments/sw-3.json
    + 16
    − 0
    View file @ b4cedff6
    ...@@ -125,12 +125,28 @@ ...@@ -125,12 +125,28 @@
    { {
    }, },
    { {
    "kind": "node",
    "port": "eth0",
    "snmp_name": "1/1/28",
    "uid": "mercantour5-1"
    }, },
    { {
    "kind": "node",
    "port": "eth0",
    "snmp_name": "1/1/29",
    "uid": "mercantour5-2"
    }, },
    { {
    "kind": "node",
    "port": "eth0",
    "snmp_name": "1/1/30",
    "uid": "mercantour5-3"
    }, },
    { {
    "kind": "node",
    "port": "eth0",
    "snmp_name": "1/1/31",
    "uid": "mercantour5-4"
    }, },
    { {
    }, },
    ......
    input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
    + 1
    − 1
    View file @ b4cedff6
    --- ---
    model: Dell PowerEdge C6420 model: Dell PowerEdge C6420
    created_at: 2025-02-24 created_at: 2025-02-24
    kavlan: false #TO DO AFTER kavlan: true
    boot_type: bios boot_type: bios
    exotic: false exotic: false
    queues: queues:
    ......
    input/grid5000/sites/sophia/networks/sw-3.yaml
    + 8
    − 0
    View file @ b4cedff6
    ...@@ -44,6 +44,14 @@ sw-3: ...@@ -44,6 +44,14 @@ sw-3:
    uid: mercantour2-4 uid: mercantour2-4
    17: 17:
    uid: mercantour6-1 uid: mercantour6-1
    28:
    uid: mercantour5-1
    29:
    uid: mercantour5-2
    30:
    uid: mercantour5-3
    31:
    uid: mercantour5-4
    33: 33:
    uid: mercantour2-2 uid: mercantour2-2
    34: 34:
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment