Skip to content

Synchronise victoria with upstream #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Synchronise victoria with upstream #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c1a1c7
Fix command syntax in Juniper driver
cityofships Apr 15, 2021
380c65c
Merge branch 'stackhpc/victoria' into upstream/victoria-2022-06-27
markgoddard Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions networking_generic_switch/tests/unit/netmiko/test_juniper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def test_add_network_with_trunk_ports(self, mock_exec):
switch.add_network(33, '0ae071f5-5be9-43e4-80ea-e41fefe85b21')
mock_exec.assert_called_with(
['set vlans 0ae071f55be943e480eae41fefe85b21 vlan-id 33',
'set interface port1 unit 0 family ethernet-switching '
'set interfaces port1 unit 0 family ethernet-switching '
'vlan members 33',
'set interface port2 unit 0 family ethernet-switching '
'set interfaces port2 unit 0 family ethernet-switching '
'vlan members 33'])

@mock.patch('networking_generic_switch.devices.netmiko_devices.'
Expand All @@ -65,9 +65,9 @@ def test_del_network_with_trunk_ports(self, mock_exec):
switch = self._make_switch_device({'ngs_trunk_ports': 'port1,port2'})
switch.del_network(33, '0ae071f55be943e480eae41fefe85b21')
mock_exec.assert_called_with(
['delete interface port1 unit 0 family ethernet-switching '
['delete interfaces port1 unit 0 family ethernet-switching '
'vlan members 33',
'delete interface port2 unit 0 family ethernet-switching '
'delete interfaces port2 unit 0 family ethernet-switching '
'vlan members 33',
'delete vlans 0ae071f55be943e480eae41fefe85b21'])

Expand All @@ -76,9 +76,9 @@ def test_del_network_with_trunk_ports(self, mock_exec):
def test_plug_port_to_network(self, mock_exec):
self.switch.plug_port_to_network(3333, 33)
mock_exec.assert_called_with(
['delete interface 3333 unit 0 family ethernet-switching '
['delete interfaces 3333 unit 0 family ethernet-switching '
'vlan members',
'set interface 3333 unit 0 family ethernet-switching '
'set interfaces 3333 unit 0 family ethernet-switching '
'vlan members 33'])

@mock.patch('networking_generic_switch.devices.netmiko_devices.'
Expand All @@ -88,18 +88,18 @@ def test_plug_port_to_network_disable_inactive(self, m_sctd):
{'ngs_disable_inactive_ports': 'true'})
switch.plug_port_to_network(3333, 33)
m_sctd.assert_called_with(
['delete interface 3333 disable',
'delete interface 3333 unit 0 family ethernet-switching '
['delete interfaces 3333 disable',
'delete interfaces 3333 unit 0 family ethernet-switching '
'vlan members',
'set interface 3333 unit 0 family ethernet-switching '
'set interfaces 3333 unit 0 family ethernet-switching '
'vlan members 33'])

@mock.patch('networking_generic_switch.devices.netmiko_devices.'
'NetmikoSwitch.send_commands_to_device')
def test_delete_port(self, mock_exec):
self.switch.delete_port(3333, 33)
mock_exec.assert_called_with(
['delete interface 3333 unit 0 family ethernet-switching '
['delete interfaces 3333 unit 0 family ethernet-switching '
'vlan members'])

@mock.patch('networking_generic_switch.devices.netmiko_devices.'
Expand All @@ -109,9 +109,9 @@ def test_delete_port_disable_inactive(self, m_sctd):
{'ngs_disable_inactive_ports': 'true'})
switch.delete_port(3333, 33)
m_sctd.assert_called_with(
['delete interface 3333 unit 0 family ethernet-switching '
['delete interfaces 3333 unit 0 family ethernet-switching '
'vlan members',
'set interface 3333 disable'])
'set interfaces 3333 disable'])

def test_send_config_set(self):
connect_mock = mock.MagicMock(netmiko.base_connection.BaseConnection)
Expand Down Expand Up @@ -324,10 +324,10 @@ def test__format_commands(self):
port=3333,
segmentation_id=33)
self.assertEqual(cmd_set,
['delete interface 3333 unit 0 '
['delete interfaces 3333 unit 0 '
'family ethernet-switching '
'vlan members',
'set interface 3333 unit 0 '
'set interfaces 3333 unit 0 '
'family ethernet-switching '
'vlan members 33'])

Expand All @@ -336,7 +336,7 @@ def test__format_commands(self):
port=3333,
segmentation_id=33)
self.assertEqual(cmd_set,
['delete interface 3333 unit 0 '
['delete interfaces 3333 unit 0 '
'family ethernet-switching '
'vlan members'])

Expand All @@ -345,7 +345,7 @@ def test__format_commands(self):
port=3333,
segmentation_id=33)
self.assertEqual(cmd_set,
['set interface 3333 unit 0 '
['set interfaces 3333 unit 0 '
'family ethernet-switching '
'vlan members 33'])

Expand All @@ -354,6 +354,6 @@ def test__format_commands(self):
port=3333,
segmentation_id=33)
self.assertEqual(cmd_set,
['delete interface 3333 unit 0 '
['delete interfaces 3333 unit 0 '
'family ethernet-switching '
'vlan members 33'])
6 changes: 6 additions & 0 deletions releasenotes/notes/fix-junos-syntax-27bb18dc737d776b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Fixed command syntax of Juniper devices. This makes the driver
incompatible with some very old Junos OS releases that are EOL
and no longer supported by the vendor.