openstack
/
ovsdbapp
Code Issues Proposed changes

Merge "Modify LSP List command to return all ports"

This commit is contained in:
Jenkins 2017-07-13 15:38:48 +00:00 committed by Gerrit Code Review
parent 96225836b0 d70f020c5a
commit a0123e3799
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ovsdbapp/schema/ovn_northbound/api.py
View File

@ -139,8 +139,8 @@ class API(api.API):
"""
@abc.abstractmethod
def lsp_list(self, switch):
"""Get the logical ports on switch
def lsp_list(self, switch=None):
"""Get the logical ports on switch or all ports if switch is None
:param switch: The name or uuid of the switch
:type switch: string or uuid.UUID

9
ovsdbapp/schema/ovn_northbound/commands.py
View File

@ -256,13 +256,16 @@ class LspDelCommand(cmd.BaseCommand):
class LspListCommand(cmd.BaseCommand):
def __init__(self, api, switch):
def __init__(self, api, switch=None):
super(LspListCommand, self).__init__(api)
self.switch = switch
def run_idl(self, txn):
sw = self.api.lookup('Logical_Switch', self.switch)
self.result = [ovs_idl.RowView(r) for r in sw.ports]
if self.switch:
ports = self.api.lookup('Logical_Switch', self.switch).ports
else:
ports = self.api.tables['Logical_Switch_Port'].rows.values()
self.result = [ovs_idl.RowView(r) for r in ports]
class LspGetParentCommand(cmd.BaseCommand):

2
ovsdbapp/schema/ovn_northbound/impl_idl.py
View File

@ -87,7 +87,7 @@ class OvnNbApiIdlImpl(ovs_idl.Backend, api.API):
def lsp_del(self, port, switch=None, if_exists=False):
return cmd.LspDelCommand(self, port, switch, if_exists)
def lsp_list(self, switch):
def lsp_list(self, switch=None):
return cmd.LspListCommand(self, switch)
def lsp_get_parent(self, port):

8
ovsdbapp/tests/functional/schema/ovn_northbound/test_impl_idl.py
View File

@ -290,6 +290,14 @@ class TestLspOps(OvnNorthboundTest):
check_error=True))
self.assertTrue(ports.issubset(port_set))
def test_lsp_list_no_switch(self):
ports = {self._lsp_add(self.switch, None) for _ in range(3)}
other_switch = self.useFixture(fixtures.LogicalSwitchFixture(
name=utils.get_rand_device_name())).obj
other_port = self._lsp_add(other_switch, None)
all_ports = set(self.api.lsp_list().execute(check_error=True))
self.assertTrue((ports.union(set([other_port]))).issubset(all_ports))
def test_lsp_get_parent(self):
ls1 = self._lsp_add(self.switch, None)
ls2 = self._lsp_add(self.switch, None, parent=ls1.name, tag=0)