diff --git a/data/grid5000/sites/sophia/network_equipments/ciscosol.json b/data/grid5000/sites/sophia/network_equipments/ciscosol.json index d544abceeb7f0a6f24c1313818616814e8a43b35..62544167cfb84cbe189f0d9f475c6ed21f40052a 100644 --- a/data/grid5000/sites/sophia/network_equipments/ciscosol.json +++ b/data/grid5000/sites/sophia/network_equipments/ciscosol.json @@ -256,6 +256,6 @@ "naming_pattern": "Vlan%VLANID%" }, "weathermap": { - + "use_cacti": "no" } } \ No newline at end of file diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json index fd5c3b57b7de44134f8e295cd4d7aebfb1231040..cb05b213411a3ea7cd77bfecc5dee8c8edad2159 100644 --- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json +++ b/data/grid5000/sites/sophia/network_equipments/edgeiron.json @@ -12,11 +12,11 @@ }, { - "port": "2/1", + "port": "ethernet2/1", "uid": "fastiron" }, { - "port": "2/2", + "port": "ethernet2/2", "uid": "fastiron" } ], @@ -295,6 +295,6 @@ "naming_pattern": "Vlan%VLANID%" }, "weathermap": { - + "use_cacti": "no" } } \ No newline at end of file diff --git a/generators/input/sites/sophia/net-links/ciscosol.yaml b/generators/input/sites/sophia/net-links/ciscosol.yaml index 0a59fbc0dbeeedb34c0ad83d94add64b060dc98e..19e7faa62bb19978b18479fb60c88eb91eec517b 100644 --- a/generators/input/sites/sophia/net-links/ciscosol.yaml +++ b/generators/input/sites/sophia/net-links/ciscosol.yaml @@ -4,6 +4,8 @@ ciscosol: kind: switch site: sophia snmp_community: public + weathermap: + use_cacti: "no" vlans: naming_pattern: Vlan%VLANID% routes: {} diff --git a/generators/input/sites/sophia/net-links/edgeiron.yaml b/generators/input/sites/sophia/net-links/edgeiron.yaml index 3bf886e467c8ab395a5eac574e18c3f8867a941a..6a70f5924688efe55eb20c77ce8f2f17e1cc68de 100644 --- a/generators/input/sites/sophia/net-links/edgeiron.yaml +++ b/generators/input/sites/sophia/net-links/edgeiron.yaml @@ -4,6 +4,8 @@ edgeiron: kind: router site: sophia snmp_community: public + weathermap: + use_cacti: "no" vlans: naming_pattern: Vlan%VLANID% "100": @@ -20,10 +22,10 @@ edgeiron: ports: 1: uid: fastiron - port: 2/1 + port: ethernet2/1 2: uid: fastiron - port: 2/2 + port: ethernet2/2 1: naming_pattern: "%LINECARD%/%PORT%" kind: node