From b967a80a77fb22d91f0726fce949f3defd5229ea Mon Sep 17 00:00:00 2001 From: Stu Franks Date: Thu, 3 May 2018 15:43:16 +0100 Subject: [PATCH] Tweak asset types (arrays, location, serial/model) --- data/asset_types/chassis.yaml | 5 ++++- data/asset_types/disk_array.yaml | 4 ++++ data/asset_types/network_adapter.yaml | 28 ++++++++++++++++++++++----- data/asset_types/network_switch.yaml | 3 +++ data/asset_types/pdu.yaml | 6 ++++++ data/asset_types/psu.yaml | 6 +++++- data/asset_types/rack.yaml | 7 ++++++- data/asset_types/server.yaml | 6 +++--- 8 files changed, 54 insertions(+), 11 deletions(-) diff --git a/data/asset_types/chassis.yaml b/data/asset_types/chassis.yaml index 9f2942d8..7d93e256 100644 --- a/data/asset_types/chassis.yaml +++ b/data/asset_types/chassis.yaml @@ -1,11 +1,14 @@ manufacturer: null +model: null +serial: null slots: 4 oob: ip: null netmask: null user: null password: null -psus: null +psus: [] +servers: [] location: rack: null slot: null diff --git a/data/asset_types/disk_array.yaml b/data/asset_types/disk_array.yaml index 7436f665..ceaf3f3f 100644 --- a/data/asset_types/disk_array.yaml +++ b/data/asset_types/disk_array.yaml @@ -1,8 +1,12 @@ +manufacturer: null +model: null +serial: null oob: ip: null netmask: null user: null password: null +psus: [] location: rack: null slot: null diff --git a/data/asset_types/network_adapter.yaml b/data/asset_types/network_adapter.yaml index 0093e0b6..d5641057 100644 --- a/data/asset_types/network_adapter.yaml +++ b/data/asset_types/network_adapter.yaml @@ -1,6 +1,24 @@ -#port_name: cable_colour +manufacturer: null +model: null +serial: null ports: - em1: null - em2: null - em3: null - em4: null + em1: + network: null + mac: null + switch: null + port: null + em2: + network: null + mac: null + switch: null + port: null + em3: + network: null + mac: null + switch: null + port: null + em4: + network: null + mac: null + switch: null + port: null diff --git a/data/asset_types/network_switch.yaml b/data/asset_types/network_switch.yaml index 3b6a4453..22317c10 100644 --- a/data/asset_types/network_switch.yaml +++ b/data/asset_types/network_switch.yaml @@ -1,3 +1,6 @@ +manufacturer: null +model: null +serial: null oob: ip: null netmask: null diff --git a/data/asset_types/pdu.yaml b/data/asset_types/pdu.yaml index e88159ca..997f8bbb 100644 --- a/data/asset_types/pdu.yaml +++ b/data/asset_types/pdu.yaml @@ -1,6 +1,12 @@ +manufacturer: null +model: null +serial: null oob: ip: null netmask: null user: null password: null ports: 16 +location: + rack: null + slot: null diff --git a/data/asset_types/psu.yaml b/data/asset_types/psu.yaml index 4934a515..9cbe7d90 100644 --- a/data/asset_types/psu.yaml +++ b/data/asset_types/psu.yaml @@ -1,4 +1,8 @@ -ports: 1 +manufacturer: null +model: null +serial: null location: pdu: null port: null + chassis: null + slot: null diff --git a/data/asset_types/rack.yaml b/data/asset_types/rack.yaml index 9617f600..616baf66 100644 --- a/data/asset_types/rack.yaml +++ b/data/asset_types/rack.yaml @@ -1,4 +1,9 @@ manufacturer: null +model: null +serial: null slots: 42 slot_orientation: horizontal -pdus: null +pdus: [] +chassis: [] +switches: [] +disk_arrays: [] diff --git a/data/asset_types/server.yaml b/data/asset_types/server.yaml index 1a748656..02fcea18 100644 --- a/data/asset_types/server.yaml +++ b/data/asset_types/server.yaml @@ -1,12 +1,12 @@ manufacturer: null +model: null +serial: null oob: ip: null netmask: null user: null password: null -psus: null -network_adapters: null +network_adapters: [] location: - rack: null chassis: null slot: null