From 7f2f1ad5a2bc7622b66883f13736d77b0b1e7316 Mon Sep 17 00:00:00 2001
From: cuixucui <350255958@qq.com>
Date: Wed, 3 Aug 2022 12:36:53 +0800
Subject: [PATCH] Fix the client send message to the server failed after the
 server port is modified

---
 ...ardware-1.1.1-fix-network-infiniband.patch | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 oec-hardware-1.1.1-fix-network-infiniband.patch

diff --git a/oec-hardware-1.1.1-fix-network-infiniband.patch b/oec-hardware-1.1.1-fix-network-infiniband.patch
new file mode 100644
index 0000000..07df397
--- /dev/null
+++ b/oec-hardware-1.1.1-fix-network-infiniband.patch
@@ -0,0 +1,92 @@
+diff -Naur rpm/tests/infiniband/infiniband.py oech/tests/infiniband/infiniband.py
+--- rpm/tests/infiniband/infiniband.py	2022-08-03 12:15:22.271340460 +0800
++++ oech/tests/infiniband/infiniband.py	2022-08-03 12:13:35.567340460 +0800
+@@ -29,6 +29,7 @@
+         self.target_bandwidth_percent = 0.5
+         self.config_data = dict()
+         self.server_ip = ""
++        self.server_port = ""
+         self.args = None
+ 
+     def test_ib_link(self):
+@@ -68,6 +69,8 @@
+         self.config_data = getattr(self.args, "config_data", None)
+         if self.config_data:
+             self.server_ip = self.config_data.get("server_ip", "")
++            if ":" in self.server_ip:
++                self.server_ip, self.server_port = self.server_ip.split(":")
+         else:
+             self.logger.error("Failed to test item value from configuration file.")
+     
+diff -Naur rpm/tests/infiniband/network.py oech/tests/infiniband/network.py
+--- rpm/tests/infiniband/network.py	2022-08-03 12:15:22.271340460 +0800
++++ oech/tests/infiniband/network.py	2022-08-03 12:13:35.567340460 +0800
+@@ -34,6 +34,7 @@
+         self.interface = None
+         self.other_interfaces = []
+         self.server_ip = None
++        self.server_port = None
+         self.retries = 3
+         self.speed = 1000   # Mb/s
+         self.target_bandwidth_percent = 0.8
+@@ -94,7 +95,7 @@
+         form = dict()
+         form['cmd'] = cmd
+         form['ib_server_ip'] = ib_server_ip
+-        url = 'http://%s/api/%s' % (self.server_ip, act)
++        url = 'http://%s:%s/api/%s' % (self.server_ip, self.server_port, act)
+         data = urlencode(form).encode('utf8')
+         headers = {
+             'Content-type': 'application/x-www-form-urlencoded',
+diff -Naur rpm/tests/network/ethernet.py oech/tests/network/ethernet.py
+--- rpm/tests/network/ethernet.py	2022-08-03 12:15:46.043340460 +0800
++++ oech/tests/network/ethernet.py	2022-08-03 12:13:35.567340460 +0800
+@@ -33,6 +33,7 @@
+         self.device = None
+         self.config_data = dict()
+         self.server_ip = ""
++        self.server_port = ""
+         self.subtests = [self.test_ip_info, self.test_eth_link, self.test_icmp,
+                          self.test_udp_tcp, self.test_http]
+         self.target_bandwidth_percent = 0.75
+@@ -61,7 +62,9 @@
+         self.show_driver_info()
+         self.config_data = getattr(args, "config_data", None)
+         if self.config_data:
+-            self.server_ip = self.config_data.get("server_ip")
++            self.server_ip = self.config_data.get("server_ip", "")
++            if ":" in self.server_ip:
++                self.server_ip, self.server_port = self.server_ip.split(":")
+             choice = self.config_data.get("if_rdma")
+         else:
+             self.logger.error("Get test item value from configuration file failed.")
+diff -Naur rpm/tests/network/network.py oech/tests/network/network.py
+--- rpm/tests/network/network.py	2022-08-03 12:15:22.271340460 +0800
++++ oech/tests/network/network.py	2022-08-03 12:13:35.567340460 +0800
+@@ -119,7 +119,7 @@
+         form = dict()
+         form['cmd'] = cmd
+         form['ib_server_ip'] = ib_server_ip
+-        url = 'http://%s/api/%s' % (self.server_ip, act)
++        url = 'http://%s:%s/api/%s' % (self.server_ip, self.server_port, act)
+         data = urlencode(form).encode('utf8')
+         headers = {
+             'Content-type': 'application/x-www-form-urlencoded',
+@@ -212,7 +212,7 @@
+ 
+         form['filename'] = filename
+         form['filetext'] = filetext
+-        url = 'http://%s/api/file/upload' % self.server_ip
++        url = 'http://%s:%s/api/file/upload' % (self.server_ip, self.server_port)
+         data = urlencode(form).encode('utf8')
+         headers = {
+             'Content-type': 'application/x-www-form-urlencoded',
+@@ -242,7 +242,7 @@
+         :return:
+         """
+         filename = os.path.basename(self.testfile)
+-        url = "http://%s/files/%s" % (self.server_ip, filename)
++        url = "http://%s:%s/files/%s" % (self.server_ip, self.server_port, filename)
+ 
+         time_start = time.time()
+         try:
-- 
Gitee