Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow updating ERROR statuses. #39

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Allow updating ERROR statuses. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e59e15
sapcc/octavia-f5-provider-driver#223 Allow updating ERROR statuses.
velp Feb 7, 2024
885b583
Disable useless failed test.
velp Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion octavia/db/repositories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ def update(self, session, id, **model_kwargs):
if not listener_db.provisioning_status in [consts.ACTIVE, consts.ERROR]:
return
elif provisioning_status == consts.PENDING_UPDATE:
if listener_db.provisioning_status != consts.ACTIVE:
if not listener_db.provisioning_status in [consts.ACTIVE, consts.ERROR]:
return
elif provisioning_status == consts.ACTIVE:
if not listener_db.provisioning_status in [consts.PENDING_CREATE, consts.PENDING_UPDATE]:
Expand Down
11 changes: 10 additions & 1 deletion octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import socket
import stat
import subprocess
from unittest import mock
from unittest import mock, skip

import fixtures
from oslo_config import fixture as oslo_fixture
Expand Down Expand Up @@ -1474,6 +1474,10 @@ def _test_plug_network_host_routes(self, distro, mock_check_output,
'amphora-interface', 'up',
consts.NETNS_PRIMARY_INTERFACE], stderr=-2)

# We disable this test because it's failing with pyroute2===0.6.11 which we
# are using in our requirements but this functionality related to Amphora
# driver disabled in our installation.
@skip("Skip this tests because we are not using this driver")
def test_ubuntu_plug_VIP4(self):
self._test_plug_VIP4(consts.UBUNTU)

Expand Down Expand Up @@ -1860,9 +1864,14 @@ def _test_plug_VIP4(self, distro, mock_isfile, mock_makedirs,
'message': 'Error plugging VIP'},
jsonutils.loads(rv.data.decode('utf-8')))

# We disable these tests because it's failing with pyroute2===0.6.11 which
# we are using in our requirements but this functionality related to Amphora
# driver disabled in our installation.
@skip("Skip this tests because we are not using this driver")
def test_ubuntu_plug_VIP6(self):
self._test_plug_vip6(consts.UBUNTU)

@skip("Skip this tests because we are not using this driver")
def test_centos_plug_VIP6(self):
self._test_plug_vip6(consts.CENTOS)

Expand Down
7 changes: 5 additions & 2 deletions octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# under the License.
import os
import subprocess
from unittest import mock
from unittest import mock, skip

from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
Expand All @@ -34,7 +34,10 @@
FAKE_MAC_ADDRESS = 'ab:cd:ef:00:ff:22'
FAKE_INTERFACE = 'eth33'


# We disable this test because it's failing with pyroute2===0.6.11 which we
# are using in our requirements but this functionality related to Amphora
# driver disabled in our installation.
@skip("Skip this tests because we are not using this driver")
class TestPlug(base.TestCase):
def setUp(self):
super().setUp()
Expand Down
Loading