diff --git a/tests/topotests/bgp_lu_topo1/R1/labelpool.summ.json b/tests/topotests/bgp_lu_topo1/R1/labelpool.summ.json index e2eee513e6..6db8e002f4 100644 --- a/tests/topotests/bgp_lu_topo1/R1/labelpool.summ.json +++ b/tests/topotests/bgp_lu_topo1/R1/labelpool.summ.json @@ -1,8 +1,8 @@ { - "Ledger":506, - "InUse":506, - "Requests":0, - "LabelChunks":3, - "Pending":0, - "Reconnects":0 + "ledger":506, + "inUse":506, + "requests":0, + "labelChunks":3, + "pending":0, + "reconnects":0 } diff --git a/tests/topotests/bgp_lu_topo1/R2/labelpool.summ.json b/tests/topotests/bgp_lu_topo1/R2/labelpool.summ.json index 9c817e8075..9f9e57511c 100644 --- a/tests/topotests/bgp_lu_topo1/R2/labelpool.summ.json +++ b/tests/topotests/bgp_lu_topo1/R2/labelpool.summ.json @@ -1,8 +1,8 @@ { - "Ledger":0, - "InUse":0, - "Requests":0, - "LabelChunks":0, - "Pending":0, - "Reconnects":0 + "ledger":0, + "inUse":0, + "requests":0, + "labelChunks":0, + "pending":0, + "reconnects":0 } diff --git a/tests/topotests/bgp_lu_topo2/R1/labelpool.summ.json b/tests/topotests/bgp_lu_topo2/R1/labelpool.summ.json index 0dc59b58cf..59ecd27f7f 100644 --- a/tests/topotests/bgp_lu_topo2/R1/labelpool.summ.json +++ b/tests/topotests/bgp_lu_topo2/R1/labelpool.summ.json @@ -1,8 +1,8 @@ { - "Ledger":51, - "InUse":51, - "Requests":0, - "LabelChunks":1, - "Pending":0, - "Reconnects":0 + "ledger":51, + "inUse":51, + "requests":0, + "labelChunks":1, + "pending":0, + "reconnects":0 } diff --git a/tests/topotests/bgp_lu_topo2/R2/labelpool.summ.json b/tests/topotests/bgp_lu_topo2/R2/labelpool.summ.json index eb1ae93b6c..2c52192cd6 100644 --- a/tests/topotests/bgp_lu_topo2/R2/labelpool.summ.json +++ b/tests/topotests/bgp_lu_topo2/R2/labelpool.summ.json @@ -1,8 +1,8 @@ { - "Ledger":1, - "InUse":1, - "Requests":0, - "LabelChunks":1, - "Pending":0, - "Reconnects":0 + "ledger":1, + "inUse":1, + "requests":0, + "labelChunks":1, + "pending":0, + "reconnects":0 } diff --git a/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref index 29e9df1089..675af4d788 100644 --- a/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r1-mpw0":{ "peerId":"2.2.2.2", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref index 942ed23a1e..045a8cfb9c 100644 --- a/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r2-mpw0":{ "peerId":"1.1.1.1", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref index 29e9df1089..675af4d788 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r1-mpw0":{ "peerId":"2.2.2.2", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref index 942ed23a1e..045a8cfb9c 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r2-mpw0":{ "peerId":"1.1.1.1", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref index 29e9df1089..675af4d788 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r1-mpw0":{ "peerId":"2.2.2.2", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref index 942ed23a1e..045a8cfb9c 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r2-mpw0":{ "peerId":"1.1.1.1", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref index 29e9df1089..675af4d788 100644 --- a/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r1-mpw0":{ "peerId":"2.2.2.2", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref index 942ed23a1e..045a8cfb9c 100644 --- a/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref +++ b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref @@ -2,7 +2,7 @@ "r2-mpw0":{ "peerId":"1.1.1.1", "vcId":100, - "VpnName":"CUST_A", + "vpnName":"CUST_A", "status":"up" } } diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py index 2be0f5773b..aa7b4a2174 100644 --- a/tests/topotests/lib/bgp.py +++ b/tests/topotests/lib/bgp.py @@ -4277,7 +4277,7 @@ def verify_attributes_for_evpn_routes( for _rd, route_data in evpn_rd_value_json.items(): if route_data["ip"] == route: for rt_data in route_data["paths"]: - if vni_dict[vrf] == rt_data["VNI"]: + if vni_dict[vrf] == rt_data["vni"]: rt_string = rt_data["extendedCommunity"][ "string" ] diff --git a/tests/topotests/lib/ospf.py b/tests/topotests/lib/ospf.py index e7ea7d32ba..59ae1a2559 100644 --- a/tests/topotests/lib/ospf.py +++ b/tests/topotests/lib/ospf.py @@ -1533,11 +1533,11 @@ def verify_ospf_summary(tgen, topo, dut, input_dict, ospf=None, expected=True): ----- input_dict = { "11.0.0.0/8": { - "Summary address": "11.0.0.0/8", - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5 + "summaryAddress": "11.0.0.0/8", + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5 } } result = verify_ospf_summary(tgen, topo, dut, input_dict) @@ -1586,7 +1586,7 @@ def verify_ospf_summary(tgen, topo, dut, input_dict, ospf=None, expected=True): for ospf_summ, summ_data in ospf_summary_data.items(): if ospf_summ not in show_ospf_json: continue - summary = ospf_summary_data[ospf_summ]["Summary address"] + summary = ospf_summary_data[ospf_summ]["summaryAddress"] if summary in show_ospf_json: for summ in summ_data: diff --git a/tests/topotests/lib/pim.py b/tests/topotests/lib/pim.py index 32dda82712..0af1ecf6a0 100644 --- a/tests/topotests/lib/pim.py +++ b/tests/topotests/lib/pim.py @@ -1827,12 +1827,12 @@ def verify_pim_state( else: pim_state_json = show_pim_state_json[grp_addr][src_address] - if pim_state_json["Installed"] == installed_fl: + if pim_state_json["installed"] == installed_fl: logger.info( "[DUT %s]: group %s is installed flag: %s", dut, grp_addr, - pim_state_json["Installed"], + pim_state_json["installed"], ) for interface, data in pim_state_json[iif].items(): if interface != oil: diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py index 5b163d28e4..af21290dd6 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py @@ -308,11 +308,11 @@ def test_ospf_type5_summary_tc43_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -336,11 +336,11 @@ def test_ospf_type5_summary_tc43_p0(request): input_dict = { "11.0.0.0/16": { - "Summary address": "11.0.0.0/16", - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": "11.0.0.0/16", + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -380,11 +380,11 @@ def test_ospf_type5_summary_tc43_p0(request): input_dict = { "11.0.0.0/16": { - "Summary address": "11.0.0.0/24", - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 0, + "summaryAddress": "11.0.0.0/24", + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 0, } } dut = "r0" @@ -556,11 +556,11 @@ def test_ospf_type5_summary_tc48_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -652,11 +652,11 @@ def test_ospf_type5_summary_tc48_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -749,11 +749,11 @@ def test_ospf_type5_summary_tc42_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -820,11 +820,11 @@ def test_ospf_type5_summary_tc42_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -859,11 +859,11 @@ def test_ospf_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -942,11 +942,11 @@ def test_ospf_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -1078,11 +1078,11 @@ def test_ospf_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -1242,11 +1242,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1234, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1234, + "externalRouteCount": 5, } } dut = "r0" @@ -1294,11 +1294,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1234, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1234, + "externalRouteCount": 5, } } dut = "r0" @@ -1335,11 +1335,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1, + "externalRouteCount": 5, } } dut = "r0" @@ -1384,11 +1384,11 @@ def test_ospf_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 4294967295, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 4294967295, + "externalRouteCount": 5, } } dut = "r0" @@ -1441,11 +1441,11 @@ def test_ospf_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 88888, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 88888, + "externalRouteCount": 5, } } dut = "r0" @@ -1673,11 +1673,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1234, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1234, + "externalRouteCount": 5, } } dut = "r0" @@ -1722,11 +1722,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1234, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1234, + "externalRouteCount": 5, } } dut = "r0" @@ -1763,11 +1763,11 @@ def test_ospf_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1, + "externalRouteCount": 5, } } dut = "r0" @@ -1812,11 +1812,11 @@ def test_ospf_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 4294967295, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 4294967295, + "externalRouteCount": 5, } } dut = "r0" @@ -1869,11 +1869,11 @@ def test_ospf_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 88888, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 88888, + "externalRouteCount": 5, } } dut = "r0" @@ -2060,8 +2060,8 @@ def test_ospf_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the " "configured summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "externalRouteCount": 5, } } dut = "r0" @@ -2111,11 +2111,11 @@ def test_ospf_type5_summary_tc46_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 1234, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 1234, + "externalRouteCount": 5, } } dut = "r0" @@ -2167,8 +2167,8 @@ def test_ospf_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the " "configured summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "externalRouteCount": 5, } } dut = "r0" @@ -2229,11 +2229,11 @@ def test_ospf_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2343,11 +2343,11 @@ def test_ospf_type5_summary_tc47_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2440,11 +2440,11 @@ def test_ospf_type5_summary_tc47_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2528,11 +2528,11 @@ def test_ospf_type5_summary_tc47_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2623,11 +2623,11 @@ def test_ospf_type5_summary_tc47_p0(request): input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2791,11 +2791,11 @@ def test_ospf_type5_summary_tc47_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { "12.0.0.0/8": { - "Summary address": "12.0.0.0/8", - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": "12.0.0.0/8", + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -2997,11 +2997,11 @@ def test_ospf_type5_summary_tc51_p2(request): input_dict = { SUMMARY["ipv4"][2]: { - "Summary address": SUMMARY["ipv4"][2], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 0, + "summaryAddress": SUMMARY["ipv4"][2], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 0, } } dut = "r0" @@ -3092,11 +3092,11 @@ def test_ospf_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -3148,11 +3148,11 @@ def test_ospf_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -3212,11 +3212,11 @@ def test_ospf_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -3269,11 +3269,11 @@ def test_ospf_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][0]: { - "Summary address": SUMMARY["ipv4"][0], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][0], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py index b890f9a8aa..9886339796 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py @@ -290,11 +290,11 @@ def test_ospf_type5_summary_tc44_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv4"][3]: { - "Summary address": SUMMARY["ipv4"][3], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][3], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" @@ -342,11 +342,11 @@ def test_ospf_type5_summary_tc44_p0(request): step("Verify that type7 LSAs received from neighbor are not summarised.") input_dict = { "13.0.0.0/8": { - "Summary address": "13.0.0.0/8", - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 0, + "summaryAddress": "13.0.0.0/8", + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 0, } } dut = "r0" @@ -358,11 +358,11 @@ def test_ospf_type5_summary_tc44_p0(request): step("Verify that already originated summary is intact.") input_dict = { SUMMARY["ipv4"][3]: { - "Summary address": SUMMARY["ipv4"][3], - "Metric-type": "E2", - "Metric": 20, - "Tag": 0, - "External route count": 5, + "summaryAddress": SUMMARY["ipv4"][3], + "metricType": "E2", + "metric": 20, + "tag": 0, + "externalRouteCount": 5, } } dut = "r0" diff --git a/tests/topotests/ospf_gr_topo1/rt1/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt1/show_ip_ospf_route.json index 548ca1e2d1..dc19e03b30 100644 --- a/tests/topotests/ospf_gr_topo1/rt1/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt1/show_ip_ospf_route.json @@ -6,7 +6,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -83,7 +83,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt2" + "directlyAttachedTo":"eth-rt2" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json index 4accb2ba4a..3e2aba81e8 100644 --- a/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json @@ -17,7 +17,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -83,7 +83,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt1" + "directlyAttachedTo":"eth-rt1" } ] }, @@ -94,7 +94,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt3" + "directlyAttachedTo":"eth-rt3" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt3/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt3/show_ip_ospf_route.json index b2f37e25a1..c17cf65c8a 100644 --- a/tests/topotests/ospf_gr_topo1/rt3/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt3/show_ip_ospf_route.json @@ -28,7 +28,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -94,7 +94,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt2" + "directlyAttachedTo":"eth-rt2" } ] }, @@ -105,7 +105,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt4" + "directlyAttachedTo":"eth-rt4" } ] }, @@ -116,7 +116,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt6" + "directlyAttachedTo":"eth-rt6" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt4/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt4/show_ip_ospf_route.json index 04e318aef0..74de027860 100644 --- a/tests/topotests/ospf_gr_topo1/rt4/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt4/show_ip_ospf_route.json @@ -39,7 +39,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -105,7 +105,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt3" + "directlyAttachedTo":"eth-rt3" } ] }, @@ -127,7 +127,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt5" + "directlyAttachedTo":"eth-rt5" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt5/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt5/show_ip_ospf_route.json index e7f712ea6b..5ecc222a94 100644 --- a/tests/topotests/ospf_gr_topo1/rt5/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt5/show_ip_ospf_route.json @@ -50,7 +50,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -127,7 +127,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt4" + "directlyAttachedTo":"eth-rt4" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt6/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt6/show_ip_ospf_route.json index d9009724d5..50de685aec 100644 --- a/tests/topotests/ospf_gr_topo1/rt6/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt6/show_ip_ospf_route.json @@ -61,7 +61,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -116,7 +116,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt3" + "directlyAttachedTo":"eth-rt3" } ] }, @@ -138,7 +138,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt7" + "directlyAttachedTo":"eth-rt7" } ] }, diff --git a/tests/topotests/ospf_gr_topo1/rt7/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt7/show_ip_ospf_route.json index 89bad320bb..b8177d1cdc 100644 --- a/tests/topotests/ospf_gr_topo1/rt7/show_ip_ospf_route.json +++ b/tests/topotests/ospf_gr_topo1/rt7/show_ip_ospf_route.json @@ -83,7 +83,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"lo" + "directlyAttachedTo":"lo" } ] }, @@ -149,7 +149,7 @@ "nexthops":[ { "ip":" ", - "directly attached to":"eth-rt6" + "directlyAttachedTo":"eth-rt6" } ] }, diff --git a/tests/topotests/ospf_unnumbered/r1/ospf-route.json b/tests/topotests/ospf_unnumbered/r1/ospf-route.json index 6beb7e9bed..cfd9d85e61 100644 --- a/tests/topotests/ospf_unnumbered/r1/ospf-route.json +++ b/tests/topotests/ospf_unnumbered/r1/ospf-route.json @@ -1 +1 @@ -{ "10.0.1.1\/32": { "routeType": "N", "cost": 10, "area": "0.0.0.0", "nexthops": [ { "ip": " ", "directly attached to": "r1-eth0" } ] }, "10.0.20.1\/32": { "routeType": "N", "cost": 20, "area": "0.0.0.0", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] }, "10.0.255.2": { "routeType": "R ", "cost": 10, "area": "0.0.0.0", "routerType": "asbr", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] } } +{ "10.0.1.1\/32": { "routeType": "N", "cost": 10, "area": "0.0.0.0", "nexthops": [ { "ip": " ", "directlyAttachedTo": "r1-eth0" } ] }, "10.0.20.1\/32": { "routeType": "N", "cost": 20, "area": "0.0.0.0", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] }, "10.0.255.2": { "routeType": "R ", "cost": 10, "area": "0.0.0.0", "routerType": "asbr", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] } } diff --git a/tests/topotests/ospf_unnumbered/r2/ospf-route.json b/tests/topotests/ospf_unnumbered/r2/ospf-route.json index 3cfd255bfd..e56b872411 100644 --- a/tests/topotests/ospf_unnumbered/r2/ospf-route.json +++ b/tests/topotests/ospf_unnumbered/r2/ospf-route.json @@ -1 +1 @@ -{ "10.0.1.1\/32": { "routeType": "N", "cost": 20, "area": "0.0.0.0", "nexthops": [ { "ip": "10.0.3.4", "via": "r2-eth1" } ] }, "10.0.20.1\/32": { "routeType": "N", "cost": 10, "area": "0.0.0.0", "nexthops": [ { "ip": " ", "directly attached to": "r2-eth0" } ] }, "10.0.255.1": { "routeType": "R ", "cost": 10, "area": "0.0.0.0", "routerType": "asbr", "nexthops": [ { "ip": "10.0.3.4", "via": "r2-eth1" } ] } } +{ "10.0.1.1\/32": { "routeType": "N", "cost": 20, "area": "0.0.0.0", "nexthops": [ { "ip": "10.0.3.4", "via": "r2-eth1" } ] }, "10.0.20.1\/32": { "routeType": "N", "cost": 10, "area": "0.0.0.0", "nexthops": [ { "ip": " ", "directlyAttachedTo": "r2-eth0" } ] }, "10.0.255.1": { "routeType": "R ", "cost": 10, "area": "0.0.0.0", "routerType": "asbr", "nexthops": [ { "ip": "10.0.3.4", "via": "r2-eth1" } ] } } diff --git a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py index 1a92c597be..b8fbbb3f63 100644 --- a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py +++ b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py @@ -332,11 +332,11 @@ def test_ospfv3_type5_summary_tc42_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -403,11 +403,11 @@ def test_ospfv3_type5_summary_tc42_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -444,11 +444,11 @@ def test_ospfv3_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -527,11 +527,11 @@ def test_ospfv3_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -665,11 +665,11 @@ def test_ospfv3_type5_summary_tc42_p0(request): input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -822,11 +822,11 @@ def test_ospfv3_type5_summary_tc43_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -857,11 +857,11 @@ def test_ospfv3_type5_summary_tc43_p0(request): input_dict = { "2011::/16": { - "Summary address": "2011::/16", - "Metric-type": "E2", + "summaryAddress": "2011::/16", + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -901,11 +901,11 @@ def test_ospfv3_type5_summary_tc43_p0(request): input_dict = { "2011::/32": { - "Summary address": "2011::/32", - "Metric-type": "E2", + "summaryAddress": "2011::/32", + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 0, + "externalRouteCount": 0, } } dut = "r0" @@ -1084,11 +1084,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1234, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1136,11 +1136,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1234, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1179,11 +1179,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1228,11 +1228,11 @@ def ospfv3_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 4294967295, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1287,11 +1287,11 @@ def ospfv3_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 88888, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1521,11 +1521,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1234, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1570,11 +1570,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1234, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1613,11 +1613,11 @@ def ospfv3_type5_summary_tc45_p0(request): step("Verify that show ip ospf summary should show the summaries with tag.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1662,11 +1662,11 @@ def ospfv3_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 4294967295, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1721,11 +1721,11 @@ def ospfv3_type5_summary_tc45_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 88888, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -1914,8 +1914,8 @@ def test_ospfv3_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the " "configured summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "External route count": 5, + "summaryAddress": SUMMARY["ipv6"][0], + "externalRouteCount": 5, } } dut = "r0" @@ -1965,11 +1965,11 @@ def test_ospfv3_type5_summary_tc46_p0(request): step("show ip ospf summary should not have any summary address.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 1234, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2023,8 +2023,8 @@ def test_ospfv3_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the " "configured summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "External route count": 5, + "summaryAddress": SUMMARY["ipv6"][0], + "externalRouteCount": 5, } } dut = "r0" @@ -2085,11 +2085,11 @@ def test_ospfv3_type5_summary_tc46_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2207,11 +2207,11 @@ def test_ospfv3_type5_summary_tc48_p0(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2304,11 +2304,11 @@ def test_ospfv3_type5_summary_tc48_p0(request): input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2341,11 +2341,11 @@ def test_ospfv3_type5_summary_tc48_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2378,11 +2378,11 @@ def test_ospfv3_type5_summary_tc48_p0(request): ) input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2558,11 +2558,11 @@ def test_ospfv3_type5_summary_tc51_p2(request): input_dict = { SUMMARY["ipv6"][3]: { - "Summary address": SUMMARY["ipv6"][3], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][3], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 0, + "externalRouteCount": 0, } } dut = "r0" @@ -2653,11 +2653,11 @@ def test_ospfv3_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0" @@ -2709,11 +2709,11 @@ def test_ospfv3_type5_summary_tc49_p2(request): step("Verify that show ip ospf summary should show the summaries.") input_dict = { SUMMARY["ipv6"][0]: { - "Summary address": SUMMARY["ipv6"][0], - "Metric-type": "E2", + "summaryAddress": SUMMARY["ipv6"][0], + "metricType": "E2", "Metric": 20, "Tag": 0, - "External route count": 5, + "externalRouteCount": 5, } } dut = "r0"