Add support for victoria

Add support for stable victoria. Changes include:
* https://review.opendev.org/#/c/716049/ switched to unittest for mock

Change-Id: I053657f535d985205ae9d3548291ec1d1409cb74

.zuul.yaml

@@ -1,7 +1,7 @@
 - project:
     name: x/group-based-policy
     templates:
-      - openstack-python3-ussuri-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
@@ -15,17 +15,22 @@
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py36:
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py37:
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
+        - openstack-tox-py38:
+            nodeset: ubuntu-bionic
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/victoria
         - legacy-group-based-policy-dsvm-functional:
             voting: false
         - legacy-group-based-policy-dsvm-aim:
@@ -38,14 +43,19 @@
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py36:
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py37:
             nodeset: ubuntu-bionic
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
+        - openstack-tox-py38:
+            nodeset: ubuntu-bionic
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/victoria

devstack/lib/nfp

@@ -25,7 +25,7 @@ NEUTRON_CONF_DIR=/etc/neutron
 NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf
 NFP_CONF_DIR=/etc/nfp
 DISKIMAGE_CREATE_DIR=$NFPSERVICE_DIR/gbpservice/contrib/nfp/tools/image_builder
-NEUTRON_SRC_BRANCH_FOR_NFP_CONTROLLER=stable/ussuri
+NEUTRON_SRC_BRANCH_FOR_NFP_CONTROLLER=stable/victoria
 
 # Save trace setting
 XTRACE=$(set +o | grep xtrace)

devstack/local.conf.nfp

@@ -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/ussuri
-        enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/ussuri
-        enable_plugin neutron https://opendev.org/openstack/neutron.git stable/ussuri
-        enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas.git stable/ussuri
-        enable_plugin octavia https://opendev.org/openstack/octavia.git stable/ussuri
+        enable_plugin neutron-fwaas http://opendev.org/openstack/neutron-fwaas.git stable/victoria
+        enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/victoria
+        enable_plugin neutron https://opendev.org/openstack/neutron.git stable/victoria
+        enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas.git stable/victoria
+        enable_plugin octavia https://opendev.org/openstack/octavia.git stable/victoria
 
     fi
 fi

gbpservice/contrib/tests/unit/nfp/config_orchestrator/modules/test_config_orch.py

@@ -12,7 +12,8 @@
 
 import uuid
 
-import mock
+from unittest import mock
+
 from neutron.tests import base
 from neutron_lib import context as ctx
 

gbpservice/contrib/tests/unit/nfp/configurator/advanced_controller/test_controller.py

@@ -14,7 +14,8 @@
 import os
 import zlib
 
-import mock
+from unittest import mock
+
 import oslo_serialization.jsonutils as jsonutils
 import pecan
 import pika

gbpservice/contrib/tests/unit/nfp/configurator/agents/test_firewall.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.tests import base
 from oslo_config import cfg

gbpservice/contrib/tests/unit/nfp/configurator/agents/test_generic_config.py

@@ -12,10 +12,12 @@
 
 import subprocess
 
-import mock
-from neutron.tests import base
+from unittest import mock
+
 import unittest2
 
+from neutron.tests import base
+
 from gbpservice.contrib.nfp.configurator.agents import generic_config as gc
 from gbpservice.contrib.nfp.configurator.lib import (
                                     generic_config_constants as const)

gbpservice/contrib/tests/unit/nfp/configurator/agents/test_nfp_service.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.tests import base
 

gbpservice/contrib/tests/unit/nfp/configurator/agents/test_vpn_agent.py

@@ -11,7 +11,7 @@
 #    under the License.
 
 
-import mock
+from unittest import mock
 
 from gbpservice.contrib.nfp.configurator.agents import vpn
 from gbpservice.contrib.nfp.configurator.lib import vpn_constants as const

gbpservice/contrib/tests/unit/nfp/configurator/drivers/firewall/test_vyos_fw_driver.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import requests
 
 from neutron.tests import base

gbpservice/contrib/tests/unit/nfp/configurator/drivers/vpn/test_vpn_driver.py

@@ -12,7 +12,8 @@
 
 import json
 
-import mock
+from unittest import mock
+
 from neutron.tests import base
 from oslo_serialization import jsonutils
 import requests

gbpservice/contrib/tests/unit/nfp/configurator/modules/test_configurator.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.tests import base
 

gbpservice/contrib/vmware/test_nsx_policy_mapping_driver.py

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from mock import call
 import webob.exc
 

gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py

@@ -14,7 +14,8 @@
 import copy
 import os
 
-import mock
+from unittest import mock
+
 from neutron.api import extensions
 from neutron.api.rpc.callbacks.producer import registry
 from neutron import policy

gbpservice/neutron/tests/unit/nfp/core/test_process_model.py

@@ -14,13 +14,14 @@ import multiprocessing
 import random
 import time
 
+from unittest import mock
+
 from gbpservice.nfp.core import context as nfp_context
 from gbpservice.nfp.core import controller as nfp_controller
 from gbpservice.nfp.core import event as nfp_event
 from gbpservice.nfp.core import log as nfp_logging
 from gbpservice.nfp.core import manager as nfp_manager
 from gbpservice.nfp.core import worker as nfp_worker
-import mock
 from oslo_config import cfg as oslo_config
 import six
 import unittest2

gbpservice/neutron/tests/unit/nfp/lib/test_transport.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import context as ctx
 from neutron_lib import rpc as n_rpc
 from oslo_config import cfg

gbpservice/neutron/tests/unit/nfp/orchestrator/db/test_nfp_db.py

@@ -14,8 +14,10 @@
 import copy
 import uuid
 
+from unittest import mock
+
 import fixtures
-import mock
+
 from neutron.tests import base
 from neutron_lib import context
 from sqlalchemy.orm import exc

gbpservice/neutron/tests/unit/nfp/orchestrator/drivers/test_orchestration_driver.py

@@ -12,7 +12,8 @@
 
 import uuid as pyuuid
 
-import mock
+from unittest import mock
+
 from mock import patch
 from oslo_config import cfg
 import unittest2

gbpservice/neutron/tests/unit/nfp/orchestrator/modules/test_device_orchestrator.py

@@ -14,7 +14,8 @@
 import copy
 import uuid as pyuuid
 
-import mock
+from unittest import mock
+
 from mock import patch
 from oslo_config import cfg
 import unittest2

gbpservice/neutron/tests/unit/nfp/orchestrator/modules/test_service_orchestrator.py

@@ -13,8 +13,10 @@
 
 import uuid as pyuuid
 
+from unittest import mock
+
 from keystoneclient.v2_0 import client as identity_client
-import mock
+
 from oslo_config import cfg
 
 from gbpservice.neutron.tests.unit.nfp.orchestrator.db import test_nfp_db

gbpservice/neutron/tests/unit/nfp/orchestrator/test_heat_driver.py

@@ -12,10 +12,11 @@
 
 import copy
 
+from unittest import mock
+
 from keystoneauth1.identity import v2
 from keystoneauth1 import session
 from keystoneclient.v2_0 import client as identity_client
-import mock
 from neutronclient.v2_0 import client as neutron_client
 from oslo_config import cfg
 from oslo_utils import uuidutils

gbpservice/neutron/tests/unit/nfp/orchestrator/test_openstack_driver.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 import unittest2
 

gbpservice/neutron/tests/unit/nfp/proxy_agent/modules/test_proxy_agent.py

@@ -10,8 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from gbpservice.nfp.proxy_agent.modules import proxy_agent
-import mock
 from neutron_lib import context as ctx
 import unittest2
 

gbpservice/neutron/tests/unit/nfp/proxy_agent/notifications/test_pull_notifications.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import context as ctx
 from neutron_lib import rpc as n_rpc
 from oslo_config import cfg

gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py

@@ -18,6 +18,8 @@ import datetime
 import re
 import time
 
+from unittest import mock
+
 from aim.aim_lib import nat_strategy
 from aim import aim_manager
 from aim.api import infra as aim_infra
