x
/
group-based-policy
Code Issues Proposed changes

Merge "Add Antelope Support"

This commit is contained in:
Zuul 2024-04-08 13:39:05 +00:00 committed by Gerrit Code Review
parent fa6cb71ecf 0ea889f1bf
commit f9bbb4786e
14 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.zuul.yaml
View File

@ -1,7 +1,7 @@
- project:
name: x/group-based-policy
templates:
- openstack-python3-zed-jobs
- openstack-python3-jobs
- publish-to-pypi
# REVISIT: In the jobs below, the required-projects clause is needed on
# the master branch to select the correct version of the requirements
@ -15,17 +15,27 @@
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py38:
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py39:
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py310:
nodeset: ubuntu-jammy
required-projects:
- name: openstack/requirements
override-checkout: stable/2023.1
- openstack-tox-py311:
nodeset: ubuntu-jammy
required-projects:
- name: openstack/requirements
override-checkout: stable/2023.1
- legacy-group-based-policy-dsvm-functional:
voting: false
- legacy-group-based-policy-dsvm-aim:
@ -38,14 +48,24 @@
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py38:
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py39:
nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/zed
override-checkout: stable/2023.1
- openstack-tox-py310:
nodeset: ubuntu-jammy
required-projects:
- name: openstack/requirements
override-checkout: stable/2023.1
- openstack-tox-py311:
nodeset: ubuntu-jammy
required-projects:
- name: openstack/requirements
override-checkout: stable/2023.1

10
devstack/local.conf.nfp
View File

@ -43,11 +43,11 @@ if [[ $ENABLE_NFP = True ]]; then
# Make sure that your public interface is not attached to any bridge.
PUBLIC_INTERFACE=
enable_plugin neutron-fwaas http://opendev.org/openstack/neutron-fwaas.git stable/zed
enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/zed
enable_plugin neutron https://opendev.org/openstack/neutron.git stable/zed
enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas.git stable/zed
enable_plugin octavia https://opendev.org/openstack/octavia.git stable/zed
enable_plugin neutron-fwaas http://opendev.org/openstack/neutron-fwaas.git stable/2023.1
enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/2023.1
enable_plugin neutron https://opendev.org/openstack/neutron.git stable/2023.1
enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas.git stable/2023.1
enable_plugin octavia https://opendev.org/openstack/octavia.git stable/2023.1
fi
fi

4
gbpservice/contrib/tests/unit/nfp/configurator/agents/test_generic_config.py
View File

