Skip to content

Switches server import to parse CSV string input #158

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

Closed
aschumann-virtualcable wants to merge 1 commit into from
Closed

Switches server import to parse CSV string input #158

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
18 changes: 12 additions & 6 deletions server/src/uds/REST/methods/servers_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"""
import logging
import typing
import io
import csv

from django.utils.translation import gettext
from django.utils.translation import gettext_lazy as _
Expand Down Expand Up @@ -345,11 +347,11 @@ def maintenance(self, parent: 'Model', id: str) -> typing.Any:

def importcsv(self, parent: 'Model') -> typing.Any:
"""
We receive a json with string[][] format with the data.
We receive a csv string with the data.
Has no header, only the data.
"""
parent = ensure.is_instance(parent, models.ServerGroup)
data: list[list[str]] = self._params.get('data', [])
data: typing.Any = self._params.get('data', '')
logger.debug('Data received: %s', data)
# String lines can have 1, 2 or 3 fields.
# if 1, it's a IP
Expand All @@ -358,16 +360,20 @@ def importcsv(self, parent: 'Model') -> typing.Any:
# if ip is empty and has a hostname, it will be kept, but if it has no hostname, it will be skipped
# If the IP is invalid and has no hostname, it will be skipped
import_errors: list[str] = []
for line_number, row in enumerate(data, 1):

f = io.StringIO('\n'.join(','.join(row) for row in data))
reader: typing.Iterable[list[str]] = csv.reader(f)

for line_number, row in enumerate(reader, 1):
if len(row) == 0:
continue
hostname = row[0].strip()
hostname = row[0]
ip = ''
mac = consts.MAC_UNKNOWN
if len(row) > 1:
ip = row[1].strip()
ip = row[1]
if len(row) > 2:
mac = row[2].strip().upper().strip() or consts.MAC_UNKNOWN
mac = row[2].upper() or consts.MAC_UNKNOWN
if mac and not net.is_valid_mac(mac):
import_errors.append(f'Line {line_number}: MAC {mac} is invalid, skipping')
continue # skip invalid macs
Expand Down
Loading