From 51b7e55319ba8d2e096ac4f4731e62a8322126c0 Mon Sep 17 00:00:00 2001 From: GowthamShanmugam Date: Fri, 30 Jun 2017 16:02:48 +0530 Subject: [PATCH 1/2] Removing spaces form disk id Signed-off-by: GowthamShanmugam --- tendrl/node_agent/node_sync/disk_sync.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tendrl/node_agent/node_sync/disk_sync.py b/tendrl/node_agent/node_sync/disk_sync.py index bfe0f02c..db052aee 100644 --- a/tendrl/node_agent/node_sync/disk_sync.py +++ b/tendrl/node_agent/node_sync/disk_sync.py @@ -170,16 +170,16 @@ def get_disk_details(): disk.split(':')[1].lstrip().replace('"', "") elif key.strip() == "Vendor": devlist["vendor"] = \ - disk.split(':')[1].lstrip().replace('"', "") + disk.split(':')[1].replace(" ", "").replace('"', "") elif key.strip() == "Device": devlist["device"] = \ - disk.split(':')[1].lstrip().replace('"', "") + disk.split(':')[1].replace(" ", "").replace('"', "") elif key.strip() == "Revision": devlist["rmversion"] = \ disk.split(':')[1].lstrip().replace('"', "") elif key.strip() == "Serial ID": devlist["serial_no"] = \ - disk.split(':')[1].lstrip().replace('"', "") + disk.split(':')[1].replace(" ", "").replace('"', "") elif key.strip() == "Driver": devlist["driver"] = \ disk.split(':')[1].lstrip().replace('"', "") From c9425b732cba00e8a218d57bd4db8df89eb6e2fb Mon Sep 17 00:00:00 2001 From: Shubhendu Date: Tue, 4 Jul 2017 13:04:01 +0530 Subject: [PATCH 2/2] Fixed pep8 errors tendrl-bug-id: Tendrl/node-agent#540 Signed-off-by: Shubhendu --- tendrl/node_agent/node_sync/disk_sync.py | 4 +++- tendrl/node_agent/node_sync/network_sync.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tendrl/node_agent/node_sync/disk_sync.py b/tendrl/node_agent/node_sync/disk_sync.py index bfe0f02c..68627d34 100644 --- a/tendrl/node_agent/node_sync/disk_sync.py +++ b/tendrl/node_agent/node_sync/disk_sync.py @@ -25,7 +25,9 @@ def sync(): if "virtio" in disks[disk]["driver"]: # Virtual disk - NS.tendrl.objects.VirtualDisk(**disks[disk]).save(ttl=_keep_alive_for) + NS.tendrl.objects.VirtualDisk(**disks[disk]).save( + ttl=_keep_alive_for + ) else: # physical disk NS.tendrl.objects.Disk(**disks[disk]).save(ttl=_keep_alive_for) diff --git a/tendrl/node_agent/node_sync/network_sync.py b/tendrl/node_agent/node_sync/network_sync.py index df533eae..0c2d634c 100644 --- a/tendrl/node_agent/node_sync/network_sync.py +++ b/tendrl/node_agent/node_sync/network_sync.py @@ -14,7 +14,9 @@ def sync(): interfaces = get_node_network() if len(interfaces) > 0: for interface in interfaces: - NS.tendrl.objects.NodeNetwork(**interface).save(ttl=_keep_alive_for) + NS.tendrl.objects.NodeNetwork(**interface).save( + ttl=_keep_alive_for + ) if interface['ipv4']: for ipv4 in interface['ipv4']: index_key = "/indexes/ip/%s" % ipv4