Skip to content

Commit

Permalink
reverse-proxy: T6409: Remove unused backend parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
Embezzle committed May 27, 2024
1 parent 48e5266 commit fb6602f
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!-- include start from include/version/reverseproxy-version.xml.i -->
<syntaxVersion component='reverse-proxy' version='1'></syntaxVersion>
<!-- include end -->
13 changes: 0 additions & 13 deletions interface-definitions/load-balancing_reverse-proxy.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,6 @@
#include <include/generic-description.xml.i>
#include <include/haproxy/mode.xml.i>
#include <include/haproxy/http-response-headers.xml.i>
<node name="parameters">
<properties>
<help>Backend parameters</help>
</properties>
<children>
<leafNode name="http-check">
<properties>
<help>HTTP health check</help>
<valueless/>
</properties>
</leafNode>
</children>
</node>
<node name="http-check">
<properties>
<help>HTTP check configuration</help>
Expand Down
1 change: 1 addition & 0 deletions interface-definitions/xml-component-version.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@
#include <include/version/vyos-accel-ppp-version.xml.i>
#include <include/version/wanloadbalance-version.xml.i>
#include <include/version/webproxy-version.xml.i>
#include <include/version/reverseproxy-version.xml.i>
</interfaceDefinition>
48 changes: 48 additions & 0 deletions src/migration-scripts/reverse-proxy/0-to-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/usr/bin/env python3
#
# Copyright (C) 2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# T6409: Remove unused 'backend bk-example parameters' node

from sys import argv, exit
from vyos.configtree import ConfigTree

if len(argv) < 2:
print("Must specify file name!")
exit(1)

file_name = argv[1]

with open(file_name, 'r') as f:
config_file = f.read()

config = ConfigTree(config_file)
base = ['load-balancing', 'reverse-proxy', 'backend']
if not config.exists(base):
# Nothing to do
exit(0)
else:
# we need to run this for every configured network
for backend in config.list_nodes(base):
param_node = base + [backend, 'parameters']
if config.exists(param_node):
config.delete(param_node)

try:
with open(file_name, 'w') as f:
f.write(config.to_string())
except OSError as e:
print("Failed to save the modified config: {}".format(e))
exit(1)

0 comments on commit fb6602f

Please sign in to comment.