diff -Nru octavia-dashboard-5.0.0/debian/changelog octavia-dashboard-5.0.0/debian/changelog --- octavia-dashboard-5.0.0/debian/changelog 2020-05-13 18:29:51.000000000 +0000 +++ octavia-dashboard-5.0.0/debian/changelog 2023-07-27 17:50:29.000000000 +0000 @@ -1,3 +1,14 @@ +octavia-dashboard (5.0.0-0ubuntu0.20.04.2) focal; urgency=medium + + [ Chris MacNaughton ] + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. + + [ Nicolas Bock ] + * d/p/fix-updating-non-https-health-monitor.patch: Fix updating a non-HTTP(S) + Health Monitor (LP: #2007720). + + -- Nicolas Bock Thu, 27 Jul 2023 17:50:29 +0000 + octavia-dashboard (5.0.0-0ubuntu0.20.04.1) focal; urgency=medium * d/watch: Scope to 5.x series and get tarballs from opendev.org. diff -Nru octavia-dashboard-5.0.0/debian/control octavia-dashboard-5.0.0/debian/control --- octavia-dashboard-5.0.0/debian/control 2020-05-13 18:29:51.000000000 +0000 +++ octavia-dashboard-5.0.0/debian/control 2023-07-27 17:50:29.000000000 +0000 @@ -40,8 +40,8 @@ python3-xvfbwrapper (>= 0.1.3), subunit, Standards-Version: 4.1.5 -Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/octavia-dashboard -Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/octavia-dashboard +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/octavia-dashboard +Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/octavia-dashboard Homepage: https://github.com/openstack/octavia-dashboard.git Package: python3-octavia-dashboard diff -Nru octavia-dashboard-5.0.0/debian/patches/fix-updating-non-https-health-monitor.patch octavia-dashboard-5.0.0/debian/patches/fix-updating-non-https-health-monitor.patch --- octavia-dashboard-5.0.0/debian/patches/fix-updating-non-https-health-monitor.patch 1970-01-01 00:00:00.000000000 +0000 +++ octavia-dashboard-5.0.0/debian/patches/fix-updating-non-https-health-monitor.patch 2023-07-27 17:50:29.000000000 +0000 @@ -0,0 +1,67 @@ +From 58cbf93412b8eb67340f5e71e9da45cbee378a38 Mon Sep 17 00:00:00 2001 +From: Gregory Thiemonge +Date: Wed, 07 Apr 2021 11:36:15 +0200 +Subject: [PATCH] Fix updating a non-HTTP(S) Health Monitor + +Prevent octavia-dashboard from sending parameters that trigger a +InvalidOption exception when updating a non-HTTP/non-HTTPS health +monitor. + +Story 2008803 +Task 42223 + +Change-Id: Ie669829b149001f77f7475216b86a33d96cb5ff5 +(cherry picked from commit a8dc94fdbd4b46b16d77a2cd63931ee4078e48f9) +--- + +Index: octavia-dashboard-5.0.0/octavia_dashboard/api/rest/lbaasv2.py +=================================================================== +--- octavia-dashboard-5.0.0.orig/octavia_dashboard/api/rest/lbaasv2.py ++++ octavia-dashboard-5.0.0/octavia_dashboard/api/rest/lbaasv2.py +@@ -556,19 +556,27 @@ def update_monitor(request, **kwargs): + """ + data = request.DATA + monitor_id = data['monitor']['id'] ++ hm_type = data['monitor']['type'] + + conn = _get_sdk_connection(request) ++ healthmonitor_kwargs = { ++ 'delay': data['monitor'].get('delay'), ++ 'timeout': data['monitor'].get('timeout'), ++ 'max_retries': data['monitor'].get('max_retries'), ++ 'max_retries_down': data['monitor'].get('max_retries_down'), ++ 'admin_state_up': data['monitor'].get('admin_state_up'), ++ 'name': data['monitor'].get('name') ++ } ++ if hm_type in ('HTTP', 'HTTPS'): ++ healthmonitor_kwargs.update({ ++ 'http_method': data['monitor'].get('http_method'), ++ 'url_path': data['monitor'].get('url_path'), ++ 'expected_codes': data['monitor'].get('expected_codes') ++ }) ++ + healthmonitor = conn.load_balancer.update_health_monitor( + monitor_id, +- delay=data['monitor'].get('delay'), +- timeout=data['monitor'].get('timeout'), +- max_retries=data['monitor'].get('max_retries'), +- max_retries_down=data['monitor'].get('max_retries_down'), +- http_method=data['monitor'].get('http_method'), +- url_path=data['monitor'].get('url_path'), +- expected_codes=data['monitor'].get('expected_codes'), +- admin_state_up=data['monitor'].get('admin_state_up'), +- name=data['monitor'].get('name') ++ **healthmonitor_kwargs + ) + + return _get_sdk_object_dict(healthmonitor) +Index: octavia-dashboard-5.0.0/releasenotes/notes/fix-updating-non-http-hm-114180139961e441.yaml +=================================================================== +--- /dev/null ++++ octavia-dashboard-5.0.0/releasenotes/notes/fix-updating-non-http-hm-114180139961e441.yaml +@@ -0,0 +1,5 @@ ++--- ++fixes: ++ - | ++ Fix a bug that prevented the update of non-HTTP and non-HTTPS health ++ monitors. diff -Nru octavia-dashboard-5.0.0/debian/patches/series octavia-dashboard-5.0.0/debian/patches/series --- octavia-dashboard-5.0.0/debian/patches/series 2020-05-13 18:29:51.000000000 +0000 +++ octavia-dashboard-5.0.0/debian/patches/series 2023-07-27 17:50:29.000000000 +0000 @@ -1 +1,2 @@ install-all-files.patch +fix-updating-non-https-health-monitor.patch