netifaces provides ipadress along with zoneid

Signed-off-by: Suvarna Meenakshi <[email protected]>

Author: SuvarnaMeenakshi

config/main.py

@@ -3253,7 +3253,7 @@ def add_snmp_agent_address(ctx, agentip, port, vrf):
         ipaddresses = netifaces.ifaddresses(intf)
         if ip_family[ip.version] in ipaddresses:
             for ipaddr in ipaddresses[ip_family[ip.version]]:
-                if agent_ip_addr.lower() == ipaddr['addr'].lower():
+                if agentip.lower() == ipaddr['addr'].lower():
                     found = 1
                     break
         if found == 1:

tests/config_snmp_test.py

@@ -881,7 +881,7 @@ def test_config_snmp_community_add_new_community_with_invalid_type_yang_validati
     @patch('netifaces.ifaddresses', mock.Mock(return_value={2:
                                               [{'addr': '10.1.0.32', 'netmask': '255.255.255.0',
                                                 'broadcast': '10.1.0.255'}],
-                                                10: [{'addr': 'fe80::1', 'netmask': 'ffff:ffff:ffff:ffff::/64'}]}))
+                                                10: [{'addr': 'fe80::1%eth0', 'netmask': 'ffff:ffff:ffff:ffff::/64'}]}))
     @patch('os.system', mock.Mock(return_value=0))
     def test_config_snmpagentaddress_add_linklocal(self):
         db = Db()