return to the origin of firewire
This commit is contained in:
Cayo Puigdefabregas
parent
90dea5492e
commit
2c71d69a9a
|
|
@ -1,36 +0,0 @@
|
|||
"""change firewire
|
||||
|
||||
Revision ID: 17288b2a7440
|
||||
Revises: 8571fb32c912
|
||||
Create Date: 2022-03-29 11:49:39.270791
|
||||
|
||||
"""
|
||||
from alembic import op, context
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
import citext
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '17288b2a7440'
|
||||
down_revision = '8571fb32c912'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def get_inv():
|
||||
INV = context.get_x_argument(as_dictionary=True).get('inventory')
|
||||
if not INV:
|
||||
raise ValueError("Inventory value is not specified")
|
||||
return INV
|
||||
|
||||
|
||||
def upgrade():
|
||||
op.alter_column('motherboard', 'firewire', citext.CIText(), schema=f'{get_inv()}')
|
||||
op.add_column('computer', sa.Column('uuid', postgresql.UUID(as_uuid=True),
|
||||
nullable=True),
|
||||
schema=f'{get_inv()}')
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.alter_column('motherboard', 'firewire', sa.SmallInteger(), schema=f'{get_inv()}')
|
||||
|
|
@ -1,267 +0,0 @@
|
|||
import json
|
||||
|
||||
from dmidecode import DMIParse
|
||||
|
||||
|
||||
class Demidecode:
|
||||
def __init__(self, raw, default="n/a"):
|
||||
self.default = default
|
||||
self.raw = raw
|
||||
self.dmi = DMIParse(raw)
|
||||
self.device = {"actions": []}
|
||||
self.components = []
|
||||
self.set_basic_datas()
|
||||
self.computer = {
|
||||
"device": self.device,
|
||||
"software": "Workbench",
|
||||
"components": self.components(),
|
||||
}
|
||||
|
||||
def set_basic_datas(self):
|
||||
self.device['manufacturer'] = self.dmi.manufacturer()
|
||||
self.device['model'] = self.dmi.model()
|
||||
self.device['serialNumber'] = self.dmi.serial_number()
|
||||
self.device['type'] = self.get_type()
|
||||
self.device['sku'] = self.get_sku()
|
||||
self.device['version'] = self.get_version()
|
||||
self.device['uuid'] = self.get_uuid()
|
||||
|
||||
def set_components(self):
|
||||
self.get_cpu()
|
||||
self.get_ram()
|
||||
self.get_mother_board()
|
||||
|
||||
def get_cpu(self):
|
||||
# TODO @cayop generation, brand and address not exist in dmidecode
|
||||
for cpu in self.dmi.get('Processor'):
|
||||
self.components.append(
|
||||
{
|
||||
"actions": [],
|
||||
"type": "Processor",
|
||||
"speed": cpu.get('Max Speed'),
|
||||
"cores": int(cpu.get('Core Count', 1)),
|
||||
"model": cpu.get('Version'),
|
||||
"threads": int(cpu.get('Thread Count', 1)),
|
||||
"manufacturer": cpu.get('Manufacturer'),
|
||||
"serialNumber": cpu.get('Serial Number'),
|
||||
"generation": cpu.get('Generation'),
|
||||
"brand": cpu.get('Brand'),
|
||||
"address": cpu.get('Address'),
|
||||
}
|
||||
)
|
||||
|
||||
def get_ram(self):
|
||||
# TODO @cayop format and model not exist in dmidecode
|
||||
for ram in self.dmi.get("Memory Device"):
|
||||
self.components.append(
|
||||
{
|
||||
"actions": [],
|
||||
"type": "RamModule",
|
||||
"size": self.get_ram_size(ram),
|
||||
"speed": self.get_ram_speed(ram),
|
||||
"manufacturer": ram.get("Manufacturer", self.default),
|
||||
"serialNumber": ram.get("Serial Number", self.default),
|
||||
"interface": ram.get("Type", self.default),
|
||||
"format": ram.get("Format", self.default), # "DIMM",
|
||||
"model": ram.get(
|
||||
"Model", self.default
|
||||
), # "48594D503131325336344350362D53362020",
|
||||
}
|
||||
)
|
||||
|
||||
def get_mother_board(self):
|
||||
# TODO @cayop model, not exist in dmidecode
|
||||
for moder_board in self.dmi.get("Baseboard"):
|
||||
self.components.append(
|
||||
{
|
||||
"actions": [],
|
||||
"type": "Motherboard",
|
||||
"version": moder_board.get("Version"),
|
||||
"serialNumber": moder_board.get("Serial Number"),
|
||||
"manufacturer": moder_board.get("Manufacturer"),
|
||||
"ramSlots": self.get_ram_slots(),
|
||||
"ramMaxSize": self.get_max_ram_size(),
|
||||
"slots": len(self.dmi.get("Number Of Devices")),
|
||||
"biosDate": self.get_bios_date(),
|
||||
"firewire": self.get_firmware(),
|
||||
"model": moder_board.get("Product Name"), # ??
|
||||
"pcmcia": self.get_pcmcia_num(), # ??
|
||||
"serial": self.get_serial_num(), # ??
|
||||
"usb": self.get_usb_num(),
|
||||
}
|
||||
)
|
||||
|
||||
def get_usb_num(self):
|
||||
return len(
|
||||
[u for u in self.get("Port Connector") if u.get("Port Type") == "USB"]
|
||||
)
|
||||
|
||||
def get_serial_num(self):
|
||||
return len(
|
||||
[u for u in self.get("Port Connector") if u.get("Port Type") == "SERIAL"]
|
||||
)
|
||||
|
||||
def get_pcmcia_num(self):
|
||||
return len(
|
||||
[u for u in self.get("Port Connector") if u.get("Port Type") == "PCMCIA"]
|
||||
)
|
||||
|
||||
def get_bios_date(self):
|
||||
return self.get("BIOS")[0].get("Release Date", self.default)
|
||||
|
||||
def get_firmware(self):
|
||||
return self.get("BIOS")[0].get("Firmware Revision", self.default)
|
||||
|
||||
def get_max_ram_size(self):
|
||||
size = self.dmi.get("Physical Memory Array")
|
||||
if size:
|
||||
size = size.get("Maximum Capacity")
|
||||
|
||||
return size.split(" GB")[0] if size else self.default
|
||||
|
||||
def get_ram_slots(self):
|
||||
slots = self.dmi.get("Physical Memory Array")
|
||||
if slots:
|
||||
slots = slots.get("Number Of Devices")
|
||||
return int(slots) if slots else self.default
|
||||
|
||||
def get_ram_size(self, ram):
|
||||
size = ram.get("Size")
|
||||
return size.split(" MB")[0] if size else self.default
|
||||
|
||||
def get_ram_speed(self, ram):
|
||||
size = ram.get("Speed")
|
||||
return size.split(" MT/s")[0] if size else self.default
|
||||
|
||||
def get_sku(self):
|
||||
return self.get("System")[0].get("SKU Number", self.default)
|
||||
|
||||
def get_version(self):
|
||||
return self.get("System")[0].get("Version", self.default)
|
||||
|
||||
def get_uuid(self):
|
||||
return self.get("System")[0].get("UUID", self.default)
|
||||
|
||||
def get_chassis(self):
|
||||
return self.get("Chassis")[0].get("Type", self.default)
|
||||
|
||||
def get_type(self):
|
||||
chassis_type = self.get_chassis()
|
||||
return self.translation_to_devicehub(chassis_type)
|
||||
|
||||
def translation_to_devicehub(self, original_type):
|
||||
lower_type = original_type.lower()
|
||||
CHASSIS_TYPE = {
|
||||
'Desktop': [
|
||||
'desktop',
|
||||
'low-profile',
|
||||
'tower',
|
||||
'docking',
|
||||
'all-in-one',
|
||||
'pizzabox',
|
||||
'mini-tower',
|
||||
'space-saving',
|
||||
'lunchbox',
|
||||
'mini',
|
||||
'stick',
|
||||
],
|
||||
'Laptop': [
|
||||
'portable',
|
||||
'laptop',
|
||||
'convertible',
|
||||
'tablet',
|
||||
'detachable',
|
||||
'notebook',
|
||||
'handheld',
|
||||
'sub-notebook',
|
||||
],
|
||||
'Server': ['server'],
|
||||
'Computer': ['_virtual'],
|
||||
}
|
||||
for k, v in CHASSIS_TYPE.items():
|
||||
if lower_type in v:
|
||||
return k
|
||||
return self.default
|
||||
|
||||
|
||||
class LsHw:
|
||||
def __init__(self, dmi, jshw, hwinfo, default="n/a"):
|
||||
self.default = default
|
||||
self.hw = self.loads(jshw)
|
||||
self.hwinfo = hwinfo.splitlines()
|
||||
self.childrens = self.hw.get('children', [])
|
||||
self.dmi = dmi
|
||||
self.components = dmi.components
|
||||
self.device = dmi.device
|
||||
self.add_components()
|
||||
|
||||
def add_components(self):
|
||||
self.get_cpu_addr()
|
||||
self.get_networks()
|
||||
|
||||
def get_cpu_addr(self):
|
||||
for cpu in self.components:
|
||||
if not cpu['type'] == "Processor":
|
||||
continue
|
||||
|
||||
cpu["address"] = self.hw.get("width")
|
||||
|
||||
def get_networks(self):
|
||||
for x in self.childrens:
|
||||
if not x['id'] == 'network':
|
||||
continue
|
||||
|
||||
self.components.append(
|
||||
{
|
||||
"actions": [],
|
||||
"type": "NetworkAdapter",
|
||||
"serialNumber": x.get('serial'),
|
||||
"speed": x.get('capacity', 10000000) / 1000**2,
|
||||
"model": x.get("product"),
|
||||
"manufacturer": x.get('vendor'),
|
||||
"variant": x.get("version"),
|
||||
"wireless": bool(x.get('configuration', {}).get('wireless', False)),
|
||||
}
|
||||
)
|
||||
|
||||
def get_display(self):
|
||||
if not self.device['type'] == 'Laptop':
|
||||
return
|
||||
|
||||
for x in self.childrens:
|
||||
if not x['id'] == 'display':
|
||||
continue
|
||||
|
||||
width, height = self.get_display_resolution(x)
|
||||
self.components.append(
|
||||
{
|
||||
"actions": [],
|
||||
"type": "Display",
|
||||
"model": x.get("product"),
|
||||
"manufacturer": x.get('vendor'),
|
||||
"serialNumber": x.get('serial'),
|
||||
"resolutionWidth": width,
|
||||
"resolutionHeight": height,
|
||||
"technology": "LCD",
|
||||
"productionDate": "2009-01-04T00:00:00",
|
||||
"refreshRate": 60,
|
||||
"size": self.get_display_size(),
|
||||
}
|
||||
)
|
||||
|
||||
def get_display_resolution(self, display):
|
||||
resolution = display.get('configuration', {}).get('resolution', "1, 1")
|
||||
return resolution.split(",")
|
||||
|
||||
def get_display_size(self):
|
||||
width = height = 1
|
||||
for line in self.hwinfo:
|
||||
if ' Size:' not in line:
|
||||
continue
|
||||
width, height = line.split(' Size:')[1].split(" mm")[0].split("x")
|
||||
break
|
||||
|
||||
def loads(jshw):
|
||||
if isinstance(jshw, dict):
|
||||
return jshw
|
||||
return json.loads(jshw)
|
||||
|
|
@ -956,7 +956,7 @@ class Motherboard(JoinedComponentTableMixin, Component):
|
|||
slots = Column(SmallInteger, check_range('slots', min=0))
|
||||
slots.comment = """PCI slots the motherboard has."""
|
||||
usb = Column(SmallInteger, check_range('usb', min=0))
|
||||
firewire = Column(CIText())
|
||||
firewire = Column(SmallInteger, check_range('firewire', min=0))
|
||||
serial = Column(SmallInteger, check_range('serial', min=0))
|
||||
pcmcia = Column(SmallInteger, check_range('pcmcia', min=0))
|
||||
bios_date = Column(db.Date)
|
||||
|
|
|
|||
|
|
@ -272,8 +272,7 @@ class Motherboard(Component):
|
|||
slots = Integer(validate=Range(0, 20),
|
||||
description=m.Motherboard.slots.comment)
|
||||
usb = Integer(validate=Range(0, 20), description=m.Motherboard.usb.comment)
|
||||
# firewire = Integer(validate=Range(0, 20), description=m.Motherboard.firewire.comment)
|
||||
firewire = String(description=m.Motherboard.firewire.comment)
|
||||
firewire = Integer(validate=Range(0, 20), description=m.Motherboard.firewire.comment)
|
||||
serial = Integer(validate=Range(0, 20), description=m.Motherboard.serial.comment)
|
||||
pcmcia = Integer(validate=Range(0, 20), description=m.Motherboard.pcmcia.comment)
|
||||
bios_date = Date(validate=Range(datetime.date(year=1980, month=1, day=1),
|
||||
|
|
|
|||
Reference in a new issue