diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-08 22:00:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-08 22:00:12 +0000 |
| commit | 62c187f5c7c9c43b01cc8ea2773393d2c899ea1d (patch) | |
| tree | edf37c4b075c1ae57ff6a26b369225304f173f24 | |
| parent | e999631422a9431735853485ad522b4b153496ac (diff) | |
| parent | 9ffa0ac14e3e49c572b4f984620a0e16c15918d9 (diff) | |
| download | python-neutronclient-62c187f5c7c9c43b01cc8ea2773393d2c899ea1d.tar.gz | |
Merge "Allow 4byte ASNs in dynamic routing client"victoria-em7.2.1
| -rw-r--r-- | neutronclient/neutron/v2_0/bgp/speaker.py | 2 | ||||
| -rw-r--r-- | neutronclient/osc/v2/dynamic_routing/constants.py | 2 | ||||
| -rw-r--r-- | neutronclient/tests/unit/bgp/test_cli20_peer.py | 5 | ||||
| -rw-r--r-- | neutronclient/tests/unit/bgp/test_cli20_speaker.py | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/neutronclient/neutron/v2_0/bgp/speaker.py b/neutronclient/neutron/v2_0/bgp/speaker.py index c6533e2..6bdbd86 100644 --- a/neutronclient/neutron/v2_0/bgp/speaker.py +++ b/neutronclient/neutron/v2_0/bgp/speaker.py @@ -22,7 +22,7 @@ from neutronclient.neutron.v2_0.bgp import peer as bgp_peer # Allowed BGP Autonomous number range MIN_AS_NUM = 1 -MAX_AS_NUM = 65535 +MAX_AS_NUM = 4294967295 def get_network_id(client, id_or_name): diff --git a/neutronclient/osc/v2/dynamic_routing/constants.py b/neutronclient/osc/v2/dynamic_routing/constants.py index 0dd16b1..8885b42 100644 --- a/neutronclient/osc/v2/dynamic_routing/constants.py +++ b/neutronclient/osc/v2/dynamic_routing/constants.py @@ -15,4 +15,4 @@ BGP_SPEAKER = 'bgp_speaker' BGP_PEERS = 'bgp_peers' BGP_PEER = 'bgp_peer' MIN_AS_NUM = 1 -MAX_AS_NUM = 65535 +MAX_AS_NUM = 4294967295 diff --git a/neutronclient/tests/unit/bgp/test_cli20_peer.py b/neutronclient/tests/unit/bgp/test_cli20_peer.py index c89c21b..998b0d5 100644 --- a/neutronclient/tests/unit/bgp/test_cli20_peer.py +++ b/neutronclient/tests/unit/bgp/test_cli20_peer.py @@ -96,7 +96,7 @@ class CLITestV20BGPPeerJSON(test_cli20.CLITestV20Base): name = 'my-name' my_id = 'my-id' peerip = '1.1.1.1' - remote_asnum = '65536' + remote_asnum = '4294967296' args = [name, '--peer-ip', peerip, '--remote-as', remote_asnum, ] @@ -107,7 +107,8 @@ class CLITestV20BGPPeerJSON(test_cli20.CLITestV20Base): self._test_create_resource, resource, cmd, name, my_id, args, position_names, position_values) - self.assertEqual('remote-as "65536" should be an integer [%s:%s].' % + self.assertEqual('remote-as "4294967296" should be an ' + 'integer [%s:%s].' % (bgp_speaker.MIN_AS_NUM, bgp_speaker.MAX_AS_NUM), str(exc)) diff --git a/neutronclient/tests/unit/bgp/test_cli20_speaker.py b/neutronclient/tests/unit/bgp/test_cli20_speaker.py index 0d9cc60..5621576 100644 --- a/neutronclient/tests/unit/bgp/test_cli20_speaker.py +++ b/neutronclient/tests/unit/bgp/test_cli20_speaker.py @@ -108,7 +108,7 @@ class CLITestV20BGPSpeakerJSON(test_cli20.CLITestV20Base): None) name = 'my-name' my_id = 'my-id' - local_asnum = '65536' + local_asnum = '4294967296' args = [name, '--local-as', local_asnum] position_names = ['name', 'local_as', ] @@ -117,7 +117,8 @@ class CLITestV20BGPSpeakerJSON(test_cli20.CLITestV20Base): self._test_create_resource, resource, cmd, name, my_id, args, position_names, position_values) - self.assertEqual('local-as "65536" should be an integer [%s:%s].' % + self.assertEqual('local-as "4294967296" should be an ' + 'integer [%s:%s].' % (bgp_speaker.MIN_AS_NUM, bgp_speaker.MAX_AS_NUM), str(exc)) |