From f954d9a0ead29d08b7d194119dcbafa249264372 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Tue, 20 Apr 2021 07:33:19 -0600 Subject: [PATCH] removed length check on eid Signed-off-by: Chuck SmileyRekiere --- py-json/fio_endp_profile.py | 7 +++---- py-json/http_profile.py | 9 +++------ py-json/l4_cxprofile.py | 9 +++------ 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/py-json/fio_endp_profile.py b/py-json/fio_endp_profile.py index 314296b0..10329895 100644 --- a/py-json/fio_endp_profile.py +++ b/py-json/fio_endp_profile.py @@ -169,10 +169,9 @@ class FIOEndpProfile(LFCliBase): self.local_realm.json_post("/cli-json/nc_show_endpoints", {"endpoint": "all"}) for port_name in ports: for num_connection in range(connections_per_port): - if len(self.local_realm.name_to_eid(port_name)) >= 3: - shelf = self.local_realm.name_to_eid(port_name)[0] - resource = self.local_realm.name_to_eid(port_name)[1] - name = self.local_realm.name_to_eid(port_name)[2] + shelf = self.local_realm.name_to_eid(port_name)[0] + resource = self.local_realm.name_to_eid(port_name)[1] + name = self.local_realm.name_to_eid(port_name)[2] endp_data = { "alias": "CX_" + self.cx_prefix + name + "_" + str(num_connection) + "_fio", diff --git a/py-json/http_profile.py b/py-json/http_profile.py index e0936f86..24ec1ea3 100644 --- a/py-json/http_profile.py +++ b/py-json/http_profile.py @@ -110,12 +110,9 @@ class HTTPProfile(LFCliBase): if (ip_addr is None) or (ip_addr == ""): raise ValueError("HTTPProfile::create encountered blank ip/hostname") - if len(self.local_realm.name_to_eid(port_name)) >= 3: - shelf = self.local_realm.name_to_eid(port_name)[0] - resource = self.local_realm.name_to_eid(port_name)[1] - name = self.local_realm.name_to_eid(port_name)[2] - else: - raise ValueError("Unexpected name for port_name %s" % port_name) + shelf = self.local_realm.name_to_eid(port_name)[0] + resource = self.local_realm.name_to_eid(port_name)[1] + name = self.local_realm.name_to_eid(port_name)[2] if upload_name != None: name = upload_name diff --git a/py-json/l4_cxprofile.py b/py-json/l4_cxprofile.py index a106588a..0fccce11 100644 --- a/py-json/l4_cxprofile.py +++ b/py-json/l4_cxprofile.py @@ -111,12 +111,9 @@ class L4CXProfile(LFCliBase): cx_post_data = [] for port_name in ports: print("port_name: {} len: {} self.local_realm.name_to_eid(port_name): {}".format(port_name,len(self.local_realm.name_to_eid(port_name)),self.local_realm.name_to_eid(port_name),)) - if len(self.local_realm.name_to_eid(port_name)) >= 3: - shelf = self.local_realm.name_to_eid(port_name)[0] - resource = self.local_realm.name_to_eid(port_name)[1] - name = self.local_realm.name_to_eid(port_name)[2] - else: - raise ValueError("Unexpected name for port_name %s" % port_name) + shelf = self.local_realm.name_to_eid(port_name)[0] + resource = self.local_realm.name_to_eid(port_name)[1] + name = self.local_realm.name_to_eid(port_name)[2] endp_data = { "alias": name + "_l4", "shelf": shelf,