From ba0b05952ff70bd938da13eea5f3a611a5a98ee2 Mon Sep 17 00:00:00 2001
From: Reik Keutterling <reik.keutterling@telekom.de>
Date: Thu, 23 Apr 2020 10:14:21 +0200
Subject: [PATCH] ELB: added UDP to list of supported protocols

---
 otcextensions/osclient/load_balancer/v1/health_monitor.py | 8 +++++---
 otcextensions/osclient/load_balancer/v1/listener.py       | 6 +++---
 otcextensions/osclient/load_balancer/v1/pool.py           | 6 +++---
 .../tests/unit/osclient/load_balancer/v1/test_listener.py | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/otcextensions/osclient/load_balancer/v1/health_monitor.py b/otcextensions/osclient/load_balancer/v1/health_monitor.py
index bc13bfb9b..684ab9c35 100644
--- a/otcextensions/osclient/load_balancer/v1/health_monitor.py
+++ b/otcextensions/osclient/load_balancer/v1/health_monitor.py
@@ -36,7 +36,7 @@ def _get_columns(item):
 
 HTTP_METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE',
                 'TRACE', 'OPTIONS', 'CONNECT', 'PATCH']
-TYPE_VALUES = ['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO']
+TYPE_VALUES = ['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO', 'UDP_CONNECT']
 
 
 class ListHealthMonitor(command.Lister):
@@ -53,7 +53,8 @@ def get_parser(self, prog_name):
             type=lambda s: s.upper(),
             choices=TYPE_VALUES,
             help=_('Health monitor type to use as a filter\n'
-                   'one of [`HTTP`, `HTTPS`, `PING`, `TCP`, `TLS-HELLO`]')
+                   'one of [`HTTP`, `HTTPS`, `PING`, `TCP`, `TLS-HELLO`, '
+                   '`UDP_CONNECT`]')
         )
 
         return parser
@@ -184,7 +185,8 @@ def get_parser(self, prog_name):
             type=lambda s: s.upper(),  # case insensitive
             required=True,
             help=_('The type of health monitor.\n'
-                   'one of [`HTTP`, `HTTPS`, `PING`, `TCP`, `TLS-HELLO`]')
+                   'one of [`HTTP`, `HTTPS`, `PING`, `TCP`, `TLS-HELLO`, '
+                   '`UDP_CONNECT`]')
         )
         admin_group = parser.add_mutually_exclusive_group()
         admin_group.add_argument(
diff --git a/otcextensions/osclient/load_balancer/v1/listener.py b/otcextensions/osclient/load_balancer/v1/listener.py
index d777a260d..8b21a6f6d 100644
--- a/otcextensions/osclient/load_balancer/v1/listener.py
+++ b/otcextensions/osclient/load_balancer/v1/listener.py
@@ -22,7 +22,7 @@
 LOG = logging.getLogger(__name__)
 
 
-SUPPORTED_PROTOCOLS = ['TCP', 'HTTP', 'HTTPS']
+SUPPORTED_PROTOCOLS = ['TCP', 'HTTP', 'HTTPS', 'UDP']
 
 _formatters = {
     'load_balancer_ids': sdk_utils.ListOfIdsColumnBR,
@@ -66,7 +66,7 @@ def get_parser(self, prog_name):
             type=lambda s: s.upper(),
             choices=SUPPORTED_PROTOCOLS,
             help=_('Load balancer listener protocol to query\n'
-                   'One of [`TCP`, `HTTP`, `HTTPS`]')
+                   'One of [`TCP`, `HTTP`, `HTTPS`, `UDP`]')
         )
         parser.add_argument(
             '--protocol_port',
@@ -158,7 +158,7 @@ def get_parser(self, prog_name):
             choices=SUPPORTED_PROTOCOLS,
             required=True,
             help=_('The protocol for the listener. '
-                   'One of [`TCP`, `HTTP`, `HTTPS`]')
+                   'One of [`TCP`, `HTTP`, `HTTPS`, `UDP`]')
         )
         parser.add_argument(
             '--protocol_port',
diff --git a/otcextensions/osclient/load_balancer/v1/pool.py b/otcextensions/osclient/load_balancer/v1/pool.py
index f3a9404a8..a30e4e669 100644
--- a/otcextensions/osclient/load_balancer/v1/pool.py
+++ b/otcextensions/osclient/load_balancer/v1/pool.py
@@ -32,7 +32,7 @@
 
 
 LB_ALGORITHM_VALUES = ['LEAST_CONNECTIONS', 'ROUND_ROBIN', 'SOURCE_IP']
-PROTOCOL_VALUES = ['HTTP', 'HTTPS', 'PROXY', 'TCP']
+PROTOCOL_VALUES = ['HTTP', 'HTTPS', 'PROXY', 'TCP', 'UDP']
 
 
 def _get_columns(item):
@@ -84,7 +84,7 @@ def get_parser(self, prog_name):
             type=lambda s: s.upper(),
             choices=PROTOCOL_VALUES,
             help=_('Load balancer pool protocol to query'
-                   'one of [`HTTP`, `HTTPS`, `PROXY`, `TCP`]')
+                   'one of [`HTTP`, `HTTPS`, `PROXY`, `TCP`, `UDP`]')
         )
         parser.add_argument(
             '--load_balancer',
@@ -182,7 +182,7 @@ def get_parser(self, prog_name):
             choices=PROTOCOL_VALUES,
             required=True,
             help=_('The protocol for the pool. '
-                   'One of [`HTTP`, `HTTPS`, `PROXY`, `TCP`].')
+                   'One of [`HTTP`, `HTTPS`, `PROXY`, `TCP`, `UDP`].')
         )
         parser.add_argument(
             '--lb_algorithm',
diff --git a/otcextensions/tests/unit/osclient/load_balancer/v1/test_listener.py b/otcextensions/tests/unit/osclient/load_balancer/v1/test_listener.py
index 95595bf36..291c39b98 100644
--- a/otcextensions/tests/unit/osclient/load_balancer/v1/test_listener.py
+++ b/otcextensions/tests/unit/osclient/load_balancer/v1/test_listener.py
@@ -109,12 +109,12 @@ def test_list_filters(self):
 
     def test_list_filters_exceptions_proto(self):
         arglist = [
-            '--protocol', 'UDP',
+            '--protocol', 'SMTP',
             '--protocol_port', '12'
         ]
 
         verifylist = [
-            ('protocol', 'UDP'),
+            ('protocol', 'SMTP'),
             ('protocol_port', 12)
         ]