Update git submodules
* Update neutron-vpnaas from branch 'master' - Merge "Increment versioning with pbr instruction" - Merge "Change openstack-dev to openstack-discuss" - Increment versioning with pbr instruction With moving away from required milestone releases, the version numbers calculated by PBR on the master branch will not work for those testing upgrades from the last stable release. More details can be found in the mailing list post here: http://lists.openstack.org/pipermail/openstack-dev/2018-October/135706.html This is an empty commit that will cause PBR to increment its calculated version to get around this. PBR will see the following which will cause it to increment the version: Sem-Ver: feature Please merge this patch as soon as possible to support those testing upgrades. Change-Id: I718bc2b9db7f2199369e1d85ddb49ebd9774439d Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com> - Fix and skip gate failures lower-constraints.txt is updated. - ryu 4.24 - pecan 1.3.2 neutron-vpnaas-tempest-libreswan-centos is now non-voting because Cinder DB migration fails on CentOS 7. This patch also includes the changes from [1] as without them the tests fail. [1] https://review.openstack.org/#/c/599034/ Related-Bug: 1808709 Change-Id: Id6a2eadfacb3983cfc05142860a827d3233561dd - Change openstack-dev to openstack-discuss Mailinglists have been updated. Openstack-discuss replaces openstack-dev. Change-Id: I0ad0b5143d3b1e72868e6b7035b367d40f7a720a - Merge "Update min tox version to 2.3.2" - Merge "remove external_network_bridge option" - Update min tox version to 2.3.2 After latest changes on tox.ini, the minimum version of tox need to be changed to 2.3.2. https://bugs.launchpad.net/neutron/+bug/1695888 I458cf0d5e8927cf11a44b49ecfb5178a228aafaf Change-Id: I62991679465a52710b8c24af80fdb311c1e26969 - Merge "use payloads for SUBNET BEFORE_DELETE events" - remove external_network_bridge option The external_network_bridge option is deprecated/legacy and being removed from neutron [1]. This patch removes the external_network_bridge option from neutron-vpnaas. [1] https://review.openstack.org/#/c/567369/ Change-Id: Ib9965247dbec10a83bacdff5b852b8c888c23ad5 - Merge "fix tox python3 overrides" - use payloads for SUBNET BEFORE_DELETE events This patch switches over to the payload style of callbacks for the BEFORE_DELETE events of SUBNET resources in prep for the depends on patch listed below. Change-Id: Ia4a3f8074d9c2e879ead97957b2f962ddd0a161f Depends-On: https://review.openstack.org/#/c/597561/ - fix tox python3 overrides We want to default to running all tox environments under python 3, so set the basepython value in each environment. We do not want to specify a minor version number, because we do not want to have to update the file every time we upgrade python. We do not want to set the override once in testenv, because that breaks the more specific versions used in default environments like py35 and py36. Change-Id: Iccd8b6a73946d841a383ac9558fec3ae031373cd Signed-off-by: Doug Hellmann <doug@doughellmann.com> - use common rpc and exceptions from neutron-lib The neutron.common.rpc and exceptions were rehomed into neutron-lib and are currently shimmed in neutron [1] This patch consumes those modules from neutron-lib by using lib's modules rather than neutrons. [1] https://review.openstack.org/#/c/586525/ Change-Id: Ic2839a32ec742bf25c9414650c24f17b91ae44c3 - add local pep8 tox target This patch adds the pep8-dev tox target for running pep8 locally as per [1]. In addition it updates the pylint version to work with python 3.x and addresses some pylint errors in the code. [1] https://etherpad.openstack.org/p/neutron-sibling-setup Change-Id: I7bd4d8e75601a7291692d6256925f46fb4fa5464 - opt in for neutron-lib consumption patches As part of the Denver PTG [1] we decided networking related projects that are "current" and want to receive neutron-lib consumption patches on an on-going basis should indicate such with a well defined comment in their requirements.txt. This allows us to easily find the list of project to receive neutron-lib consumption patches [2] by searching for the string. In addition, projects opting-in for these patches are also attesting they will stay up to date with TC and infra initiatives to ensure consumption patches can flow freely. This patch adds the "neutron-lib-current" string to requirements.txt opting in for neutron-lib consumption patches. [1] https://etherpad.openstack.org/p/neutron-stein-ptg [2] https://docs.openstack.org/neutron-lib/latest/contributor/contributing.html#phase-4-consume Change-Id: Id641165b9e556e26ddd483b3a5b37e90d6956e94 - Merge "Match IPSEC SA established state" - Merge "Add dummy ipsec driver for unit tests" - Merge "Show team and repo badges on README" - add python 3.6 unit test job This is a mechanically generated patch to add a unit test job running under Python 3.6 as part of the python3-first goal. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I7f39dd0e4a77abd294ab61cba97c7d8f8f04a4f6 Story: #2002586 Task: #24314 - switch documentation job to new PTI This is a mechanically generated patch to switch the documentation jobs to use the new PTI versions of the jobs as part of the python3-first goal. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Fix tox.ini html files in right place. Change-Id: I8493a3ef704b1da458153a8da3f9b26145f5bff2 Story: #2002586 Task: #24314 - Use templates for cover and lower-constraints Use openstack-tox-cover template, this runs the cover job in the check queue only. Use openstack-lower-constraints-jobs template, remove the definition of neutron-vpnaas-tox-lower-constraints, the neutron template does this correctly. Remove jobs that are part of the templates. Change-Id: I7e39bc8e3348883b06a8f38a503dd5db14d20c5d - import zuul job settings from project-config This is a mechanically generated patch to complete step 1 of moving the zuul job settings out of project-config and into each project repository. Because there will be a separate patch on each branch, the branch specifiers for branch-specific jobs have been removed. Because this patch is generated by a script, there may be some cosmetic changes to the layout of the YAML file(s) as the contents are normalized. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I5c06bc35d0ff9e68743b1d44cbba2541268b88ec Story: #2002586 Task: #24314 - use setup_extension in unit tests This patch switches usages of _setUpExtension over to setup_extension to phase out the unused attr map parameter. For more details see https://review.openstack.org/#/c/561305/ Change-Id: I44bfd349dc2e130b87275d15b72c3a02dc89145f - Match IPSEC SA established state While using IKE policy with version v2, the IPsec siteconnection status always down. From librewan wiki[1], the "phase2" in IKEv2 mistakenly calls itself a PARENT SA which same as "phase1", This is a known bug for some versions of libreswan. For the newer versions of libreswan(3.20+), the "IPsec SA established" will successful output if phase2 state established. Here we match the "established" and "newest IPSEC" for an established IPSEC SA. [1] https://libreswan.org/wiki/How_to_read_status_output Change-Id: Iffff7d00f48e69fbc53bb45df17d6a5be6760a6d Closes-Bug: #1781354 - Update reno for stable/rocky Change-Id: Iba448e28ad2969dc451e67ac1d40ebbeb0b59318 - Show team and repo badges on README This patch adds the team's and repository's badges to the README file. The motivation behind this is to communicate the project status and features at first glance. For more information about this effort, please read this email thread: http://lists.openstack.org/pipermail/openstack-dev/2016-October/105562.html To see an example of how this would look like check: https://gist.github.com/1c8b7ec0a4a119dc5e39e8a4ffde8a33 Change-Id: Ieb221468c7efa8b3343c6e6c809ffe246c0ce9c1 - Function argument name not used correctly This will cause an error when generating docs with python3. Change-Id: I613f7670f10c0a176757907181dd687d18632edd - use callback payloads for ROUTER/ROUTER_GATEWAY BEFORE_DELETE events This patch switches ROUTER/ROUTER_GATEWAY BEFORE_DELETE events to use payload style args. It also factors vpn_callback into a separate callback specifically for ROUTER BEFORE_DELETE events to support both styles; the TODO in the code can be cleaned up later. Change-Id: I68fe5583426d6fa844a2a25a21256f842e587dff Depends-On: https://review.openstack.org/#/c/562762 - add py3-dev tox target and update lower constraints zuul job This patch adds a py3-dev tox target for running py3 UTs locally. It also updates the local .zuul.yaml for a neutron-vpnaas specific lower constraints job that ensure neutron/master is installed. Change-Id: Iab9f134b17b56d765d5ac523d9b5a4b4d4e00fb7 Partial-Bug: #1779335 - Add dummy ipsec driver for unit tests This patch intends to add a dummy ipsec driver in order to verify multiple drivers can work together. Change-Id: I441321e20468b82fe280b10b295c1fd62910b53d - update requirements for neutron-lib 1.18.0 Neutron-lib 1.18.0 is our Rocky RC and is already being used by neutron [1]. This patch updates the neutron-lib required version to match neutron [1] in prep for the Rocky release. [1] https://review.openstack.org/#/c/583671/ To work with neutron-lib 1.18.0, we need Rocky version of neutron, so the minimum version of neutron is bumped to 13.0.0.0b2 (Rocky-2). We also need to bump the minimum version of SQLAlchemy. Rocky neutron depends on pending_to_persistent ORM event in SQLAlchemy which was added in SQLAlchemy 1.1. Rocky neutron now requires SqlAlchemy>=1.2.0, so the min version of SQLAlchemy is bumped to 1.2.0. Co-Authored-By: Akihiro Motoki <amotoki@gmail.com> Change-Id: I7c8c6c1b28e9dd85e192ec8d44e324e135419cbd - Switch to stestr According to Openstack summit session [1] stestr is maintained project to which all Openstack projects should migrate. Let's switch it then. [1] https://etherpad.openstack.org/p/YVR-python-pti Change-Id: Ia4c71631e4c51ec814bcefc115d4f5690c11e37b - Merge "Fix lower-constraints.txt" - Make libreswan driver work with recent versions LibreSwan 3.19 introduces a new commandline argument '--nssdir' for pluto which defaults to '/etc/ipsec.d'. As older versions don't understand such an option, we cannot just add it to the commandline. The commandline arguments of LibreSwan are not stable enough to rely on. For example, in 3.19, 'ipsec initnss' has the new argument '--nssdir', and in 3.20, 'ipsec pluto' also gets this new argument '--nssdir', then in 3.22, the argument '--ctlbase' is phased out. In this commit, instead of trying new options and then fallback to old ones for older versions, the bind-mount method used in StrongSwan driver is adopted. With /etc and /var/run bind mounted, all the commandline arguments related to configuration file places can be removed. This ensures that changes of such arguments between different versions won't bother as the default places are always used. This commit also replaces 'auth=' by 'phase2=' in the configuration template as the former is for a long time an alias of the latter and removed in LibreSwan 3.19. The virtual-private argument of 'ipsec pluto' has been put into the configuration file to avoid commas(,) in the commandline so that the netns_wrapper can work well. A new tempest job for running LibreSwan as the device driver on CentOS 7 is also added to avoid regression. This commit has been simply tested on CentOS 7.4 with the following versions of LibreSwan provided by the CentOS repo: - libreswan-3.12-5.el7.x86_64.rpm - libreswan-3.12-10.1.el7_1.x86_64.rpm - libreswan-3.15-5.el7_1.x86_64.rpm - libreswan-3.15-8.el7.x86_64.rpm - libreswan-3.20-3.el7.x86_64.rpm - libreswan-3.20-5.el7_4.x86_64.rpm and different versions of LibreSwan provided by libreswan.org[1]: [1] https://download.libreswan.org/binaries/rhel/7/x86_64/ Change-Id: Iacb6f13187b49cf771f0c24662d6af9217c211b8 Closes-Bug: #1711456 - Merge "Avoid using non-ASCII characters when generating config files" - Fix lower-constraints.txt During the change https://review.openstack.org/#/c/573216/, neutron-vpnaas lower-constraints.txt looks out-of-date. This commit fixes lower-constraints.txt. Change-Id: Ie15722a60d4be5dc326ce16466610d7c6308884c - Merge "Fix flavors plugin not found error" - Merge "Remove unmaintained drivers" - Fix functional tests gate With commit 88f5e11d8bf[1], neutron plugs new ports as dead vlan. During functional tests all the ports are untagged. So such tag should be removed during functional testing. Closes-Bug: #1777673 [1] I024bbbdf7059835b2f23c264b48478c71633a43c Change-Id: I7b472b4a4f51fea473635fbd731a897e46af5eee - Fix flavors plugin not found error Upon the initialization of the vpnaas plugin, it gets the flavors plugin only once. This is not working well because if the vpnaas plugin gets loaded before the flavors service plugin, it will fail to find the flavors service plugin. Closes-Bug: #1773282 Change-Id: Ib4e11c8eef7831513f0fae2a45120ec396cfe3f5 - Avoid using non-ASCII characters when generating config files The name of a VPN service and the PSK of an IPsec site connection may contain non-ASCII characters. Outputing plain texts of these contents may lead to UnicodeEncodeError. As *swan can support base64 encoded PSKs. With this commit, we 1. use VPN service id instead of the name in configuration files, and 2. encode IPsec site connection PSK with base64 to make sure that generated configuration files will only contain ASCII characters. Closes-Bug: #1652909 Change-Id: Ie7edf080fc44537a74c57262bd9943c5e4337428 - Merge "Switch tempest zuul job to zuul v3 native" - Switch tempest zuul job to zuul v3 native Change-Id: Ifa5678c2dace916c5fa0937a1c3d541c537c3cf3 - Remove unmaintained drivers After the announcement on mailing list [1] but there is no response. This patch intends to remove the following drivers that are unmaintained: - CiscoCsrIPsecDriver - FedoraStrongSwanDriver - VyattaIPsecDriver [1] http://lists.openstack.org/pipermail/openstack-dev/2017-July/120264.html Change-Id: I984a41b9a9b5c154c4be7f5bcef621fe8c5677ac - use rpc Connection rather than create_connection The create_connection function in neutron.common.rpc is just an alias to Connection. This patch switches to the later so we can remove the former in: https://review.openstack.org/#/c/560130 Change-Id: Ibba7148351e0978ddf6db27348e7cf7f19762f21 - use plugin names from neutron-lib plugin constants Switch usage of plugin names from neutron_lib.constants over to neutron_lib.plugins.constants in prep for https://review.openstack.org/#/c/531857/ Change-Id: I86e0cdff4802874644262a7aaa699792f4080451 - Fix pep8 errors Pep8 job is broken due to recent pep8 upgrade and corresponding pycodestyle update. This commit fixes the following errors: - E731 do not assign a lambda expression, use a def - W503 line break before binary operator - E402 module level import not at top of file Change-Id: Ib357336eb165cf642f6793ff6cdde7d53075b158 - Change back to using vpn_agent.ini After https://review.openstack.org/#/c/555167/ merged downstream packaging jobs broke due to the filename change to l3_agent.ini. Change it back to vpn_agent.ini since it could cause an upgrade issue. Also, since l3_agent.ini is already used in the neutron tree, having a file with the same name could cause some confusion, so it's better to use something unique. Change-Id: I39cf2c0d1c54e7c292dcdf71831c1a3cbc67284a - Merge "remove unused plugin.get_plugin_name()" - Merge "Improve docs to follow the standard structure" - remove unused plugin.get_plugin_name() This method does not seem to be used anymore: http://codesearch.openstack.org/?q=get_plugin_name&i=nope&files=&repos=neutron,neutron-lib Change-Id: I3a70bf296c849485194dd7df8f06ccc60dccbedc - Improve docs to follow the standard structure neutron-vpnaas documentation needed to be updated to the document structure recommended by the docs team. This commits add several sections and reorganizes the existing docs. Change-Id: Iae2704f3d0653e00c18cf1fccdbcb8b926a5b15c - Fix patterns of unit test files in irrelevant-files 'neutron_vpnaas' is the correct module name. Previously it was 'neutron-vpnaas' and as a result tempest and functional tests are run unexpectedly. Change-Id: I2e691dfcc10ebc7e28d2c546b171006601ea17d5 - test: Register L3 option in L3 ext tests After https://review.openstack.org/#/c/524406/ landed, we need to register L3 opts before initializing router info. Change-Id: I2017be0e9ca069abfdd1c5250bc06b3b4109fa83 Closes-Bug: #1760320 - Merge "Ensure to install latest neutron from master" - Merge "Updated from global requirements" - Merge "add lower-constraints job" - Updated from global requirements Change-Id: Ide5e371c2761fb4fe2282e4ee6e34316e3a5fc7a - Updated from global requirements Change-Id: Id3f794271da9803539ad874bdcc5798d24d692a9 - add lower-constraints job Create a tox environment for running the unit tests against the lower bounds of the dependencies. Create a lower-constraints.txt to be used to enforce the lower bounds in those tests. Add openstack-tox-lower-constraints job to the zuul configuration. See http://lists.openstack.org/pipermail/openstack-dev/2018-March/128352.html for more details. Change-Id: I312f591a68fa30636502eadb563de5656faca3e9 Depends-On: https://review.openstack.org/555034 Signed-off-by: Doug Hellmann <doug@doughellmann.com> - Ensure to install latest neutron from master neutron-vpnaas-dsvm-functional-sswan job requires neutron master branch but after neutron was added to g-r neutron queens is installed. Ideally this can be handled by tox-siblings with zuulv3 native job, but it requires several efforts. This commit tries a work-around just to pass the current broken func test. Change-Id: I91fa5222031ad129f7fdfba5bf1bcb09c6d196ac - Updated from global requirements Change-Id: Ieef7032525380ba55ab7ead1584f00e1a7272501 - Merge "use plugin common utils from neutron-lib" - Merge "Updated from global requirements" - Avoid tox-install.sh Instead of using tox-install.sh, we can install horizon and neutron now directly from pypi - or use the current branch in CI system using tox-siblings. Update tox.ini for this change and add neutron to requirements file. Change-Id: I435297ada6cdeb53a9bd8da8b88714f2c6a838a2 - use plugin common utils from neutron-lib The public APIs that are part of neutron.plugins.common.utils were rehomed into neutron-lib with Iabb155b5d2d0ec6104ebee5dd42cf292bdf3ec61 and will removed in neutron with commit I1d63cbea463e92e1d2e053f8e1a564ed52cb84f8 This patch consumes the common plugin utils from neutron-lib Change-Id: I422a3a6588e967ef57af4b20175a268e4d5bf4c9 - Updated from global requirements Change-Id: I5f351b5c4ec9704c540abf4789a70ea539dab21f - Updated from global requirements Change-Id: I8b871e8f0fd9fd4702dc857cec0347bee2443211 - Merge "Ignore unnecessary changes for tempest job" - Merge "Update home-page url" - Ignore unnecessary changes for tempest job We don't need to run tempest job for unrelevant change in the project. Change-Id: Ica73aa077e2986b6dff5c3605c387aa009b2054d - Rearrange doc structure to standard layout * The document is no longer only for developers, so the title of the top page is updated. * In the current document standard, docs for contributors are placed under contributor/. * Title levels are rearranged to be shown appropriately with openstackdocsthems. * Fixes many sphinx code-block for better rendering. Change-Id: I36fc80d1c1e5382597099b86df3bbf009ce06902 - Merge "Add Hunt Xu to list of driver maintainers" - Merge "Add IPv6 VPNaaS scenario tests" - Merge "Clean imports in code" - Update home-page url The url of home-page is out of date. We need update it. Change-Id: I237bb6078e94b76708b55384149ea2f3b2be6864 - Clean imports in code In some part in the code we import objects. In the Openstack style guidelines they recommend to import only modules. [1]: "Do not import objects, only modules". [1] https://docs.openstack.org/hacking/0.10.3/ Change-Id: Ia9132cfbe3997d9fc54cf4864f42a7cdec055641 - Merge "Enable sha384/sha512 auth algorithms for *Swan drivers" - Add Hunt Xu to list of driver maintainers I would like to add Hunt Xu as a maintainer for libreswan driver as He is currently focusing and active on it. Change-Id: I6f6ae79a79f8f426226af900027c8038ca537213 - Merge "Update reno for stable/queens" - Merge "API tempest: get tenant id from client" - Merge "Drop the root requirement for LibreSwanDriver" - Merge "Remove ikelifetime in %default section of ipsec.conf templates" - Add IPv6 VPNaaS scenario tests Change-Id: Ic96f31dce81ecf4db2daa2e9cba649eaff8f81d6 Closes-Bug: #1692130 - Update reno for stable/queens Change-Id: I91cf8893ab0d2439b4eee3e7b72cfb772b2becda - Merge "Zuul: Remove project name" - Enable sha384/sha512 auth algorithms for *Swan drivers Closes-Bug: #1747654 Change-Id: I84d3ac6379bc0b6d483b557f38f3a462f0f1f1bf - Remove ikelifetime in %default section of ipsec.conf templates Nowadays connections always override the ikelifetime setting in their own sections. The setting in the %default section is no longer used. So this commit removes that from the templates as a cleanup. TrivialFix Change-Id: I49961cd53d12792486d0b8b0c45ab0e3c6c72484 - Zuul: Remove project name Zuul no longer requires the project-name for in-repo configuration. Omitting it makes forking or renaming projects easier. Change-Id: I90fbc26626e172dd29e8c3812e45bbaf9151f196 - API tempest: get tenant id from client Change-Id: I55b02b9f0c6804ce28a07c5288190e50e836ca97 - Merge "Remove the redundant word" - Merge "Updated from global requirements" - Zuul: Remove project name Zuul no longer requires the project-name for in-repo configuration. Omitting it makes forking or renaming projects easier. Change-Id: I3407a96dd5f4fce5683386ffd9784118a2d7e6aa - Updated from global requirements Change-Id: If46cb3d425fee2da95100103e58cbbc11a674916 - Remove the redundant word Removed redundant 'the' in test_vpnaas.py Change-Id: I61fb0425a9d8aaf9d7d85820052be8145706ed20 - Drop the root requirement for LibreSwanDriver Change-Id: I880ef5dad6723de06da5dd8a424f7158d65b5a35 Closes-Bug: #1644517 - Switch to neutron-tempest-plugin for tempest tests * https://review.openstack.org/519310 syncs the code from neutron project to neutron-tempest-plugin repo and it is better to depend on new one inorder to avoid the breakage. Change-Id: Icf3ec7c186f45e86d602d5bc8754b91ddab47732 - Merge "[doc] Add testing VPNaaS with devstack" - Merge "Move legacy jobs to project" - Merge "devstack: adapt to lib/neutron" - Merge "[doc] add more info to contributor guide" - [doc] Add testing VPNaaS with devstack This patch adds doc for how to test VPNaaS with devstack in order to help developers, operators and users easy to understand VPNaaS as fast as possible. This patch addresses the gap and improves docs as discussed in Boston summit. The content of this patch is basic inheritted from wiki page [1] [1] https://wiki.openstack.org/wiki/Neutron/VPNaaS/HowToInstall Change-Id: I8465cb90645af0fc3ea8cda554b0477b15f01fbe Related-bug: 1692131 - devstack: adapt to lib/neutron Change-Id: I9b2780e1e1e6dc8b733348e0aad2024304e11ebb - [doc] add more info to contributor guide This patch adds more info to contributor guide to let new contributors know how to contribute to vpnaas actively. Change-Id: I62baaa077393009d8fa23d36413a3059bc2c4a0c Related-bug: 1692131 - Move legacy jobs to project This patch implements first step in zuulv3 migration guide [1]: Move jobs to neutron-vpnaas repo [1] https://docs.openstack.org/infra/manual/zuulv3.html#legacy-job-migration-details Needed-By: I6feeb874eedbb7e7278923c4f6f4e526f1def24c Needed-By: I9ee5756c15ab6c8a393dd77680d6277fb35a7ee2 Co-Authored-By: Cao Xuan Hoang <hoangcx@vn.fujitsu.com> Change-Id: If66846aa7bfc2afd42b9ffd077cdb179563f5995
This commit is contained in:
parent
199881c473
commit
9030ef654b
@ -1 +1 @@
|
||||
Subproject commit 5f029ab4ae998448734227a9178f105386af1c15
|
||||
Subproject commit 824f4858c0367698be5f97c336ece0ba18ce6f65
|
Loading…
Reference in New Issue
Block a user