OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.

.gitreview

@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-neutronclient.git
+defaultbranch=stable/pike

.zuul.yaml

@@ -0,0 +1,47 @@
+- project:
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - publish-openstack-sphinx-docs
+      - check-requirements
+      - lib-forward-testing
+      - release-notes-jobs
+      - openstackclient-plugin-jobs
+    check:
+      jobs:
+        - legacy-neutronclient-test-dsvm-functional:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^neutron/locale/.*$
+              - ^releasenotes/.*$
+        - legacy-neutronclient-test-dsvm-functional-adv-svcs:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^neutron/locale/.*$
+              - ^releasenotes/.*$
+    gate:
+      jobs:
+        - legacy-neutronclient-test-dsvm-functional:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^neutron/locale/.*$
+              - ^releasenotes/.*$
+        - legacy-neutronclient-test-dsvm-functional-adv-svcs:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^neutron/locale/.*$
+              - ^releasenotes/.*$
+    post:
+      jobs:
+        - openstack-tox-cover
+    experimental:
+      jobs:
+        - legacy-grenade-dsvm-neutron-libs:
+            irrelevant-files:
+              - ^(test-|)requirements.txt$
+              - ^setup.cfg$
+

doc/requirements.txt

@@ -0,0 +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.
+
+openstackdocstheme>=1.16.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0
+sphinx>=1.6.2 # BSD

neutronclient/osc/v2/sfc/sfc_port_pair.py

@@ -58,8 +58,8 @@ class CreateSfcPortPair(command.ShowOne):
             action=parseractions.MultiKeyValueAction,
             optional_keys=['correlation', 'weight'],
             help=_('Dictionary of service function parameters. '
-                   'Currently, only correlation=None and weight '
-                   'is supported. Weight is an integer that influences '
+                   'Currently, correlation=(None|mpls) and weight '
+                   'are supported. Weight is an integer that influences '
                    'the selection of a port pair within a port pair group '
                    'for a flow. The higher the weight, the more flows will '
                    'hash to the port pair. The default weight is 1.'))

neutronclient/shell.py

@@ -103,6 +103,9 @@ def check_non_negative_int(value):
     return value
 
 
+COMMANDS = {}
+
+
 # NOTE(amotoki): This is only to provide compatibility
 # to existing neutron CLI extensions. See bug 1706573 for detail.
 def _set_commands_dict_for_compat(apiversion, command_manager):

neutronclient/tests/functional/hooks/fwaas

@@ -1,2 +1,2 @@
-enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas
+enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas
 enable_service q-fwaas

neutronclient/tests/functional/hooks/post_test_hook.sh

@@ -31,8 +31,8 @@ function generate_test_logs {
 
 function generate_testr_results {
     # Give job user rights to access tox logs
-    sudo -H -u $owner chmod o+rw .
-    sudo -H -u $owner chmod o+rw -R .testrepository
+    sudo -H -u $USER chmod o+rw .
+    sudo -H -u $USER chmod o+rw -R .testrepository
     if [ -f ".testrepository/0" ] ; then
         .tox/$VENV/bin/subunit-1to2 < .testrepository/0 > ./testrepository.subunit
         $SCRIPTS_DIR/subunit2html ./testrepository.subunit testr_results.html
@@ -48,9 +48,8 @@ function generate_testr_results {
 }
 
 export NEUTRONCLIENT_DIR="$BASE/new/python-neutronclient"
-owner=jenkins
 
-sudo chown -R $owner:stack $NEUTRONCLIENT_DIR
+sudo chown -R $USER:stack $NEUTRONCLIENT_DIR
 
 # Go to the neutronclient dir
 cd $NEUTRONCLIENT_DIR
@@ -60,7 +59,7 @@ VENV=${1:-"functional"}
 echo "Running neutronclient functional test suite"
 set +e
 # Preserve env for OS_ credentials
-sudo -E -H -u $owner tox -e $VENV
+sudo -E -H -u $USER tox -e $VENV
 EXIT_CODE=$?
 set -e
 

neutronclient/tests/functional/hooks/vpnaas

@@ -1 +1 @@
-enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
+enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas

neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py

@@ -81,16 +81,17 @@ class TestCreateSfcPortPair(fakes.TestNeutronClientOSCV2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-    def test_create_port_pair_all_options(self):
+    def _test_create_port_pair_all_options(self, correlation):
         arglist = [
             "--description", self._port_pair['description'],
             "--egress", self._port_pair['egress'],
             "--ingress", self._port_pair['ingress'],
             self._port_pair['name'],
-            "--service-function-parameters", 'correlation=None,weight=1',
+            "--service-function-parameters",
+            'correlation=%s,weight=1' % correlation,
         ]
 
-        sfp = [{'correlation': 'None', 'weight': '1'}]
+        sfp = [{'correlation': correlation, 'weight': '1'}]
 
         verifylist = [
             ('ingress', self._port_pair['ingress']),
@@ -109,12 +110,19 @@ class TestCreateSfcPortPair(fakes.TestNeutronClientOSCV2):
                           'egress': self._port_pair['egress'],
                           'description': self._port_pair['description'],
                           'service_function_parameters':
-                              [{'correlation': 'None', 'weight': '1'}],
+                              [{'correlation': correlation, 'weight':
+                                  '1'}],
                           }
         })
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
+    def test_create_port_pair_all_options(self):
+        self._test_create_port_pair_all_options('None')
+
+    def test_create_port_pair_all_options_mpls(self):
+        self._test_create_port_pair_all_options('mpls')
+
 
 class TestDeleteSfcPortPair(fakes.TestNeutronClientOSCV2):
 

requirements.txt

@@ -11,7 +11,7 @@ oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0
 oslo.utils>=3.20.0 # Apache-2.0
 os-client-config>=1.28.0 # Apache-2.0
-keystoneauth1>=3.0.1 # Apache-2.0
+keystoneauth1>=3.1.0 # Apache-2.0
 # keystoneclient is used only by neutronclient.osc.utils
 # TODO(amotoki): Drop this after osc.utils has no dependency on keystoneclient
 python-keystoneclient>=3.8.0 # Apache-2.0

setup.cfg

@@ -386,12 +386,6 @@ neutron.cli.v2 =
     vpn-ikepolicy-delete = neutronclient.neutron.v2_0.vpn.ikepolicy:DeleteIKEPolicy
 
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [wheel]
 universal = 1
 

test-requirements.txt

@@ -8,15 +8,13 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
 mox3!=0.19.0,>=0.7.0 # Apache-2.0
 mock>=2.0 # BSD
-openstackdocstheme>=1.11.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
-python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
+python-openstackclient>=3.11.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-reno!=2.3.1,>=1.8.0 # Apache-2.0
 requests-mock>=1.1 # Apache-2.0
-sphinx>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 testscenarios>=0.4 # Apache-2.0/BSD
 tempest>=16.1.0 # Apache-2.0
+pycodestyle<=2.3.1

tools/tox_install.sh

@@ -33,7 +33,7 @@ elif [ -x "$ZUUL_CLONER" ]; then
     $ZUUL_CLONER --cache-dir \
         /opt/git \
         --branch $BRANCH_NAME \
-        git://git.openstack.org \
+        https://git.openstack.org \
         openstack/requirements
     cd openstack/requirements
     $install_cmd -e .
@@ -51,5 +51,10 @@ fi
 # install will be constrained and we need to unconstrain it.
 edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
 
-$install_cmd -U $*
+if [ -z "$@" ]; then
+    echo "No packages to be installed."
+    exit 0
+fi
+
+$install_cmd -U "$@"
 exit $?

tox.ini

@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
 usedevelop = True
 install_command =
-    {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+    {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 # Delete bytecodes from normal directories before running tests.
@@ -47,9 +47,17 @@ commands =
   coverage report
 
 [testenv:docs]
+# The upper constraints are handled by tox_install.sh script
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
+# The upper constraints are handled by tox_install.sh script
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]