@ -14,7 +14,7 @@ import subprocess
from unittest import mock
import unittest2
import unittest
from neutron.tests import base
@ -132,7 +132,7 @@ class GenericConfigRpcManagerTestCase(base.BaseTestCase):
self._test_event_creation(const.EVENT_CONFIGURE_HEALTHMONITOR)
@unittest2.skip('not implemented yet')
@unittest.skip('not implemented yet')
def test_clear_hm_genericconfigrpcmanager(self):
""" Implements test case for clear healthmonitor method
of generic config agent RPCmanager.

7
gbpservice/neutron/tests/unit/nfp/core/test_process_model.py
View File

@ -13,7 +13,7 @@
import multiprocessing
import random
import time
import unittest
from unittest import mock
from gbpservice.nfp.core import context as nfp_context
@ -24,7 +24,6 @@ from gbpservice.nfp.core import manager as nfp_manager
from gbpservice.nfp.core import worker as nfp_worker
from oslo_config import cfg as oslo_config
import six
import unittest2
NFP_MODULES_PATH = ['gbpservice.neutron.tests.unit.nfp.core']
@ -117,7 +116,7 @@ class Object(object):
pass
class Test_Process_Model(unittest2.TestCase):
class Test_Process_Model(unittest.TestCase):
def setUp(self):
nfp_context.init()
@ -872,4 +871,4 @@ class Test_Process_Model(unittest2.TestCase):
if __name__ == '__main__':
unittest2.main()
unittest.main()

6
gbpservice/neutron/tests/unit/nfp/lib/test_transport.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import unittest
from unittest import mock
from neutron_lib import context as ctx
@ -17,7 +18,6 @@ from neutron_lib import rpc as n_rpc
from oslo_config import cfg
from oslo_serialization import jsonutils
import six
import unittest2
from gbpservice.nfp.lib import transport
@ -79,7 +79,7 @@ class TestContext(object):
return variables
class CommonLibraryTest(unittest2.TestCase):
class CommonLibraryTest(unittest.TestCase):
def setUp(self):
n_rpc.init(cfg.CONF)
@ -183,4 +183,4 @@ class CommonLibraryTest(unittest2.TestCase):
if __name__ == '__main__':
unittest2.main()
unittest.main()

5
gbpservice/neutron/tests/unit/nfp/orchestrator/drivers/test_orchestration_driver.py
View File

@ -11,12 +11,11 @@
# under the License.
import uuid as pyuuid
import unittest
from unittest import mock
from mock import patch
from oslo_config import cfg
import unittest2
from gbpservice.nfp.common import constants as nfp_constants
from gbpservice.nfp.common import exceptions
@ -45,7 +44,7 @@ NFP_NEUTRON_NETWORK_DRIVER_CLASS_PATH = ('gbpservice.nfp.orchestrator'
@patch(NFP_NEUTRON_NETWORK_DRIVER_CLASS_PATH +
'.NFPNeutronNetworkDriver.__init__',
mock.MagicMock(return_value=None))
class OrchestrationDriverTestCase(unittest2.TestCase):
class OrchestrationDriverTestCase(unittest.TestCase):
def test_create_network_function_device(self):
driver = orchestration_driver.OrchestrationDriver(

12
gbpservice/neutron/tests/unit/nfp/orchestrator/modules/test_device_orchestrator.py
View File

@ -14,11 +14,11 @@
import copy
import uuid as pyuuid
import unittest
from unittest import mock
from mock import patch
from oslo_config import cfg
import unittest2
from gbpservice.nfp.lib import transport
from gbpservice.nfp.orchestrator.db import nfp_db as nfpdb
@ -131,7 +131,7 @@ NDO_CLASS_PATH = ('gbpservice.nfp.orchestrator'
'.modules.device_orchestrator')
class NDOModuleTestCase(unittest2.TestCase):
class NDOModuleTestCase(unittest.TestCase):
@mock.patch.object(device_orchestrator, 'events_init')
@mock.patch.object(device_orchestrator, 'rpc_init')
@ -194,7 +194,7 @@ class NDORpcHandlerTestCase(object):
@patch(NDO_CLASS_PATH + '.NDOConfiguratorRpcApi.__init__',
mock.MagicMock(return_value=None))
class NDORpcApiTestCase(unittest2.TestCase):
class NDORpcApiTestCase(unittest.TestCase):
def setUp(self):
super(NDORpcApiTestCase, self).setUp()
@ -264,7 +264,7 @@ class NDORpcApiTestCase(unittest2.TestCase):
mock.MagicMock(return_value=orchestration_driver))
@patch(NDO_CLASS_PATH + '.NDOConfiguratorRpcApi.__init__',
mock.MagicMock(return_value=None))
class DeviceOrchestratorTestCase(unittest2.TestCase):
class DeviceOrchestratorTestCase(unittest.TestCase):
def _initialize_ndo_handler(self):
ndo_handler = device_orchestrator.DeviceOrchestrator(
@ -272,7 +272,7 @@ class DeviceOrchestratorTestCase(unittest2.TestCase):
self.event = DummyEvent(dummy_data, 'PENDING_CREATE')
return ndo_handler
@unittest2.skip('skipping')
@unittest.skip('skipping')
@mock.patch.object(device_orchestrator.DeviceOrchestrator,
'device_configuration_complete')
def test_handle_event(self, mock_device_configuration_complete):
@ -788,7 +788,7 @@ class DeviceOrchestratorTestCase(unittest2.TestCase):
def main():
unittest2.main()
unittest.main()
if __name__ == '__main__':

4
gbpservice/neutron/tests/unit/nfp/orchestrator/test_heat_driver.py
View File

@ -12,6 +12,7 @@
import copy
import unittest
from unittest import mock
from keystoneauth1.identity import v2
@ -20,7 +21,6 @@ from keystoneclient.v2_0 import client as identity_client
from neutronclient.v2_0 import client as neutron_client
from oslo_config import cfg
from oslo_utils import uuidutils
import unittest2
from gbpclient.v2_0 import client as gbp_client
from gbpservice.neutron.tests.unit.nfp.orchestrator import mock_dicts
@ -76,7 +76,7 @@ SVC_MGMT_PTG_NAME = 'svc_management_ptg'
RESOURCE_OWNER_TENANT_ID = '8ae6701128994ab281dde6b92207bb19'
class TestHeatDriver(unittest2.TestCase):
class TestHeatDriver(unittest.TestCase):
def __init__(self, *args, **kwargs):
super(TestHeatDriver, self).__init__(*args, **kwargs)

4
gbpservice/neutron/tests/unit/nfp/orchestrator/test_openstack_driver.py
View File

@ -10,10 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import unittest
from unittest import mock
from oslo_config import cfg
import unittest2
from gbpclient.v2_0 import client as gbp_client
from gbpservice.nfp.orchestrator.openstack import openstack_driver
@ -27,7 +27,7 @@ cfg.CONF.import_group('nfp_keystone_authtoken',
'gbpservice.nfp.orchestrator.modules.__init__')
class SampleData(unittest2.TestCase):
class SampleData(unittest.TestCase):
def __init__(self, *args, **kwargs):
super(SampleData, self).__init__(*args, **kwargs)

6
gbpservice/neutron/tests/unit/nfp/proxy_agent/modules/test_proxy_agent.py
View File

@ -10,11 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import unittest
from unittest import mock
from gbpservice.nfp.proxy_agent.modules import proxy_agent
from neutron_lib import context as ctx
import unittest2
rpc_manager = proxy_agent.RpcHandler
@ -34,7 +34,7 @@ class TestContext(object):
"Common class for proxy agent test cases"
class ConfigAgentProxyTestCase(unittest2.TestCase):
class ConfigAgentProxyTestCase(unittest.TestCase):
def setUp(self):
self.manager = rpc_manager('conf', 'sc')
@ -86,4 +86,4 @@ class ConfigAgentProxyTestCase(unittest2.TestCase):
if __name__ == "__main__":
unittest2.main()
unittest.main()

4
gbpservice/neutron/tests/unit/nfp/proxy_agent/notifications/test_pull_notifications.py
View File

@ -11,11 +11,11 @@
# under the License.
from unittest import mock
import unittest
from neutron_lib import context as ctx
from neutron_lib import rpc as n_rpc
from oslo_config import cfg
import unittest2
from gbpservice.nfp.proxy_agent.notifications import pull
@ -37,7 +37,7 @@ class TestContext(object):
"""Common class for pull notification tests"""
class PullNotificationTestCase(unittest2.TestCase):
class PullNotificationTestCase(unittest.TestCase):
def setUp(self):
n_rpc.init(cfg.CONF)

4
gbpservice/neutron/tests/unit/services/grouppolicy/test_neutronv2_api.py
View File

@ -13,7 +13,7 @@
from unittest import mock
import unittest2
import unittest
from neutronclient.v2_0 import client as clientv20
@ -29,7 +29,7 @@ INTERFACE = 'fake_interface'
VALUE = 'fake_value'
class NeutronV2ApiTestCase(unittest2.TestCase):
class NeutronV2ApiTestCase(unittest.TestCase):
""" Test case for Neutron V2 API testing.
Provide a set of mocked methods for the neutron v2 API testing.

