@@ -110,14 +110,14 @@ We humans are able to compute that diff with ease because we visually identify b
110
110
# items of A to be added in B (to be computed by diffplus)
111
111
112
112
+ no ip domain lookup
113
- interface FastEthernet0/0
113
+ interface FastEthernet0/0
114
114
+ no shutdown
115
115
+ interface FastEthernet0/0.10
116
116
+ description LAN
117
117
+ encapsulation dot1Q 10
118
118
+ ip address 192.168.1.254 255.255.255.0
119
- router bgp 64512
120
- address-family ipv4
119
+ router bgp 64512
120
+ address-family ipv4
121
121
+ neighbor 172.16.0.1 allowas-in 1
122
122
+ network 192.168.1.0 mask 255.255.255.0
123
123
```
@@ -343,14 +343,14 @@ Output:
343
343
# items of A to be added in B (computed by IncrementalDiff)
344
344
345
345
+ no ip domain lookup
346
- interface FastEthernet0/0
346
+ interface FastEthernet0/0
347
347
+ no shutdown
348
348
+ interface FastEthernet0/0.10
349
349
+ description LAN
350
350
+ encapsulation dot1Q 10
351
351
+ ip address 192.168.1.254 255.255.255.0
352
- router bgp 64512
353
- address-family ipv4
352
+ router bgp 64512
353
+ address-family ipv4
354
354
+ neighbor 172.16.0.1 allowas-in 1
355
355
+ network 192.168.1.0 mask 255.255.255.0
356
356
```
@@ -377,24 +377,24 @@ Output:
377
377
``` diff
378
378
# items of A merged into B (computed by IncrementalDiff)
379
379
380
- hostname R1
381
- interface FastEthernet0/0
382
- description LAN
383
- no ip address
384
- shutdown
385
- duplex auto
386
- speed auto
380
+ hostname R1
381
+ interface FastEthernet0/0
382
+ description LAN
383
+ no ip address
384
+ shutdown
385
+ duplex auto
386
+ speed auto
387
387
+ no shutdown
388
- router bgp 64512
389
- neighbor 172.16.0.1 remote-as 100
390
- address-family ipv4
391
- neighbor 172.16.0.1 activate
392
- neighbor 172.16.0.1 prefix-list IN in
393
- neighbor 172.16.0.1 prefix-list OUT out
388
+ router bgp 64512
389
+ neighbor 172.16.0.1 remote-as 100
390
+ address-family ipv4
391
+ neighbor 172.16.0.1 activate
392
+ neighbor 172.16.0.1 prefix-list IN in
393
+ neighbor 172.16.0.1 prefix-list OUT out
394
394
+ neighbor 172.16.0.1 allowas-in 1
395
395
+ network 192.168.1.0 mask 255.255.255.0
396
- ip prefix-list IN seq 5 permit 192.168.2.0/24
397
- ip prefix-list OUT seq 5 permit 192.168.1.0/24
396
+ ip prefix-list IN seq 5 permit 192.168.2.0/24
397
+ ip prefix-list OUT seq 5 permit 192.168.1.0/24
398
398
+ no ip domain lookup
399
399
+ interface FastEthernet0/0.10
400
400
+ description LAN
@@ -432,11 +432,11 @@ Output:
432
432
<tr >
433
433
<td >
434
434
435
- ![ ] ( https://user-images.githubusercontent.com/4362224/222919743-cdec455b-d971-4d6a-82d3-9df749c80784 .png )
435
+ ![ ] ( https://user-images.githubusercontent.com/4362224/224107670-49fa98e3-dbb7-441f-824d-d8d9b62bf79e .png )
436
436
</td >
437
437
<td >
438
438
439
- ![ ] ( https://user-images.githubusercontent.com/4362224/222919787-b0dc8f31-0cef-404d-8db7-c6111ff67af2 .png )
439
+ ![ ] ( https://user-images.githubusercontent.com/4362224/224107684-33f0d0b7-38c0-4e54-9a16-8f3a7b836c63 .png )
440
440
</td >
441
441
</tr >
442
442
</tbody >
@@ -532,15 +532,15 @@ Let's take an example in a network context:
532
532
``` diff
533
533
# computed by diffplus (only additions)
534
534
535
- interface FastEthernet0/0
536
- description Some interface
535
+ interface FastEthernet0/0
536
+ description Some interface
537
537
+ no description
538
- ip address 10.0.0.1 255.255.255.0
539
- ip address 10.0.0.2 255.255.255.0 secondary
540
- ip address 10.0.0.3 255.255.255.0 secondary
538
+ ip address 10.0.0.1 255.255.255.0
539
+ ip address 10.0.0.2 255.255.255.0 secondary
540
+ ip address 10.0.0.3 255.255.255.0 secondary
541
541
+ no ip address 10.0.0.3 255.255.255.0 secondary
542
542
+ ip address 10.0.0.4 255.255.255.0 secondary
543
- speed 10
543
+ speed 10
544
544
+ speed 100
545
545
```
546
546
@@ -549,10 +549,10 @@ Some of the new items will negate or change existing ones. So we'd like a smarte
549
549
``` diff
550
550
# NOT computed by diffplus (additions and deletions)
551
551
552
- interface FastEthernet0/0
552
+ interface FastEthernet0/0
553
553
- description Some interface
554
- ip address 10.0.0.1 255.255.255.0
555
- ip address 10.0.0.2 255.255.255.0 secondary
554
+ ip address 10.0.0.1 255.255.255.0
555
+ ip address 10.0.0.2 255.255.255.0 secondary
556
556
- ip address 10.0.0.3 255.255.255.0 secondary
557
557
+ ip address 10.0.0.4 255.255.255.0 secondary
558
558
- speed 10
0 commit comments