Merge branch 'cisco_psu' into 'master'

Fix some Cisco models and connectionrules See merge request noc/noc!5998

Merge branch 'cisco_psu' into 'master'
Fix some Cisco models and connectionrules See merge request noc/noc!5998
7e13a313 · bee26 · 74af9632 · e780d4a8 · 7e13a313 · 7e13a313
Commit 7e13a313 authored Jan 27, 2022 by bee26
--- a/collections/inv.connectionrules/Cisco/2800.json
+++ b/collections/inv.connectionrules/Cisco/2800.json
@@ -45,6 +45,14 @@
            "target_number": "",
            "target_type": "MOTHERBOARD"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "mb",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "MOTHERBOARD"
+        },
        {
            "match_connection": "in",
            "match_type": "AIM",

--- a/collections/inv.connectionrules/Cisco/2900.json
+++ b/collections/inv.connectionrules/Cisco/2900.json
@@ -90,6 +90,14 @@
            "target_number": "",
            "target_type": "MOTHERBOARD"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "mb",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "MOTHERBOARD"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/3800.json
+++ b/collections/inv.connectionrules/Cisco/3800.json
@@ -61,6 +61,14 @@
            "target_number": "",
            "target_type": "MOTHERBOARD"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "mb",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "MOTHERBOARD"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/3900.json
+++ b/collections/inv.connectionrules/Cisco/3900.json
@@ -82,6 +82,14 @@
            "target_number": "",
            "target_type": "SPE"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "spe",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "SPE"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/6500-E.json
+++ b/collections/inv.connectionrules/Cisco/6500-E.json
@@ -77,6 +77,14 @@
            "target_number": "",
            "target_type": "SUP"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "sup",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "SUP"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/6500.json
+++ b/collections/inv.connectionrules/Cisco/6500.json
@@ -77,6 +77,14 @@
            "target_number": "",
            "target_type": "SUP"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "sup",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "SUP"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/7100.json
+++ b/collections/inv.connectionrules/Cisco/7100.json
@@ -37,6 +37,14 @@
            "target_number": "",
            "target_type": "CHASSIS"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | PCMCIA",
+            "scope": "mb",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "MOTHERBOARD"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/7200.json
+++ b/collections/inv.connectionrules/Cisco/7200.json
@@ -37,6 +37,14 @@
            "target_number": "",
            "target_type": "CHASSIS"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "sup",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "SUP"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/C4900.json
+++ b/collections/inv.connectionrules/Cisco/C4900.json
@@ -32,6 +32,14 @@
            "target_number": "",
            "target_type": "LINECARD"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "chassis",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "CHASSIS"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.connectionrules/Cisco/C6500ME.json
+++ b/collections/inv.connectionrules/Cisco/C6500ME.json
@@ -45,6 +45,14 @@
            "target_number": "",
            "target_type": "CHASSIS"
        },
+        {
+            "match_connection": "in",
+            "match_type": "Flash | CF",
+            "scope": "chassis",
+            "target_connection": "disk{N}",
+            "target_number": "",
+            "target_type": "CHASSIS"
+        },
        {
            "match_connection": "in",
            "match_type": "PSU",

--- a/collections/inv.objectmodels/Cisco/7200/7201_Chassis.json
+++ b/collections/inv.objectmodels/Cisco/7200/7201_Chassis.json
@@ -106,14 +106,14 @@
            "description": "PSU0",
            "direction": "i",
            "gender": "f",
-            "name": "pwr0",
+            "name": "psu0",
            "type__name": "Cisco | 7200 | 7201 PWR"
        },
        {
            "description": "PSU1",
            "direction": "i",
            "gender": "f",
-            "name": "pwr1",
+            "name": "psu1",
            "type__name": "Cisco | 7200 | 7201 PWR"
        }
    ],

--- a/collections/inv.objectmodels/Cisco/7200/7204VXR_Chassis.json
+++ b/collections/inv.objectmodels/Cisco/7200/7204VXR_Chassis.json
@@ -47,14 +47,14 @@
            "description": "PSU0",
            "direction": "i",
            "gender": "f",
-            "name": "pwr0",
+            "name": "psu0",
            "type__name": "Cisco | 7200 | PWR-7200"
        },
        {
            "description": "PSU1",
            "direction": "i",
            "gender": "f",
-            "name": "pwr1",
+            "name": "psu1",
            "type__name": "Cisco | 7200 | PWR-7200"
        }
    ],

--- a/collections/inv.objectmodels/Cisco/7200/7206VXR_Chassis.json
+++ b/collections/inv.objectmodels/Cisco/7200/7206VXR_Chassis.json
@@ -61,14 +61,14 @@
            "description": "PSU0",
            "direction": "i",
            "gender": "f",
-            "name": "pwr0",
+            "name": "psu0",
            "type__name": "Cisco | 7200 | PWR-7200"
        },
        {
            "description": "PSU1",
            "direction": "i",
            "gender": "f",
-            "name": "pwr1",
+            "name": "psu1",
            "type__name": "Cisco | 7200 | PWR-7200"
        }
    ],