From 7901b8065771bfd146c49a2e7e967ad7308b583b Mon Sep 17 00:00:00 2001 From: Thomas Bachman Date: Thu, 15 Oct 2020 19:43:07 +0000 Subject: [PATCH] Add stable victoria Add support for the stable/victoria branch Change-Id: I3978ec79ba21301f973cc9fdc10fb2fc9579c4d1 --- .zuul.yaml | 38 ++++++++++---------------- gbpclient/gbp/v2_0/groupbasedpolicy.py | 24 ++++++++++------ gbpclient/tests/unit/test_cli20.py | 3 +- test-requirements.txt | 3 +- tox.ini | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0db933a..42074ef 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,7 @@ - project: name: x/python-group-based-policy-client templates: - - openstack-python-jobs + - openstack-python3-victoria-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 @@ -14,42 +14,34 @@ - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri - - openstack-tox-py27: - required-projects: - - name: openstack/requirements - override-checkout: stable/ussuri - - openstack-tox-py35: - required-projects: - - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria - openstack-tox-py36: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria - openstack-tox-py37: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria + - openstack-tox-py38: + required-projects: + - name: openstack/requirements + override-checkout: stable/victoria gate: jobs: - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri - - openstack-tox-py27: - required-projects: - - name: openstack/requirements - override-checkout: stable/ussuri - - openstack-tox-py35: - required-projects: - - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria - openstack-tox-py36: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria - openstack-tox-py37: required-projects: - name: openstack/requirements - override-checkout: stable/ussuri + override-checkout: stable/victoria + - openstack-tox-py38: + required-projects: + - name: openstack/requirements + override-checkout: stable/victoria diff --git a/gbpclient/gbp/v2_0/groupbasedpolicy.py b/gbpclient/gbp/v2_0/groupbasedpolicy.py index 88af9c3..06036d5 100644 --- a/gbpclient/gbp/v2_0/groupbasedpolicy.py +++ b/gbpclient/gbp/v2_0/groupbasedpolicy.py @@ -260,7 +260,8 @@ class CreatePolicyTargetGroup(neutronV20.CreateCommand): parsed_args.network_service_policy) if parsed_args.provided_policy_rule_sets: - for key in parsed_args.provided_policy_rule_sets.keys(): + for key in list( + parsed_args.provided_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -268,7 +269,8 @@ class CreatePolicyTargetGroup(neutronV20.CreateCommand): parsed_args.provided_policy_rule_sets.pop(key) if parsed_args.consumed_policy_rule_sets: - for key in parsed_args.consumed_policy_rule_sets.keys(): + for key in list( + parsed_args.consumed_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -358,7 +360,8 @@ class UpdatePolicyTargetGroup(neutronV20.UpdateCommand): parsed_args.network_service_policy) if parsed_args.provided_policy_rule_sets: - for key in parsed_args.provided_policy_rule_sets.keys(): + for key in list( + parsed_args.provided_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -366,7 +369,8 @@ class UpdatePolicyTargetGroup(neutronV20.UpdateCommand): parsed_args.provided_policy_rule_sets.pop(key) if parsed_args.consumed_policy_rule_sets: - for key in parsed_args.consumed_policy_rule_sets.keys(): + for key in list( + parsed_args.consumed_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -1381,7 +1385,8 @@ class CreateExternalPolicy(neutronV20.CreateCommand): body = {self.resource: {}, } if parsed_args.provided_policy_rule_sets: - for key in parsed_args.provided_policy_rule_sets.keys(): + for key in list( + parsed_args.provided_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -1389,7 +1394,8 @@ class CreateExternalPolicy(neutronV20.CreateCommand): parsed_args.provided_policy_rule_sets.pop(key)) if parsed_args.consumed_policy_rule_sets: - for key in parsed_args.consumed_policy_rule_sets.keys(): + for key in list( + parsed_args.consumed_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -1451,7 +1457,8 @@ class UpdateExternalPolicy(neutronV20.UpdateCommand): body = {self.resource: {}, } if parsed_args.provided_policy_rule_sets: - for key in parsed_args.provided_policy_rule_sets.keys(): + for key in list( + parsed_args.provided_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) @@ -1459,7 +1466,8 @@ class UpdateExternalPolicy(neutronV20.UpdateCommand): parsed_args.provided_policy_rule_sets.pop(key)) if parsed_args.consumed_policy_rule_sets: - for key in parsed_args.consumed_policy_rule_sets.keys(): + for key in list( + parsed_args.consumed_policy_rule_sets.keys()): id_key = neutronV20.find_resourceid_by_name_or_id( self.get_client(), 'policy_rule_set', key) diff --git a/gbpclient/tests/unit/test_cli20.py b/gbpclient/tests/unit/test_cli20.py index b99b1c7..ceade00 100644 --- a/gbpclient/tests/unit/test_cli20.py +++ b/gbpclient/tests/unit/test_cli20.py @@ -11,7 +11,8 @@ # under the License. # -import mock +from unittest import mock + import requests from neutronclient.common import exceptions diff --git a/test-requirements.txt b/test-requirements.txt index 116c70f..0ee7695 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=3.0.1,<3.1.0;python_version!='2.7' # Apache-2.0 -hacking!=0.13.0,<0.14,>=0.12.0;python_version=='2.7' # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 bandit!=1.6.0,>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index c1ddeb7..038d14a 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs}