Hello Dan Kenigsberg, Edward Haas,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/60873
to review the following change.
Change subject: ovs: add bridges_by_sb property to OvsInfo
......................................................................
ovs: add bridges_by_sb property to OvsInfo
This will be used in a following ovs setupNetworks patch.
Change-Id: I885c15da0478c3bf8f726bdd335f55afd6c4caf6
Bug-Url: https://bugzilla.redhat.com/1195208
Signed-off-by: Petr Horáček <[email protected]>
Reviewed-on: https://gerrit.ovirt.org/58159
Reviewed-by: Edward Haas <[email protected]>
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <[email protected]>
---
M lib/vdsm/network/ovs/info.py
M tests/network/ovs_info_test.py
2 files changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/60873/1
diff --git a/lib/vdsm/network/ovs/info.py b/lib/vdsm/network/ovs/info.py
index 6104290..eaed0fb 100644
--- a/lib/vdsm/network/ovs/info.py
+++ b/lib/vdsm/network/ovs/info.py
@@ -76,11 +76,25 @@
self._bridges = {bridge['name']: self._bridge_attr(bridge)
for bridge in ovs_db.bridges}
+ self._bridges_by_sb = self._get_bridges_by_sb()
@property
def bridges(self):
return self._bridges
+ @property
+ def bridges_by_sb(self):
+ return self._bridges_by_sb
+
+ def _get_bridges_by_sb(self):
+ bridges_by_sb = {}
+
+ for bridge, attrs in six.iteritems(self.bridges):
+ bridge_sb = self.southbound_port(attrs['ports'])
+ bridges_by_sb[bridge_sb] = bridge
+
+ return bridges_by_sb
+
def _bridge_attr(self, bridge_entry):
stp = bridge_entry['stp_enable']
ports = [self._ports_uuids[uuid] for uuid in bridge_entry['ports']]
diff --git a/tests/network/ovs_info_test.py b/tests/network/ovs_info_test.py
index e68c7be..b534574 100644
--- a/tests/network/ovs_info_test.py
+++ b/tests/network/ovs_info_test.py
@@ -122,9 +122,17 @@
}
}
}
- obtained_bridges = info.OvsInfo().bridges
+ expected_bridges_by_sb = {TEST_BOND: TEST_BRIDGE}
+
+ ovs_info = info.OvsInfo()
+
+ obtained_bridges = ovs_info.bridges
self.assertEqual(obtained_bridges, expected_bridges)
+ obtained_bridges_by_sb = ovs_info.bridges_by_sb
+ self.assertEqual(
+ obtained_bridges_by_sb, expected_bridges_by_sb)
+
class MockedOvsInfo(info.OvsInfo):
def __init__(self):
--
To view, visit https://gerrit.ovirt.org/60873
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I885c15da0478c3bf8f726bdd335f55afd6c4caf6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Edward Haas <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/admin/lists/[email protected]