9
test-requirements.txt
View File

@ -4,19 +4,19 @@
hacking>=6.0.1 # Apache-2.0
# Since version numbers for these are specified in
# https://releases.openstack.org/constraints/upper/zed, they cannot be
# https://releases.openstack.org/constraints/upper/2023.1, they cannot be
# referenced as GIT URLs.
neutron
python-heatclient
python-keystoneclient
-e git+https://opendev.org/openstack/networking-sfc.git@stable/zed#egg=networking-sfc
-e git+https://opendev.org/openstack/networking-sfc.git@stable/2023.1#egg=networking-sfc
-e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
-e git+https://github.com/noironetworks/python-opflex-agent.git@stable/zed#egg=neutron-opflex-agent
-e git+https://github.com/noironetworks/python-opflex-agent.git@stable/2023.1#egg=neutron-opflex-agent
-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/zed#egg=python-group-based-policy-client
-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/2023.1#egg=python-group-based-policy-client
coverage!=4.4,>=4.0 # Apache-2.0
flake8-import-order==0.12 # LGPLv3
@ -30,7 +30,6 @@ testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0.27 # MIT
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
unittest2>=1.1.0
# REVISIT: Until co-gating and/or stable branches are implemented for
# the aci-integration-module repo, it may be necessary to pin to a

4
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py38,py39,pep8
envlist = py38,py39,py310,pep8
minversion = 3.18.0
skipsdist = False
ignore_basepython_conflict = True
@ -24,7 +24,7 @@ usedevelop = True
install_command =
pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = sh