From 0a503f96385b1dcca639ed9a53989690acd01d35 Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 30 Dec 2021 13:42:06 +0200 Subject: [PATCH 1/5] Add some ARR1001 models --- .../Cisco/ASR1000/ASR1001-ESP.json | 22 ++++++++ .../Cisco/ASR1000/ASR1001-SIP.json | 50 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 collections/inv.objectmodels/Cisco/ASR1000/ASR1001-ESP.json create mode 100644 collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-ESP.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-ESP.json new file mode 100644 index 0000000000..e62b0647f5 --- /dev/null +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-ESP.json @@ -0,0 +1,22 @@ +{ + "name": "Cisco | ASR1000 | ASR1001 ESP", + "$collection": "inv.objectmodels", + "uuid": "1ee36f3f-1b45-4f4f-90db-9f84335f0b60", + "vendor__code": "CISCO", + "description": "Cisco ASR 1001 Embedded Services Processor", + "cr_context": "ESP", + "connections": [ + { + "name": "in", + "description": "Chassis connection", + "direction": "o", + "gender": "m", + "type__name": "Cisco | ASR1000 | ESP" + } + ], + "data": { + "asset": { + "part_no": ["ASR1001-ESP"] + } + } +} diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json new file mode 100644 index 0000000000..456b43771b --- /dev/null +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json @@ -0,0 +1,50 @@ +{ + "name": "Cisco | ASR1000 | ARS1001 SIP", + "$collection": "inv.objectmodels", + "uuid": "37cd7040-008f-4a9b-944d-3a7057efd21a", + "vendor__code": "CISCO", + "description": "Cisco ASR1001 Series SPA Interface Processor", + "cr_context": "SIP", + "connections": [ + { + "name": "in", + "description": "Chassis connection", + "direction": "o", + "gender": "m", + "type__name": "Cisco | ASR1000 | SIP" + }, + { + "name": "spa0", + "description": "SPA subslot x/0", + "direction": "i", + "gender": "f", + "type__name": "Cisco | SPA" + }, + { + "name": "spa1", + "description": "SPA subslot x/1", + "direction": "i", + "gender": "f", + "type__name": "Cisco | SPA" + }, + { + "name": "spa2", + "description": "SPA subslot x/2", + "direction": "i", + "gender": "f", + "type__name": "Cisco | SPA" + }, + { + "name": "spa3", + "description": "SPA subslot x/3", + "direction": "i", + "gender": "f", + "type__name": "Cisco | SPA" + } + ], + "data": { + "asset": { + "part_no": ["ASR1001-SIP"] + } + } +} -- GitLab From 98579d9e865bd71a730839b2eb3e1230de80bb37 Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 30 Dec 2021 14:39:25 +0200 Subject: [PATCH 2/5] Fix --- .../Cisco/ASR1000/ASR1001-SIP.json | 2 +- .../Cisco/ASR1000/ASR1001-SPA.json | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SPA.json diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json index 456b43771b..ce050fa8fd 100644 --- a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json @@ -1,5 +1,5 @@ { - "name": "Cisco | ASR1000 | ARS1001 SIP", + "name": "Cisco | ASR1000 | ASR1001 SIP", "$collection": "inv.objectmodels", "uuid": "37cd7040-008f-4a9b-944d-3a7057efd21a", "vendor__code": "CISCO", diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SPA.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SPA.json new file mode 100644 index 0000000000..99d717019e --- /dev/null +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SPA.json @@ -0,0 +1,54 @@ +{ + "name": "Cisco | ASR1000 | ASR1001 SPA", + "$collection": "inv.objectmodels", + "uuid": "f0949d68-067d-4754-9075-5eafa7d08081", + "vendor__code": "CISCO", + "description": "4-port Gigabit Ethernet Shared Port Adapter", + "cr_context": "SPA", + "connections": [ + { + "name": "in", + "description": "SIP connection", + "direction": "o", + "gender": "m", + "type__name": "Cisco | SPA" + }, + { + "name": "Gi0_sfp", + "description": "SFP port 0", + "direction": "i", + "gender": "f", + "protocols": ["TransEth1G"], + "type__name": "Transceiver | SFP" + }, + { + "name": "Gi1_sfp", + "description": "SFP port 1", + "direction": "i", + "gender": "f", + "protocols": ["TransEth1G"], + "type__name": "Transceiver | SFP" + }, + { + "name": "Gi2_sfp", + "description": "SFP port 2", + "direction": "i", + "gender": "f", + "protocols": ["TransEth1G"], + "type__name": "Transceiver | SFP" + }, + { + "name": "Gi3_sfp", + "description": "SFP port 3", + "direction": "i", + "gender": "f", + "protocols": ["TransEth1G"], + "type__name": "Transceiver | SFP" + } + ], + "data": { + "asset": { + "part_no": ["ASR1001-SPA"] + } + } +} -- GitLab From ad3161fac944e9a0b21a79c2342ccd35f0122c0b Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 30 Dec 2021 14:55:27 +0200 Subject: [PATCH 3/5] Fix --- .../Cisco/ASR1000/ASR1001-SIP.json | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json index ce050fa8fd..d3933ea520 100644 --- a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001-SIP.json @@ -15,28 +15,7 @@ }, { "name": "spa0", - "description": "SPA subslot x/0", - "direction": "i", - "gender": "f", - "type__name": "Cisco | SPA" - }, - { - "name": "spa1", - "description": "SPA subslot x/1", - "direction": "i", - "gender": "f", - "type__name": "Cisco | SPA" - }, - { - "name": "spa2", - "description": "SPA subslot x/2", - "direction": "i", - "gender": "f", - "type__name": "Cisco | SPA" - }, - { - "name": "spa3", - "description": "SPA subslot x/3", + "description": "SPA subslot 0", "direction": "i", "gender": "f", "type__name": "Cisco | SPA" -- GitLab From 02a6ed69d67e87af27e4b90472732b4ffcc96b87 Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 30 Dec 2021 15:01:56 +0200 Subject: [PATCH 4/5] Fix --- .../Cisco/ASR1000/ASR1001.json | 43 ++++--------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json index a9e579bdb9..1d1a299719 100644 --- a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json @@ -22,42 +22,10 @@ "type__name": "Cisco | ASR1000 | ASR1001 PSU" }, { - "description": "Gi0/0/0", + "description": "SPA Interface Processor slot", "direction": "i", "gender": "f", - "name": "Gi0_sfp", - "protocols": ["TransEth100M", "TransEth1G"], - "type__name": "Transceiver | SFP" - }, - { - "description": "Gi0/0/1", - "direction": "i", - "gender": "f", - "name": "Gi1_sfp", - "protocols": ["TransEth100M", "TransEth1G"], - "type__name": "Transceiver | SFP" - }, - { - "description": "Gi0/0/2", - "direction": "i", - "gender": "f", - "name": "Gi2_sfp", - "protocols": ["TransEth100M", "TransEth1G"], - "type__name": "Transceiver | SFP" - }, - { - "description": "Gi0/0/3", - "direction": "i", - "gender": "f", - "name": "Gi3_sfp", - "protocols": ["TransEth100M", "TransEth1G"], - "type__name": "Transceiver | SFP" - }, - { - "description": "SPA Interface Processor slot 1", - "direction": "i", - "gender": "f", - "name": "sip1", + "name": "sip0", "type__name": "Cisco | ASR1000 | SIP" }, { @@ -67,6 +35,13 @@ "name": "r0", "type__name": "Cisco | ASR1000 | RP" } + { + "description": "Embedded Services Processor slot", + "direction": "i", + "gender": "f", + "name": "f0", + "type__name": "Cisco | ASR1000 | ESP" + } ], "data": { "airflow": { -- GitLab From bcc6056075031cb496e3caaf40cba260ecd58e77 Mon Sep 17 00:00:00 2001 From: Dmitry Luhtionov Date: Thu, 30 Dec 2021 15:08:03 +0200 Subject: [PATCH 5/5] Fix --- collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json index 1d1a299719..1857fb5d81 100644 --- a/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json +++ b/collections/inv.objectmodels/Cisco/ASR1000/ASR1001.json @@ -34,7 +34,7 @@ "gender": "f", "name": "r0", "type__name": "Cisco | ASR1000 | RP" - } + }, { "description": "Embedded Services Processor slot", "direction": "i", -- GitLab