From 048bbdfef4c3bdfc6c73cc67cd7d138aa58a98c2 Mon Sep 17 00:00:00 2001 From: Zhaohui Sun Date: Thu, 5 Dec 2024 09:48:57 +0000 Subject: [PATCH] change unit test case Signed-off-by: Zhaohui Sun --- tests/test_lldpSyncDaemon.py | 77 ++++-------------------------------- 1 file changed, 8 insertions(+), 69 deletions(-) diff --git a/tests/test_lldpSyncDaemon.py b/tests/test_lldpSyncDaemon.py index e51dce6..201a043 100644 --- a/tests/test_lldpSyncDaemon.py +++ b/tests/test_lldpSyncDaemon.py @@ -220,7 +220,7 @@ def test_invalid_chassis_name(self, mock_check_output): self.assertIsNone(result) - def test_new_interface(self): + def test_changed_interface(self): parsed_update = self.daemon.parse_update(self._json) self.daemon.sync(parsed_update) db = create_dbconnector() @@ -230,62 +230,15 @@ def test_new_interface(self): for k in keys: if k != 'LLDP_LOC_CHASSIS': if TABLE_PREFIX + 'eth0' == k or TABLE_PREFIX + 'Ethernet0' == k: - dump[k] = db.get(db.APPL_DB, k, 'lldp_rem_port_desc') - elif TABLE_PREFIX + 'Ethernet100' == k: - dump[k] = db.get(db.APPL_DB, k, 'lldp_rem_port_desc') + dump[k] = db.get(db.APPL_DB, k, 'lldp_rem_time_mark') time.sleep(1) # simulate lldp_rem_time_mark was changed or port description was changed or interface was removed - new_json = self._json.copy() - new_interface = { - "Ethernet1": { - "rid": "1", - "port": { - "id": { - "type": "ifname", - "value": "Ethernet1" - }, - "descr": "Ethernet1, this is a port description", - "mfs": "9236" - }, - "via": "LLDP", - "chassis": { - "switch13": { - "mgmt-ip": "10.3.147.196", - "id": { - "type": "mac", - "value": "00:11:22:33:44:55" - }, - "ttl": "120", - "descr": "Ethernet1, I'm a little teapot.", - "capability": [ - { - "type": "Bridge", - "enabled": True - }, - { - "type": "Router", - "enabled": True - } - ] - } - }, - "age": "0 day, 05:09:05", - "vlan": [ - { - "vlan-id": "101", - "pvid": True - }, - { - "vlan-id": "201", - "value": "vlan201" - } - ] - } - } - new_json['lldp']['interface'].append(new_interface) + changed_json = self._json.copy() + changed_json['lldp']['interface'][0]['eth0']['age'] = '0 day, 05:09:12' + changed_json['lldp']['interface'][1]['Ethernet0']['age'] = '0 day, 05:09:15' - parsed_update = self.daemon.parse_update(new_json) + parsed_update = self.daemon.parse_update(changed_json) self.daemon.sync(parsed_update) keys = db.keys(db.APPL_DB) @@ -293,21 +246,7 @@ def test_new_interface(self): for k in keys: if k != 'LLDP_LOC_CHASSIS': if TABLE_PREFIX + 'eth0' == k or TABLE_PREFIX + 'Ethernet0' == k: - jo[k] = db.get(db.APPL_DB, k, 'lldp_rem_port_desc') - self.assertEqual(jo[k], dump[k]) - elif TABLE_PREFIX + 'Ethernet1' == k: - jo[k] = db.get(db.APPL_DB, k, 'lldp_rem_port_id') - self.assertEqual(jo[k], "Ethernet1") - jo[k] = db.get(db.APPL_DB, k, 'lldp_rem_port_desc') - self.assertEqual(jo[k], "Ethernet1, this is a port description") + jo[k] = db.get(db.APPL_DB, k, 'lldp_rem_time_mark') + self.assertEqual(int(jo[k]), int(dump[k])+10) else: jo[k] = db.get_all(db.APPL_DB, k) - - #Find and remove the Ethernet1 dictionary, restore test data - for interface_dict in new_json["lldp"]["interface"]: - if "Ethernet1" in interface_dict: - new_json["lldp"]["interface"].remove(interface_dict) - break # Exit loop after removing - parsed_update = self.daemon.parse_update(new_json) - self.daemon.sync(parsed_update) - keys = db.keys(db.APPL_DB)