From 5ee172b6e0f07d7a7f930d2db2f71b4862d885da Mon Sep 17 00:00:00 2001 From: Mika Busch Date: Thu, 7 May 2020 17:12:34 +0200 Subject: [PATCH 1/3] Sync Virtual Machine network names --- run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.py b/run.py index 2c53424..ef8a05e 100644 --- a/run.py +++ b/run.py @@ -730,7 +730,7 @@ def get_objects(self, vc_obj_type): if platform: for index, nic in enumerate(obj.guest.net): # Interfaces - nic_name = "vNIC{}".format(index) + nic_name = getattr(nic, "network", "vNIC{}".format(index)) log.debug( "Collecting info for virtual interface '%s'.", nic_name @@ -1083,7 +1083,7 @@ def obj_exists(self, nb_obj_type, vc_data): elif nb_obj_type == "virtual_interfaces": query = "?virtual_machine={}&{}={}".format( quote_plus(vc_data["virtual_machine"]["name"]), query_key, - vc_data[query_key] + quote_plus(vc_data[query_key]) ) else: query = "?{}={}".format(query_key, vc_data[query_key]) From 9fad798782e8acabe816a869468664ce1155412e Mon Sep 17 00:00:00 2001 From: Haeki Date: Fri, 8 May 2020 12:57:01 +0200 Subject: [PATCH 2/3] truncate network name to max 64 chars --- run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.py b/run.py index ef8a05e..935c5e2 100644 --- a/run.py +++ b/run.py @@ -730,7 +730,7 @@ def get_objects(self, vc_obj_type): if platform: for index, nic in enumerate(obj.guest.net): # Interfaces - nic_name = getattr(nic, "network", "vNIC{}".format(index)) + nic_name = truncate(getattr(nic, "network", "vNIC{}".format(index)), 64) log.debug( "Collecting info for virtual interface '%s'.", nic_name From 32ec9e6bd1a69233050b9de25bfe8abf0806ce02 Mon Sep 17 00:00:00 2001 From: Mika Busch Date: Mon, 22 Jun 2020 15:48:19 +0200 Subject: [PATCH 3/3] Fixed VM Network Names error when None --- run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.py b/run.py index 4824940..e0bc12b 100644 --- a/run.py +++ b/run.py @@ -730,7 +730,7 @@ def get_objects(self, vc_obj_type): if platform: for index, nic in enumerate(obj.guest.net): # Interfaces - nic_name = truncate(getattr(nic, "network", "vNIC{}".format(index)), 64) + nic_name = nic.network if nic.network else "vNIC{}".format(index) log.debug( "Collecting info for virtual interface '%s'.", nic_name @@ -739,7 +739,7 @@ def get_objects(self, vc_obj_type): nbt.vm_interface( virtual_machine=obj_name, itype=0, - name=nic_name, + name=truncate(nic_name, 64), mac_address=nic.macAddress, enabled=nic.connected, tags=self.tags