diff --git a/napalm/junos/utils/junos_views.yml b/napalm/junos/utils/junos_views.yml index b29ff54d4..177dd331b 100644 --- a/napalm/junos/utils/junos_views.yml +++ b/napalm/junos/utils/junos_views.yml @@ -748,5 +748,5 @@ junos_nw_instances_table: junos_nw_instances_view: fields: instance_type: {instance-type: unicode} - interfaces: {interface/name: unicode} + interfaces: {interface/name | bridge-domains/domain/interface/name: unicode} route_distinguisher: {route-distinguisher/rd-type: unicode} diff --git a/test/junos/mocked_data/test_get_network_instances/bridge/_configuration__routing_instances__instance____routing_instances___configuration_.xml b/test/junos/mocked_data/test_get_network_instances/bridge/_configuration__routing_instances__instance____routing_instances___configuration_.xml new file mode 100644 index 000000000..2dc5def98 --- /dev/null +++ b/test/junos/mocked_data/test_get_network_instances/bridge/_configuration__routing_instances__instance____routing_instances___configuration_.xml @@ -0,0 +1,21 @@ + + + + vswitch1 + A virtual switch instance + virtual-switch + + + MY-BD + bridge + none + + + ge-0/0/4.0 + + irb.1 + + + + + diff --git a/test/junos/mocked_data/test_get_network_instances/bridge/expected_result.json b/test/junos/mocked_data/test_get_network_instances/bridge/expected_result.json new file mode 100644 index 000000000..289efba6e --- /dev/null +++ b/test/junos/mocked_data/test_get_network_instances/bridge/expected_result.json @@ -0,0 +1 @@ +{"default":{"interfaces":{"interface":{"cbp0":{},"demux0":{},"dsc":{},"em0":{},"em1":{},"em2":{},"em3":{},"em4":{},"em5":{},"em6":{},"em7":{},"ge-0/0/0":{},"ge-0/0/0.0":{},"ge-0/0/1":{},"ge-0/0/1.32767":{},"ge-0/0/2":{},"ge-0/0/2.32767":{},"ge-0/0/3":{},"ge-0/0/4":{},"ge-0/0/5":{},"ge-0/0/6":{},"ge-0/0/7":{},"ge-0/0/8":{},"ge-0/0/9":{},"gre":{},"ipip":{},"irb":{},"lc-0/0/0":{},"lc-0/0/0.32769":{},"lo0":{},"lo0.16384":{},"lo0.16385":{},"lo0.32768":{},"lsi":{},"mtun":{},"pfe-0/0/0":{},"pfe-0/0/0.16383":{},"pfh-0/0/0":{},"pfh-0/0/0.16383":{},"pimd":{},"pime":{},"pip0":{},"pp0":{},"tap":{},"vtep":{}}},"name":"default","state":{"route_distinguisher":""},"type":"DEFAULT_INSTANCE"},"vswitch1":{"interfaces":{"interface":{"ge-0/0/4.0":{}}},"name":"vswitch1","state":{"route_distinguisher":""},"type":"virtual-switch"}} diff --git a/test/junos/mocked_data/test_get_network_instances/bridge/get-interface-information.xml b/test/junos/mocked_data/test_get_network_instances/bridge/get-interface-information.xml new file mode 100644 index 000000000..a4f675a8e --- /dev/null +++ b/test/junos/mocked_data/test_get_network_instances/bridge/get-interface-information.xml @@ -0,0 +1,1526 @@ + + + ge-0/0/0 + up + up + 137 + 513 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:00 + 00:05:86:71:22:00 + 2019-08-07 14:27:58 UTC (1d 03:14 ago) + + 14392 + 29 + 5752 + 6 + + + + + + + + + + + + Disabled + + ge-0/0/0.0 + 360 + 523 + + + + 0x4004000 + + ENET2 + + 244941 + 26916 + + + + + inet + 1500 + + + + 0x0 + + + + + + + + 192.168.2/24 + 192.168.2.14 + 192.168.2.255 + + + + multiservice + Unlimited + + + 0x0 + + + + + + lc-0/0/0 + up + up + 134 + 507 + 800mbps + + + + + + + + + + + + Never + + 0 + 0 + + + lc-0/0/0.32769 + 357 + 508 + ENET2 + 0 + + 0 + 0 + + + + + vpls + Unlimited + + + 0x4000000 + + + + + + pfe-0/0/0 + up + up + 136 + 511 + 800mbps + + + + + + + + + + + + Never + + 0 + 0 + + + pfe-0/0/0.16383 + 359 + 512 + + + + + ENET2 + 0 + + 0 + 0 + + + + + inet + Unlimited + + + + + + inet6 + Unlimited + + + + + + + + pfh-0/0/0 + up + up + 135 + 509 + 800mbps + + + + + + + + + + + + Never + + 0 + 0 + + + pfh-0/0/0.16383 + 358 + 510 + + + + + ENET2 + 0 + + 0 + 0 + + + + + inet + Unlimited + + + + + + + + ge-0/0/1 + up + up + 138 + 514 + Ethernet + 1518 + 1526 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + 0x2000 + + + 8 + 8 + + 00:05:86:71:22:01 + 00:05:86:71:22:01 + 2019-08-07 14:27:58 UTC (1d 03:14 ago) + + 0 + 0 + 880 + 1 + + + + + + + + + + + + Disabled + + ge-0/0/1.32767 + 371 + 524 + + + + 0x4004000 + + [ 0x0000.0 ] + ENET2 + + 0 + 0 + + + + + multiservice + Unlimited + + + + + + + + ge-0/0/2 + up + up + 139 + 515 + Ethernet + 1518 + 1526 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + 0x2000 + + + 8 + 8 + + 00:05:86:71:22:02 + 00:05:86:71:22:02 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 1032 + 1 + + + + + + + + + + + + Disabled + + ge-0/0/2.32767 + 382 + 525 + + + + 0x4004000 + + [ 0x0000.0 ] + ENET2 + + 0 + 0 + + + + + multiservice + Unlimited + + + + + + + + ge-0/0/3 + up + up + 140 + 516 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:03 + 00:05:86:71:22:03 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + ge-0/0/4 + up + up + 141 + 517 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:04 + 00:05:86:71:22:04 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 1432 + 2 + 0 + 0 + + + + + + + + + + + + Disabled + + ge-0/0/4.0 + 386 + 528 + + + + 0x4004000 + + ENET2 + + 50888 + 0 + + + + + multiservice + Unlimited + + 0x0 + + + + + + ge-0/0/5 + up + up + 142 + 518 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:05 + 00:05:86:71:22:05 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + ge-0/0/6 + up + up + 143 + 519 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:06 + 00:05:86:71:22:06 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + ge-0/0/7 + up + up + 144 + 520 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:07 + 00:05:86:71:22:07 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + ge-0/0/8 + up + up + 145 + 521 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:08 + 00:05:86:71:22:08 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + ge-0/0/9 + up + up + 146 + 522 + Ethernet + 1514 + 1522 + disabled + 1000mbps + none + none + disabled + enabled + Disabled + + + + + + + 0x4000 + + + + + + 8 + 8 + + 00:05:86:71:22:09 + 00:05:86:71:22:09 + 2019-08-07 14:27:59 UTC (1d 03:14 ago) + + 0 + 0 + 0 + 0 + + + + + + + + + + + + Disabled + + + cbp0 + up + up + 129 + 501 + Ethernet + Ethernet + 1514 + + + + + + + + + + Full-Duplex + + + + 00:05:86:71:22:11 + 00:05:86:71:22:11 + Never + + 0 + 0 + + + + demux0 + up + up + 128 + 502 + Software-Pseudo + 9192 + 1 + + + + + + + + + + + Full-Duplex + + + + Never + + 0 + 0 + + + + dsc + up + up + 5 + 5 + Software-Pseudo + Unlimited + + + + + + + + + + + + + + Never + + 0 + 0 + + + + em0 + up + up + 8 + 17 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + Full-Duplex + + + + 52:54:00:08:ee:00 + 52:54:00:08:ee:00 + Never + + 230930 + 0 + + + + em1 + up + up + 9 + 23 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:01 + 52:54:00:a6:40:01 + Never + + 230929 + 0 + + + + em2 + up + up + 64 + 116 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:08:ee:02 + 52:54:00:08:ee:02 + Never + + 245773 + 26925 + + + + em3 + up + up + 65 + 151 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:03 + 52:54:00:a6:40:03 + Never + + 175859 + 157330 + + + + em4 + up + up + 66 + 153 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:04 + 52:54:00:a6:40:04 + Never + + 165019 + 168166 + + + + em5 + up + up + 67 + 155 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:05 + 52:54:00:a6:40:05 + Never + + 230929 + 0 + + + + em6 + up + up + 68 + 157 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:06 + 52:54:00:a6:40:06 + Never + + 230930 + 0 + + + + em7 + up + up + 69 + 159 + Ethernet + Ethernet + 1514 + 1000mbps + + + + + + + + + + + Full-Duplex + + + + 52:54:00:a6:40:07 + 52:54:00:a6:40:07 + Never + + 230930 + 0 + + + + gre + up + up + 10 + 8 + GRE + GRE + Unlimited + Unlimited + + + + + + + + + + + + 0 + 0 + + + + ipip + up + up + 11 + 9 + IPIP + IP-over-IP + Unlimited + Unlimited + + + + + + + + + + + 0 + 0 + + + + irb + up + up + 132 + 503 + Ethernet + Ethernet + 1514 + + + + + + + + + + Full-Duplex + + + + 00:05:86:71:25:f0 + 00:05:86:71:25:f0 + Never + + 0 + 0 + + + + lo0 + up + up + 6 + 6 + Loopback + Unlimited + + + + + + + + + + + + + + Never + + 351 + 351 + + + lo0.16384 + 321 + 21 + + + + Unspecified + + 56 + 56 + + + + + inet + Unlimited + + 0x0 + + + 127.0.0.1 + + + + + lo0.16385 + 322 + 22 + + + + Unspecified + + 295 + 295 + + + + + inet + Unlimited + + 0x0 + + + + + + + 128.0.0.4 + + + + inet6 + Unlimited + + 0x0 + + + + 0x800 + + fe80::200:f:fc00:0 + + + + + + + + + + lo0.32768 + 320 + 250 + Unspecified + + 0 + 0 + + + + + + + lsi + up + up + 4 + 4 + Software-Pseudo + LSI + Unlimited + Unlimited + + + + + + + + + + + + Never + + 0 + 0 + + + + mtun + up + up + 70 + 12 + Multicast-GRE + GRE + Unlimited + Unlimited + + + + + + + + + + + 0 + 0 + + + + pimd + up + up + 26 + 11 + PIMD + PIM-Decapsulator + Unlimited + Unlimited + + + + + + + + + + 0 + 0 + + + + pime + up + up + 25 + 10 + PIME + PIM-Encapsulator + Unlimited + Unlimited + + + + + + + + + + 0 + 0 + + + + pip0 + up + up + 130 + 504 + Ethernet + Ethernet + 1514 + + + + + + + + + + Full-Duplex + + + + 00:05:86:71:25:b0 + 00:05:86:71:25:b0 + Never + + 0 + 0 + + + + pp0 + up + up + 131 + 505 + PPPoE + PPPoE + 1532 + + + + + + + + + + + Full-Duplex + + + + + + tap + up + up + 12 + 7 + Software-Pseudo + Interface-Specific + Unlimited + Unlimited + + + + + + + + + + + + + Never + + 0 + 0 + + + + vtep + up + up + 133 + 506 + Software-Pseudo + VxLAN-Tunnel-Endpoint + 1600 + Unlimited + + + + + + + + + + Full-Duplex + + + + Never + + 0 + 0 + + +