Description: Use packaged version of octavia-agent-lvs-masquerade Author: Thomas Goirand Forwarded: no Last-Update: 2021-09-20 Index: octavia/octavia/amphorae/backends/utils/interface_file.py =================================================================== --- octavia.orig/octavia/amphorae/backends/utils/interface_file.py +++ octavia/octavia/amphorae/backends/utils/interface_file.py @@ -235,12 +235,12 @@ class VIPInterfaceFile(InterfaceFile): for ip_v in ip_versions: self.scripts[consts.IFACE_UP].append({ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add {} {}{}".format( + "octavia-agent-lvs-masquerade add {} {}{}".format( 'ipv6' if ip_v == 6 else 'ipv4', name, sriov_param)) }) self.scripts[consts.IFACE_DOWN].append({ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete {} {}{}".format( + "octavia-agent-lvs-masquerade delete {} {}{}".format( 'ipv6' if ip_v == 6 else 'ipv4', name, sriov_param)) }) @@ -285,13 +285,13 @@ class PortInterfaceFile(InterfaceFile): for ip_version in ip_versions: self.scripts[consts.IFACE_UP].append({ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add {} {}{}".format( + "octavia-agent-lvs-masquerade add {} {}{}".format( 'ipv6' if ip_version == 6 else 'ipv4', name, sriov_param)) }) self.scripts[consts.IFACE_DOWN].append({ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete {} {}{}".format( + "octavia-agent-lvs-masquerade delete {} {}{}".format( 'ipv6' if ip_version == 6 else 'ipv4', name, sriov_param)) }) Index: octavia/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py =================================================================== --- octavia.orig/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py +++ octavia/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py @@ -838,16 +838,16 @@ class TestServerTestCase(base.TestCase): '#!/bin/bash\n' 'if [[ "$1" != "lo" ]]\n' ' then\n' - ' /usr/local/bin/lvs-masquerade.sh add ipv4 $1\n' - ' /usr/local/bin/lvs-masquerade.sh add ipv6 $1\n' + ' octavia-agent-lvs-masquerade add ipv4 $1\n' + ' octavia-agent-lvs-masquerade add ipv6 $1\n' 'fi') handle.write.assert_any_call( '\n# Generated by Octavia agent\n' '#!/bin/bash\n' 'if [[ "$1" != "lo" ]]\n' ' then\n' - ' /usr/local/bin/lvs-masquerade.sh delete ipv4 $1\n' - ' /usr/local/bin/lvs-masquerade.sh delete ipv6 $1\n' + ' octavia-agent-lvs-masquerade delete ipv4 $1\n' + ' octavia-agent-lvs-masquerade delete ipv6 $1\n' 'fi') def test_ubuntu_plug_network(self): @@ -987,20 +987,20 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 " + "octavia-agent-lvs-masquerade add ipv4 " "eth{}".format(test_int_num)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv6 " + "octavia-agent-lvs-masquerade add ipv6 " "eth{}".format(test_int_num)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "eth{}".format(test_int_num)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " "eth{}".format(test_int_num)) }] } @@ -1063,11 +1063,11 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [ {consts.COMMAND: - '/usr/local/bin/lvs-masquerade.sh add ipv4 ' + 'octavia-agent-lvs-masquerade add ipv4 ' 'eth{}'.format(test_int_num)}], consts.IFACE_DOWN: [ {consts.COMMAND: - '/usr/local/bin/lvs-masquerade.sh delete ipv4 ' + 'octavia-agent-lvs-masquerade delete ipv4 ' 'eth{}'.format(test_int_num)}] } } @@ -1129,11 +1129,11 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [ {consts.COMMAND: - '/usr/local/bin/lvs-masquerade.sh add ipv6 ' + 'octavia-agent-lvs-masquerade add ipv6 ' 'eth{}'.format(test_int_num)}], consts.IFACE_DOWN: [ {consts.COMMAND: - '/usr/local/bin/lvs-masquerade.sh delete ipv6 ' + 'octavia-agent-lvs-masquerade delete ipv6 ' 'eth{}'.format(test_int_num)}] } } @@ -1319,11 +1319,11 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 eth3") + "octavia-agent-lvs-masquerade add ipv4 eth3") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "eth3") }] } @@ -1569,12 +1569,12 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 " + "octavia-agent-lvs-masquerade add ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } @@ -1665,12 +1665,12 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 " + "octavia-agent-lvs-masquerade add ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } @@ -1922,12 +1922,12 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv6 " + "octavia-agent-lvs-masquerade add ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } @@ -2023,12 +2023,12 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv6 " + "octavia-agent-lvs-masquerade add ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } @@ -2255,20 +2255,20 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 " + "octavia-agent-lvs-masquerade add ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv6 " + "octavia-agent-lvs-masquerade add ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } @@ -2473,20 +2473,20 @@ class TestServerTestCase(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv4 " + "octavia-agent-lvs-masquerade add ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh add ipv6 " + "octavia-agent-lvs-masquerade add ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " "{}".format(consts.NETNS_PRIMARY_INTERFACE)) }] } Index: octavia/octavia/tests/unit/amphorae/backends/utils/test_interface_file.py =================================================================== --- octavia.orig/octavia/tests/unit/amphorae/backends/utils/test_interface_file.py +++ octavia/octavia/tests/unit/amphorae/backends/utils/test_interface_file.py @@ -112,12 +112,12 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }] } @@ -244,12 +244,12 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }] } @@ -323,12 +323,12 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh delete ipv4 " + f"octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }] } @@ -404,12 +404,12 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh delete ipv4 " + f"octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }] } @@ -516,12 +516,12 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv6 " + f"octavia-agent-lvs-masquerade add ipv6 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh delete ipv6 " + f"octavia-agent-lvs-masquerade delete ipv6 " f"{netns_interface}") }] } @@ -603,20 +603,20 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }, { consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv6 " + f"octavia-agent-lvs-masquerade add ipv6 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh delete ipv4 " + f"octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }, { consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh delete ipv6 " + f"octavia-agent-lvs-masquerade delete ipv6 " f"{netns_interface}") }] } @@ -654,20 +654,20 @@ class TestInterfaceFile(base.TestCase): consts.SCRIPTS: { consts.IFACE_UP: [{ consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv4 " + f"octavia-agent-lvs-masquerade add ipv4 " f"{netns_interface}") }, { consts.COMMAND: ( - f"/usr/local/bin/lvs-masquerade.sh add ipv6 " + f"octavia-agent-lvs-masquerade add ipv6 " f"{netns_interface}") }], consts.IFACE_DOWN: [{ consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv4 " + "octavia-agent-lvs-masquerade delete ipv4 " f"{netns_interface}") }, { consts.COMMAND: ( - "/usr/local/bin/lvs-masquerade.sh delete ipv6 " + "octavia-agent-lvs-masquerade delete ipv6 " f"{netns_interface}") }] }