From 27c192c61e4ab79524933897581996284b60052a Mon Sep 17 00:00:00 2001 From: Volodymyr Samotiy Date: Mon, 11 Jul 2016 14:42:10 +0300 Subject: [PATCH] Change naming on some of the API functions for consistency Change-Id: I5937850a5b562e6ddb8741f2b8b9a6720da0dd83 --- broadview_lib/pt/packet_trace_ecmp_resolution.py | 2 +- broadview_lib/pt/packet_trace_lag_resolution.py | 5 ++++- broadview_lib/pt/packet_trace_profile.py | 4 ++-- broadview_lib/pt/pt_parser.py | 8 ++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/broadview_lib/pt/packet_trace_ecmp_resolution.py b/broadview_lib/pt/packet_trace_ecmp_resolution.py index 3f14ee8..32364e1 100644 --- a/broadview_lib/pt/packet_trace_ecmp_resolution.py +++ b/broadview_lib/pt/packet_trace_ecmp_resolution.py @@ -22,7 +22,7 @@ class PacketTraceECMPResolution(): def getPort(self): return self._port - def getECMPLINKResolution(self): + def getECMPLinkResolution(self): return self._ecmplinkresolution def __repr__(self): diff --git a/broadview_lib/pt/packet_trace_lag_resolution.py b/broadview_lib/pt/packet_trace_lag_resolution.py index ca5bbb7..3a76960 100644 --- a/broadview_lib/pt/packet_trace_lag_resolution.py +++ b/broadview_lib/pt/packet_trace_lag_resolution.py @@ -22,9 +22,12 @@ class PacketTraceLAGResolution(): def getPort(self): return self._port - def getLAGLINKResolution(self): + def getLAGLinkResolution(self): return self._laglinkresolution + def __repr__(self): + return "packet-trace-lag-resolution" + def parse(self, data, port=None): if port == None: ret = False diff --git a/broadview_lib/pt/packet_trace_profile.py b/broadview_lib/pt/packet_trace_profile.py index f9d4c0e..2278fe5 100644 --- a/broadview_lib/pt/packet_trace_profile.py +++ b/broadview_lib/pt/packet_trace_profile.py @@ -28,10 +28,10 @@ class PacketTraceProfileEntry(): def getPort(self): return self._port - def getLAGLINKResolution(self): + def getLAGLinkResolution(self): return self._laglinkresolution - def getECMPLINKResolution(self): + def getECMPLinkResolution(self): return self._ecmplinkresolution class PacketTraceProfile(): diff --git a/broadview_lib/pt/pt_parser.py b/broadview_lib/pt/pt_parser.py index 226e142..082589b 100644 --- a/broadview_lib/pt/pt_parser.py +++ b/broadview_lib/pt/pt_parser.py @@ -1734,7 +1734,7 @@ class TestParser(unittest.TestCase): val = rep.getPacketTraceLAGResolution() for m in val: - llr = m.getLAGLINKResolution() + llr = m.getLAGLinkResolution() if m.getPort() == "1": self.assertEqual(llr.getLAGID(), "1") @@ -1801,7 +1801,7 @@ class TestParser(unittest.TestCase): val = rep.getPacketTraceECMPResolution() for m in val: - llr = m.getECMPLINKResolution() + llr = m.getECMPLinkResolution() if m.getPort() == "1": for x in llr: if x.getECMPGroupID() == "200256": @@ -2124,7 +2124,7 @@ class TestParser(unittest.TestCase): for m in n: realm = m.getRealm() if realm == "lag-link-resolution": - llr = m.getLAGLINKResolution() + llr = m.getLAGLinkResolution() if m.getPort() == "1": self.assertEqual(llr.getLAGID(), "2") @@ -2150,7 +2150,7 @@ class TestParser(unittest.TestCase): else: self.assertEqual("unexpected port {}".format(llr.getPort()), True) elif realm == "ecmp-link-resolution": - elr = m.getECMPLINKResolution() + elr = m.getECMPLinkResolution() if m.getPort() == "1": for x in elr: