Commit Graph

86 Commits

Author SHA1 Message Date
Thomas Goirand b70478452d Use importlib not imp
The imp module is gone from Python 3.12, but importlib has
the same reload() function. Let's use it.

Change-Id: Iab4381e743a443285a86941de195189e26e9e0fc
2023-12-12 16:59:30 +01:00
Zuul a6f1d2b96e Merge "Avoid RuntimeError caused by iteration over sys.modules" 2023-11-13 19:06:55 +00:00
Takashi Kajinami c57f2cc6ff Avoid RuntimeError caused by iteration over sys.modules
As is described in the doc[1], we should not iterate over sys.modules
directly because sys.modules can be changed during iterations.

[1] https://docs.python.org/3/library/sys.html#sys.modules

Change-Id: Iad4e19744ee78996728e44f3a1446c1c282ad437
2023-11-10 18:29:08 +09:00
Takashi Kajinami 15d41af6d7 Fix python shebang
The current shebang requires /usr/bin/python which is not available in
Ubuntu Jammy by default.

Change-Id: I3765d2b73843db0137fe79065ab4051e1e52eab3
2023-10-17 16:03:54 +00:00
Stephen Finucane c18ac550d5 Remove duplicate requirements files
Change-Id: I26fcfc6742a4434eafb12f96a634c71bc0cf72d6
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
2023-09-04 15:52:12 +01:00
Brian Haley 8cd03eb2e4 Remove superfluous sudo
In a recent test run for neutron-dynamic-routing I noticed
the command 'sudo sudo docker images'. Remove the superfluous
'sudo' as it is unnecessary.

Trivialfix

Change-Id: I89479892b2a8f887fecce597d288898707ae4127
2023-08-17 09:58:56 +00:00
Dr. Jens Harbott 17570b4c24 Fix quagga container
The quagga container failed to work because docker now seems to reset
the permissions of the /run folder on starting. The solution is to
set the permissions in the startup script.

Use the opportunity to switch to a newer base container. We cannot go
beyond ubuntu:20.04 though, since after that quagga has been replaced by
frr, which will require some deeper changes.

Change-Id: I6bbd88c0d66bffa0a310364e26cd73286524fee3
2023-08-17 11:09:35 +02:00
Rodolfo Alonso Hernandez e28853266b Update nx_actions.py, fixing a typo on example
Backport from https://github.com/faucetsdn/ryu/commit/5b1343

Story: #2009283
Task: #46864
Change-Id: Ia2199a2d379baa65733c476e9652999cc3d37344
2022-11-17 12:22:44 +00:00
Benjamin Beasley fc75bd821b Add msgpack 1.0 support
This project now only supports msgpack versions >= 1.0.0

Backport from https://github.com/faucetsdn/ryu/commit/aa10ca

Story: #2009283
Task: #46863
Change-Id: I3bfd54851717238330af82655361b7b631079f59
2022-11-17 12:22:32 +00:00
Benjamin Beasley f10f2b2852 Enforce new msgpack format (use_bin_type=True)
Enforce new msgpack format (use_bin_type=True) in
ryu.services.protocols.bgp.net_ctrl.RpcSession; this option
is already used in ryu.lib.rpc.MessageEncoder

Backport from https://github.com/faucetsdn/ryu/commit/8990ed

Story: #2009283
Task: #46863
Change-Id: I2f04d74f85ade54e0826494f078c88a2a3e24a55
2022-11-13 18:47:22 +01:00
niuke 6a7cb9c994 remove unicode prefix from code
Change-Id: I5fe3d44c24cf32a70bf398b6e2cd4ac15076fae4
2022-08-11 19:42:20 +08:00
Rodolfo Alonso Hernandez abb436deb3 Remove "six" library
This patch also removes some unneeded imported libraries.

Story: #2010182
Task: #45863
Change-Id: Ife9d349eb9c92f2a39719e76e82fe20c010fe230
2022-07-26 14:53:03 +00:00
Rodolfo Alonso Hernandez 2495ebdff9 Remove "nose" library
The library "nose", used for unit testing, is removed. This library
is in maintenance mode and is not compatible with Python3.10 [1].

Now all checks are implemented using "unittest". The methods are not
loaded in realtime into the test case execution; instead of this, this
patch uses "testscenarios.WithScenarios", that allows to execute the
same test with different defined scenarios.

NOTE: "BgpSpeakerTestBase" tests are disable temporarily. It is needed
to configure "docker" in the system in order to execute them.

[1]https://nose.readthedocs.io/en/latest/

Story: #2010063
Task: #45519

