Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim output from get facts so it will fit in sqlalchemy fields #153

Merged
merged 1 commit into from
Jan 18, 2021
Merged

Trim output from get facts so it will fit in sqlalchemy fields #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/cnaas_nms/confpush/init_device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ def init_device_step2(device_id: int, iteration: int = -1,
dev: Device = session.query(Device).filter(Device.id == device_id).one()
dev.state = DeviceState.MANAGED
dev.synchronized = False
dev.serial = facts['serial_number']
dev.vendor = facts['vendor']
dev.model = facts['model']
dev.os_version = facts['os_version']
dev.serial = facts['serial_number'][:64]
dev.vendor = facts['vendor'][:64]
dev.model = facts['model'][:64]
dev.os_version = facts['os_version'][:64]
management_ip = dev.management_ip
dev.dhcp_ip = None

Expand Down Expand Up @@ -720,10 +720,10 @@ def discover_device(ztp_mac: str, dhcp_ip: str, iteration: int,
facts = nrresult[hostname][0].result['facts']
with sqla_session() as session:
dev: Device = session.query(Device).filter(Device.ztp_mac == ztp_mac).one()
dev.serial = facts['serial_number']
dev.vendor = facts['vendor']
dev.model = facts['model']
dev.os_version = facts['os_version']
dev.serial = facts['serial_number'][:64]
dev.vendor = facts['vendor'][:64]
dev.model = facts['model'][:64]
dev.os_version = facts['os_version'][:64]
dev.state = DeviceState.DISCOVERED
new_hostname = dev.hostname
logger.info(f"Device with ztp_mac {ztp_mac} successfully scanned" +
Expand Down
8 changes: 4 additions & 4 deletions src/cnaas_nms/confpush/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ def update_facts(hostname: str,
facts = nrresult[hostname][0].result['facts']
with sqla_session() as session:
dev: Device = session.query(Device).filter(Device.hostname == hostname).one()
dev.serial = facts['serial_number']
dev.vendor = facts['vendor']
dev.model = facts['model']
dev.os_version = facts['os_version']
dev.serial = facts['serial_number'][:64]
dev.vendor = facts['vendor'][:64]
dev.model = facts['model'][:64]
dev.os_version = facts['os_version'][:64]
logger.debug("Updating facts for device {}: {}, {}, {}, {}".format(
hostname, facts['serial_number'], facts['vendor'], facts['model'], facts['os_version']
))
Expand Down