DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

fix raid creation on server's registration #71

Merged
Solvik merged 1 commit from fix_raid_cards into master 2019-09-10 11:51:05 +02:00
Conversation 0 Commits 1 Files changed 1 +6 -10
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
netbox_agent/inventory.py
View file

@ -4,6 +4,7 @@ import pynetbox
from netbox_agent.config import netbox_instance as nb, config from netbox_agent.config import netbox_instance as nb, config
from netbox_agent.misc import is_tool, get_vendor from netbox_agent.misc import is_tool, get_vendor
from netbox_agent.raid.hp import HPRaid from netbox_agent.raid.hp import HPRaid
from netbox_agent.raid.omreport import OmreportRaid
from netbox_agent.raid.storcli import StorcliRaid from netbox_agent.raid.storcli import StorcliRaid
from netbox_agent.lshw import LSHW from netbox_agent.lshw import LSHW
@ -216,6 +217,8 @@ class Inventory():
def get_raid_cards(self): def get_raid_cards(self):
if self.server.manufacturer == 'Dell': if self.server.manufacturer == 'Dell':
if is_tool('omreport'):
self.raid = OmreportRaid()
if is_tool('storcli'): if is_tool('storcli'):
self.raid = StorcliRaid() self.raid = StorcliRaid()
elif self.server.manufacturer == 'HP': elif self.server.manufacturer == 'HP':
@ -251,14 +254,7 @@ class Inventory():
)) ))
return nb_raid_card return nb_raid_card
def create_netbox_raid_cards(self): def do_netbox_raid_cards(self):
for raid_card in self.get_netbox_inventory(
device_id=self.device_id,
tag=[INVENTORY_TAG['raid_card']['slug']]
):
self.create_netbox_raid_card(raid_card)
def update_netbox_raid_cards(self):
""" """
Update raid cards in netbobx Update raid cards in netbobx
Since we only push: Since we only push:
@ -442,7 +438,7 @@ class Inventory():
return False return False
self.do_netbox_cpus() self.do_netbox_cpus()
self.do_netbox_memories() self.do_netbox_memories()
self.create_netbox_raid_cards() self.do_netbox_raid_cards()
self.do_netbox_disks() self.do_netbox_disks()
self.do_netbox_interfaces() self.do_netbox_interfaces()
self.do_netbox_motherboard() self.do_netbox_motherboard()
@ -453,7 +449,7 @@ class Inventory():
return False return False
self.do_netbox_cpus() self.do_netbox_cpus()
self.do_netbox_memories() self.do_netbox_memories()
self.update_netbox_raid_cards() self.do_netbox_raid_cards()
self.do_netbox_disks() self.do_netbox_disks()
self.do_netbox_interfaces() self.do_netbox_interfaces()
self.do_netbox_motherboard() self.do_netbox_motherboard()