Change-Id: I92e9547a26e9bec6c2a9a011c49a70b82dbb373e
2022-07-21 16:02:02 +02:00
Zuul 90328068b8 Merge "Remove "distutils" dependency" 2022-05-18 14:47:25 +00:00
Rodolfo Alonso Hernandez f66debc7ec Remove "distutils" dependency
The library "distutils" will be deprecated in Python 3.10:
https://peps.python.org/pep-0632/

Story: #45393
Change-Id: I7cf48a5e56c28d6161c6dfef162871cedb1f1c46
2022-05-13 03:35:21 +00:00
Hervé Beraud 88683465f5 Fix typo
Change-Id: I3f87e723a94df97912ac310618971f590636bd67
2022-05-12 16:21:57 +02:00
elajkat 58a3939239 Avoid missing key 'password' for neighbor_add
Change-Id: Iffa8f8da017364a3b471475a4123356e2030dba5
Story: 2009779
Task: 44260
2022-01-12 19:10:02 +01:00
elajkat 974ccdabd2 Avoid logging MD5 password for BGP add neighbor
Change-Id: I12e9b23749e40f56e947377409ff2882adc25205
Story: 2009779
Task: 44260
2022-01-11 17:50:39 +01:00
Zuul 13d07f6278 Merge "add ofproto 1.3 coverage, check key-error and attribute-error." 2021-11-04 11:28:19 +00:00
Slawek Kaplonski b5104258bd Add support for the MTU ND option.
Backport from https://github.com/faucetsdn/ryu/commit/ca597a5e

Story: #2009283
Task: #43616
Change-Id: I6d670bce7f5cbca7ae31178cb0beb5c891a72405
2021-11-02 20:45:03 +00:00
Slawek Kaplonski c21b44f706 Allow user to set cipher list.
Backport from https://github.com/faucetsdn/ryu/commit/7559befd

Story: #2009283
Task: #43615
Change-Id: I76efb04c418210691ceb114b8bde5ec4d02aea83
2021-11-02 20:43:06 +00:00
Slawek Kaplonski a6af993002 Bugfix now multiple switches can connect with TLS
This fixes a bug in RYU StreamServer where SSLContext was modified for
each connection. Now the SSLContext of the server socket is modified
only once in __init__

Backport from https://github.com/faucetsdn/ryu/commit/906b3a3e

Story: #2009283
Task: #43562
Change-Id: Ie7c2f4e202edff1f4286de31cf8314fdbec85f2d
2021-11-02 21:41:59 +01:00
Zuul dfcee319cb Merge "Msgpack version upgrade to 1.0.0" 2021-11-02 17:50:16 +00:00
Zuul ef85028392 Merge "Choose the highest TLS version" 2021-11-02 11:49:43 +00:00
Manu B 4468605ff6 Msgpack version upgrade to 1.0.0
* Encoding parameter is removed. UTF-8 is used always. [0]
* strict_map_key is changed to False to keep the older behaviour.
  Default is changed to True in 1.0.0

Signed-off-by: Manu B <manu.b@est.tech>

[0]: https://github.com/msgpack/msgpack-python#major-breaking-changes-in-msgpack-10

Change-Id: I0e5902c4b13ab11f45f44bb9d9d9540d9630c9bb
2021-10-28 09:41:10 +00:00
Zuul dd9a42764f Merge "updated jsonrpc.Session call to have correct arguments for latest version of ovs" 2021-10-27 10:36:35 +00:00
Zuul 5538d178c3 Merge "Update bridge.py" 2021-10-27 10:27:11 +00:00
Zuul 743c22e4a4 Merge "Add support for revised RFC8227 withdraw labels" 2021-10-27 10:27:03 +00:00
Slawek Kaplonski 8d98fb2011 Choose the highest TLS version
Please note that this is a stop-gap measure.  Also add a basic SSL
server test.

Co-authored-by: alex <atoptsoglou@suse.com>
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>

Backport from https://github.com/faucetsdn/ryu/commit/01a09a0e

Story: #2009283
Task: #43614
Change-Id: I6c1ca6bb847581050faccb52570bfdfb2d26b448
2021-10-27 09:26:25 +00:00
Zuul 8ae08171d9 Merge "nx_action_encap and nx_action_decap classes are defined" 2021-10-27 09:08:28 +00:00
Scott f2d4ddd2c9 updated jsonrpc.Session call to have correct arguments for latest version of ovs
Signed-off-by: Scott <sdyear@gmail.com>

Story: #2009283
Task: #43560
Change-Id: I01678b6ef9b012c1eb8a3f83009c691103cacccd
2021-10-27 07:57:15 +00:00
MrCocoaCat beefdb8e90 Update bridge.py
Sometimes you don't know 'datapath_id', you need to initialize the class with 'br_name'

Backported from
c565ec6f77

Story: #2009283
Task: #43558
Change-Id: I51ccf9c91e2126b2229b86a7afa763499ccab586
2021-10-27 07:56:57 +00:00
Benjamin Villain via Ryu-devel 9aae6f022e Add support for revised RFC8227 withdraw labels
This commit fixes a parsing error when a BGP update contains a "withdraw label"
equal to 0x000000 instead of 0x8000000 as stated in RFC 3107. This commits
treats both labels as "withdraw label"

Signed-off-by: Benjamin Villain <villainb@amazon.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

Backported from
62b4c07464

Story: #2009283
Task: #43557
Change-Id: I53f1e09af54c12b1724ab8e93373885c0ab11bab
2021-10-27 07:56:41 +00:00
Zuul a552a9c99c Merge "mrtlib: Define JSON representation types" 2021-10-25 13:38:09 +00:00
Zuul ffb0332c35 Merge "Fix convertion of ipv4 to string on i386 and arch" 2021-10-25 13:38:00 +00:00
Zuul fcfafb17f6 Merge "fix NXActionRegLoad action_to_str" 2021-10-22 13:49:49 +00:00
Ozgur Yurekten dc13916b4b nx_action_encap and nx_action_decap classes are defined
Signed-off-by: Ozgur Yurekten <ozgur.yurekten@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

Backported from
550e890671

Story: #2009283
Task: #43555
Change-Id: If894fdd6462a1bdd3d4fc369468819ea244592cd
2021-10-22 12:37:29 +00:00
Zuul a75164f22e Merge "Fix bug where path.source is set to VRF_TABLE (in vrf.py)" 2021-10-15 11:01:34 +00:00
Zuul 4d2b4219f0 Merge "Use constants imported from API base" 2021-10-14 19:53:23 +00:00
Zuul a0ea1bead4 Merge "Patch to add 2 parameters for controlling specific fields in EVPN rou…" 2021-10-14 19:53:16 +00:00
Zuul 09064909ee Merge "Fix major bug in child thread cleanup logic" 2021-10-14 19:27:51 +00:00
Zuul 10263f9d67 Merge "Add support for Adj-RIB-Out (draft-ietf-grow-bmp-adj-rib-out-03)" 2021-10-14 18:31:50 +00:00
Zuul c20c5881eb Merge " mrtlib: Support RFC8050" 2021-10-14 18:20:40 +00:00
Zuul 02b69abeb4 Merge "Enabled point-to-multipoint links in topology discovery." 2021-10-14 18:09:42 +00:00
Josh Bailey f1735c323e add ofproto 1.3 coverage, check key-error and attribute-error.
Conflicts: setup.cfg
Backport from https://github.com/faucetsdn/ryu/commit/98d4913
Story: #2009283
Task: #43617

Change-Id: I583942287b91606642c6df4f448ebe749d391f3c
2021-10-14 13:26:22 +02:00
Slawek Kaplonski 0f5a8bcf32 Fix major bug in child thread cleanup logic
Without this fix, one cannot restart BGP Speaker instances

Backport of https://github.com/faucetsdn/ryu/commit/ac849e3d

Story: #2009283
Task: #43622
Change-Id: I1595d73bfec09b8a3de7ed52213534f0f6e44de5
2021-10-13 16:45:53 +02:00
Slawek Kaplonski 84e8fa6e44 Fix bug where path.source is set to VRF_TABLE (in vrf.py)
Backport of https://github.com/faucetsdn/ryu/commit/df421911

Story: #2009283
Task: #43621
Change-Id: Iba5b2e176b3bdbedcb20f7ce9c584e77dda60206
2021-10-13 16:44:21 +02:00
Slawek Kaplonski 21f18b5061 Use constants imported from API base
Backport of https://github.com/faucetsdn/ryu/commit/a09cae5a

Story: #2009283
Task: #43620
Change-Id: I5c59a12678e407fd922608e5ee382dfb87209a67
2021-10-13 16:42:49 +02:00
Zuul 4a00532389 Merge "mrtlib: Missing subclass for SUBTYPE_RIB_*_MULTICAST" 2021-10-13 14:41:49 +00:00
Slawek Kaplonski 7a5513c806 Patch to add 2 parameters for controlling specific fields in EVPN rou…
…te advertisements:

tunnel_endpoint_ip: To allow for VTEP IPs other than the implicit local
router ID
mac_mobility: To insert an extended community with a sequence number
for managing MAC Mobility

Backport of https://github.com/faucetsdn/ryu/commit/5722c7c8

Story: #2009283
Task: #43619
Change-Id: I3c72752ee0894e8e1f3f9b50bbc7e8033e7efa4d
2021-10-13 16:38:49 +02:00