Updated lldpRemManAddrTable to use all the management ip address associated with interface. #201
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -494,10 +494,9 @@ def __init__(self): | |
| # establish connection to application database. | ||
| Namespace.connect_all_dbs(self.db_conn, mibs.APPL_DB) | ||
| self.if_range = [] | ||
| self.if_with_mgmt_ips = set() | ||
| self.oid_name_map = {} | ||
| self.mgmt_oid_name_map = {} | ||
| self.pubsub = [None] * len(self.db_conn) | ||
|
|
||
| def update_rem_if_mgmt(self, if_oid, if_name): | ||
|
|
@@ -511,28 +510,26 @@ def update_rem_if_mgmt(self, if_oid, if_name): | |
| if len(mgmt_ip_str) == 0: | ||
| # the peer advertise an emtpy mgmt address | ||
| return | ||
| for mgmt_ip in set(mgmt_ip_str.split(',')): | ||
| time_mark = int(lldp_kvs['lldp_rem_time_mark']) | ||
| remote_index = int(lldp_kvs['lldp_rem_index']) | ||
| subtype = self.get_subtype(mgmt_ip) | ||
| if subtype == ManAddrConst.man_addr_subtype_ipv4: | ||
| addr_subtype_sub_oid = 4 | ||
| mgmt_ip_sub_oid = (addr_subtype_sub_oid, *[int(i) for i in mgmt_ip.split('.')]) | ||
| elif subtype == ManAddrConst.man_addr_subtype_ipv6: | ||
| addr_subtype_sub_oid = 6 | ||
| mgmt_ip_sub_oid = (addr_subtype_sub_oid, *[int(i, 16) if i else 0 for i in mgmt_ip.split(':')]) | ||
|
There was a problem hiding this comment.
Seems you are trying to parse ipv6 but this is not working for general cases #Closed There was a problem hiding this comment. @qiluo-msft Updated to use |
||
| else: | ||
| logger.warning("Invalid management IP {}".format(mgmt_ip)) | ||
| continue | ||
| self.if_range.append((time_mark, | ||
| if_oid, | ||
| remote_index, | ||
| subtype, | ||
| *mgmt_ip_sub_oid)) | ||
| self.if_with_mgmt_ips.add(if_name) | ||
|
|
||
| except (KeyError, AttributeError) as e: | ||
| logger.warning("Error updating remote mgmt addr: {}".format(e)) | ||
| return | ||
|
|
@@ -577,7 +574,7 @@ def reinit_data(self): | |
| Namespace.connect_all_dbs(self.db_conn, mibs.APPL_DB) | ||
|
|
||
| self.if_range = [] | ||
| self.if_with_mgmt_ips = set() | ||
| for if_oid, if_name in self.oid_name_map.items(): | ||
| self.update_rem_if_mgmt(if_oid, if_name) | ||
|
|
||
|
|
@@ -594,7 +591,7 @@ def lookup(self, sub_id, callable): | |
| if sub_id not in self.oid_name_map: | ||
| return None | ||
| if_name = self.oid_name_map[sub_id] | ||
| if if_name not in self.if_with_mgmt_ips: | ||
| # no data for this interface | ||
| return None | ||
| return callable(sub_id, if_name) | ||
|
|
@@ -623,15 +620,6 @@ def get_subtype(self, ip_str): | |
| logger.warning("Invalid mgmt IP {}".format(ip_str)) | ||
| return None | ||
|
|
||
|
|
||
| @staticmethod | ||
| def man_addr_if_subtype(sub_id, _): return ManAddrConst.man_addr_if_subtype | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,11 +124,36 @@ def test_subtype_lldp_loc_man_addr_table(self): | |
|
|
||
|
|
||
| def test_subtype_lldp_rem_man_addr_table(self): | ||
| # Verfiy both valid ipv4 and ipv6 address exit | ||
| for entry in range(3, 6): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 4, 2, 1, entry)] | ||
| ret = mib_entry(sub_id=(1, 1)) | ||
| self.assertIsNotNone(ret) | ||
| print(ret) | ||
| # Verfiy both valid ipv4 and invalid ipv6 address exit | ||
| for entry in range(3, 6): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 4, 2, 1, entry)] | ||
| ret = mib_entry(sub_id=(1, 5)) | ||
| self.assertIsNotNone(ret) | ||
|
There was a problem hiding this comment. How is the return value checked if both ipv4 and ipv6 exits? There was a problem hiding this comment. intention of testcase is to check when both ip address are present we can get the data from first key (can be either v4 or v6) for given interface. Basically to check we are not ignoring management ip information in such case. There was a problem hiding this comment. @SuvarnaMeenakshi Updated test case for this. Fixed |
||
| print(ret) | ||
| # Verfiy only valid ipv4 address exit | ||
| for entry in range(3, 6): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 4, 2, 1, entry)] | ||
| ret = mib_entry(sub_id=(1, 9)) | ||
| self.assertIsNotNone(ret) | ||
| print(ret) | ||
| # Verfiy only valid ipv6 address exit | ||
| for entry in range(3, 6): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 4, 2, 1, entry)] | ||
| ret = mib_entry(sub_id=(1, 13)) | ||
| self.assertIsNotNone(ret) | ||
| print(ret) | ||
| # Verfiy no mgmt address exit | ||
| for entry in range(3, 6): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 4, 2, 1, entry)] | ||
| ret = mib_entry(sub_id=(1, 17)) | ||
| self.assertIsNone(ret) | ||
| print(ret) | ||
|
|
||
| def test_local_port_identification(self): | ||
| mib_entry = self.lut[(1, 0, 8802, 1, 1, 2, 1, 3, 7, 1, 3)] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the benefit of
set? Just use splited list? #ClosedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is just extra check in case if we have same ip's
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please be aware that different ipv6 strings could be the same ipv6 address.
In reply to: 593529516 [](ancestors = 593529516)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@qiluo-msft Updated.