@@ -30,7 +32,6 @@ from aim.db import models as aim_models  # noqa
 from aim import utils as aim_utils
 import fixtures
 from keystoneclient.v3 import client as ksc_client
-import mock
 import netaddr
 from neutron.api import extensions
 from neutron.db import provisioning_blocks
@@ -3790,7 +3791,7 @@ class TestTrackedResources(tr_res.TestTrackedResources, ApicAimTestCase):
 
     def setUp(self, **kwargs):
         super(TestTrackedResources, self).setUp(**kwargs)
-        for patch in mock.mock._patch._active_patches:
+        for patch in mock._patch._active_patches:
             if patch.attribute == '_ensure_default_security_group':
                 patch.stop()
 

gbpservice/neutron/tests/unit/plugins/ml2plus/test_db_apic_aim.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.tests.unit import testlib_api
 from neutron_lib import context
 from oslo_db import exception as exc

gbpservice/neutron/tests/unit/plugins/ml2plus/test_extension_driver_api.py

@@ -15,7 +15,8 @@
 
 import uuid
 
-import mock
+from unittest import mock
+
 from neutron_lib import context
 from neutron_lib.plugins import directory
 from oslo_config import cfg

gbpservice/neutron/tests/unit/plugins/ml2plus/test_l3_apic_aim.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import context
 
 from gbpservice.neutron.services.apic_aim import l3_plugin

gbpservice/neutron/tests/unit/plugins/ml2plus/test_plugin.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from neutron.api import extensions

gbpservice/neutron/tests/unit/plugins/ml2plus/test_tracked_resources.py

@@ -12,7 +12,8 @@
 
 import functools
 
-import mock
+from unittest import mock
+
 from neutron.api import extensions
 from neutron.tests.unit.plugins.ml2 import (
     test_tracked_resources as n_tracked)

gbpservice/neutron/tests/unit/services/grouppolicy/test_aim_mapping_driver.py

@@ -14,12 +14,13 @@
 import copy
 import hashlib
 
+from unittest import mock
+
 from aim.api import infra as aim_infra
 from aim.api import resource as aim_resource
 from aim.api import status as aim_status
 from aim import context as aim_context
 from keystoneclient.v3 import client as ksc_client
-import mock
 import netaddr
 from netaddr import IPSet
 from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api

gbpservice/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from neutron.tests.unit.plugins.ml2 import test_plugin
 from neutron_lib import context
 from oslo_config import cfg

gbpservice/neutron/tests/unit/services/grouppolicy/test_neutron_resources_driver.py

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import context as nctx
 from neutron_lib.plugins import constants as pconst
 from neutron_lib.plugins import directory

gbpservice/neutron/tests/unit/services/grouppolicy/test_neutronv2_api.py

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 import unittest2
 
 from neutronclient.v2_0 import client as clientv20

gbpservice/neutron/tests/unit/services/grouppolicy/test_neutronv2_client.py

@@ -11,7 +11,8 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
+
 from neutron.tests.unit.db import test_db_base_plugin_v2
 from neutron_lib import context
 from neutronclient.common import exceptions

gbpservice/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py

@@ -14,8 +14,9 @@
 import copy
 import itertools
 
+from unittest import mock
+
 from keystonemiddleware import auth_token  # noqa
-import mock
 import netaddr
 from neutron.db.qos import models as qos_models
 from neutron.extensions import securitygroup as ext_sg

gbpservice/neutron/tests/unit/services/qos/test_aim_qos_driver.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 # from aim.api import infra as aim_infra
 from aim.api import resource as aim_res

gbpservice/neutron/tests/unit/services/servicechain/ncp/test_heat_node_driver.py

@@ -14,8 +14,9 @@
 import copy
 import itertools
 
+from unittest import mock
+
 import heatclient
-import mock
 from neutron_lib.api.definitions import external_net
 from neutron_lib import context as neutron_context
 from neutron_lib.plugins import constants

gbpservice/neutron/tests/unit/services/servicechain/ncp/test_ncp_plugin.py

@@ -11,9 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 import webob.exc
 
-import mock
 from neutron.common import config
 from neutron_lib import context as n_context
 from neutron_lib import exceptions as n_exc

gbpservice/neutron/tests/unit/services/servicechain/ncp/test_nfp_node_driver.py

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib.plugins import constants
 from oslo_serialization import jsonutils
 import webob

gbpservice/neutron/tests/unit/services/servicechain/ncp/test_traffic_stitching_plumber.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.common import config  # noqa
 from neutron_lib import context as n_context
 from neutron_lib.plugins import constants as pconst

gbpservice/neutron/tests/unit/services/servicechain/ncp/test_tscp_resource_mapping.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.common import config  # noqa
 from neutron_lib import context as n_context
 from neutron_lib.plugins import directory

gbpservice/neutron/tests/unit/services/sfc/test_aim_sfc_driver.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from aim.api import infra as aim_infra
 from aim.api import resource as aim_res

gbpservice/neutron/tests/unit/test_extension_group_policy.py

@@ -13,7 +13,8 @@
 import copy
 import re
 
-import mock
+from unittest import mock
+
 from neutron.tests import base
 from neutron.tests.unit.api.v2 import test_base
 from neutron.tests.unit.extensions import base as test_extensions_base

gbpservice/neutron/tests/unit/test_extension_servicechain.py

@@ -12,7 +12,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 from neutron.tests.unit.api.v2 import test_base
 from neutron.tests.unit.extensions import base as test_extensions_base
 from neutron_lib.plugins import constants

gbpservice/tests/contrib/devstack/local-aim.conf

@@ -13,11 +13,11 @@ SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregate
 
 enable_plugin group-based-policy https://opendev.org/x/group-based-policy.git master
 
-enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc.git stable/ussuri
+enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc.git stable/victoria
 
 ENABLE_APIC_AIM_GATE=True
 
 AIM_BRANCH=master
-OPFLEX_BRANCH=stable/ussuri
+OPFLEX_BRANCH=stable/victoria
 APICAPI_BRANCH=master
 ACITOOLKIT_BRANCH=noiro-lite

gbpservice/tests/contrib/devstack/local-nfp.conf

@@ -20,7 +20,7 @@ GBPSERVICE_BRANCH=master
 #GBPSERVICE_BRANCH=refs/changes/85/298385/154
 
 GBPCLIENT_REPO=${GIT_BASE}/x/python-group-based-policy-client.git
-GBPCLIENT_BRANCH=stable/ussuri
+GBPCLIENT_BRANCH=stable/victoria
 
 GBPUI_REPO=${GIT_BASE}/x/group-based-policy-ui.git
 GBPUI_BRANCH=master
@@ -43,13 +43,13 @@ enable_service q-svc
 enable_service q-agt
 enable_service q-dhcp
 enable_service q-l3
-enable_plugin neutron-fwaas https://opendev.org/openstack/neutron-fwaas.git stable/ussuri
-enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/ussuri
-enable_plugin neutron https://opendev.org/openstack/neutron.git stable/ussuri
+enable_plugin neutron-fwaas https://opendev.org/openstack/neutron-fwaas.git stable/victoria
+enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas.git stable/victoria
+enable_plugin neutron https://opendev.org/openstack/neutron.git stable/victoria
 
 
 #ENBALE OCTAVIA
-enable_plugin octavia https://opendev.org/openstack/octavia stable/ussuri
+enable_plugin octavia https://opendev.org/openstack/octavia stable/victoria
 #ENABLED_SERVICES+=,octavia,o-cw,o-hk,o-hm,o-api
 
 enable_service q-fwaas-v1

gbpservice/tests/contrib/devstack/local.conf

@@ -20,7 +20,7 @@ GBPSERVICE_BRANCH=master
 #GBPSERVICE_BRANCH=refs/changes/54/240954/47
 
 GBPCLIENT_REPO=${GIT_BASE}/x/python-group-based-policy-client.git
-GBPCLIENT_BRANCH=stable/ussuri
+GBPCLIENT_BRANCH=stable/victoria
 
 GBPUI_REPO=${GIT_BASE}/x/group-based-policy-ui.git
 GBPUI_BRANCH=master

gbpservice/tests/contrib/functions-gbp

@@ -16,7 +16,7 @@ XTRACE=$(set +o | grep xtrace)
 
 function prepare_gbp_devstack_pre {
     cd $TOP_DIR
-    sudo git checkout stable/ussuri
+    sudo git checkout stable/victoria
     sudo sed -i 's/DEST=\/opt\/stack/DEST=\/opt\/stack\/new/g' $TOP_DIR/stackrc
     sudo sed -i 's/source $TOP_DIR\/lib\/neutron/source $TOP_DIR\/lib\/neutron\nsource $TOP_DIR\/lib\/neutron-legacy/g' $TOP_DIR/stack.sh
 }
@@ -25,15 +25,15 @@ function prepare_gbp_devstack_post {
     # The following should updated when master moves to a new release
     # We need to do the following since the infra job clones these repos and
     # checks out the master branch (as this is the master branch) and later
-    # does not switch to the stable/ussuri branch when installing devstack
+    # does not switch to the stable/victoria branch when installing devstack
     # since the repo is already present.
     # This can be worked around by changing the job description in
-    # project-config to set BRANCH_OVERRIDE to use the stable/ussuri branch
-    sudo git --git-dir=/opt/stack/new/neutron/.git --work-tree=/opt/stack/new/neutron checkout stable/ussuri
-    sudo git --git-dir=/opt/stack/new/nova/.git --work-tree=/opt/stack/new/nova checkout stable/ussuri
-    sudo git --git-dir=/opt/stack/new/keystone/.git --work-tree=/opt/stack/new/keystone checkout stable/ussuri
-    sudo git --git-dir=/opt/stack/new/cinder/.git --work-tree=/opt/stack/new/cinder checkout stable/ussuri
-    sudo git --git-dir=/opt/stack/new/requirements/.git --work-tree=/opt/stack/new/requirements checkout stable/ussuri
+    # project-config to set BRANCH_OVERRIDE to use the stable/victoria branch
+    sudo git --git-dir=/opt/stack/new/neutron/.git --work-tree=/opt/stack/new/neutron checkout stable/victoria
+    sudo git --git-dir=/opt/stack/new/nova/.git --work-tree=/opt/stack/new/nova checkout stable/victoria
+    sudo git --git-dir=/opt/stack/new/keystone/.git --work-tree=/opt/stack/new/keystone checkout stable/victoria
+    sudo git --git-dir=/opt/stack/new/cinder/.git --work-tree=/opt/stack/new/cinder checkout stable/victoria
+    sudo git --git-dir=/opt/stack/new/requirements/.git --work-tree=/opt/stack/new/requirements checkout stable/victoria
 
     source $TOP_DIR/functions
     source $TOP_DIR/functions-common

test-requirements.txt

@@ -4,19 +4,19 @@
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 # Since version numbers for these are specified in
-# https://releases.openstack.org/constraints/upper/ussuri, they cannot be
+# https://releases.openstack.org/constraints/upper/victoria, they cannot be
 # referenced as GIT URLs.
 neutron
 python-heatclient
 python-keystoneclient
 
--e git+https://opendev.org/openstack/networking-sfc.git@stable/ussuri#egg=networking-sfc
+-e git+https://opendev.org/openstack/networking-sfc.git@stable/victoria#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/ussuri#egg=neutron-opflex-agent
+-e git+https://github.com/noironetworks/python-opflex-agent.git@stable/victoria#egg=neutron-opflex-agent
 
--e git+https://opendev.org/x/python-group-based-policy-client.git@stable/ussuri#egg=python-group-based-policy-client
+-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/victoria#egg=python-group-based-policy-client
 
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3

tox.ini

@@ -16,7 +16,7 @@ usedevelop = True
 install_command =
   pip install {opts} {packages}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh