Add Agent Port

Allows the port number to be added to the IP addresses used
for initiating worklaods.  This is done specifically for
containerized workload where the exposed port might need to be
specified per workload agent to allow multiple agents to run
on the same host.

STORPERF-270

Change-Id: If011e686d89e5667509ca57e25f05fba1ed52ed1
Signed-off-by: Mark Beierl <mbeierl@vmware.com>
(cherry picked from commit 24aeda6b73bfa9c31dee8454fdc49bbdb5e1c81b)

1 files changed, 39 insertions, 0 deletions

diff --git a/docker/storperf-master/tests/utilities_tests/ip_helper_test.py b/docker/storperf-master/tests/utilities_tests/ip_helper_test.py
new file mode 100644
index 0000000..f2d662b
--- /dev/null
+++ b/docker/storperf-master/tests/utilities_tests/ip_helper_test.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2017 Dell EMC and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+import unittest
+
+from storperf.utilities import ip_helper
+
+
+class Test(unittest.TestCase):
+
+    def testNoPortInIPv4(self):
+        host, port = ip_helper.parse_address_and_port("127.0.0.1")
+        self.assertEqual("127.0.0.1", host)
+        self.assertEqual(22, port)
+
+    def testPortInIPv4(self):
+        host, port = ip_helper.parse_address_and_port("127.0.0.1:2222")
+        self.assertEqual("127.0.0.1", host)
+        self.assertEqual(2222, port)
+
+    def testNoPortInIPv6(self):
+        host, port = ip_helper.parse_address_and_port(
+            "1fe80::58bb:c8b:f2f2:c888")
+        self.assertEqual("1fe80::58bb:c8b:f2f2:c888",
+                         host)
+        self.assertEqual(22, port)
+
+    def testPortInIPv6(self):
+        host, port = ip_helper.parse_address_and_port(
+            "[1fe80::58bb:c8b:f2f2:c888]:2222")
+        self.assertEqual("1fe80::58bb:c8b:f2f2:c888",
+                         host)
+        self.assertEqual(2222, port)