zebra: Add encap type when building packet for FPM (backport #14675) #14755

Execution finished at ci11-FRR-PULLREQ3-TOPO7U18ARM8-583 after 3206.178 seconds

Bamboo CI Link
Execution details at https://ci1.netdef.org/browse/FRR-PULLREQ3-TOPO7U18ARM8-583

Execution Summary

Failures
❌ isis_te_topo1.test_isis_te_topo1 test_step1(133.729 s)

E AssertionError: "r1" TED JSON output mismatches the expected result
assert Generated JSON diff error report:

  > $->ted->edges: d2 has the following element at index 4 which is not present in d1: 
  
  	{
  	    "edge-id": "2001:db8:5::3:4",
  	    "status": "Sync",
  	    "origin": "ISIS_L2",
  	    "advertised-router": "0000.0000.0004",
  	    "local-vertex-id": 4,
  	    "remote-vertex-id": 3,
  	    "metric": 10,
  	    "edge-attributes": {
  	        "local-address-v6": "2001:db8:5::3:4",
  	        "remote-address-v6": "2001:db8:5::4:3",
  	        "max-link-bandwidth": 1250000,
  	        "max-resv-link-bandwidth": 1250000,
  	        "unreserved-bandwidth": [
  	            {
  	                "class-type-0": 1250000
  	            },
  	            {
  	                "class-type-1": 1250000
  	            },
  	            {
  	                "class-type-2": 1250000
  	            },
  	            {
  	                "class-type-3": 1250000
  	            },
  	            {
  	                "class-type-4": 1250000
  	            },
  	            {
  	                "class-type-5": 1250000
  	            },
  	            {
  	                "class-type-6": 1250000
  	            },
  	            {
  	                "class-type-7": 1250000
  	            }
  	        ]
  	    },
  	    "segment-routing": [
  	        {
  	            "adj-sid": 5001,
  	            "flags": "0xb0",
  	            "weight": 0
  	        }
  	    ]
  	}
  
  	Closest match in d1 is at index 8 with the following errors: 
  
  	> $->ted->edges[8]->segment-routing: d2 has the following element at index 0 which is not present in d1: 
  	
  		{
  		    "adj-sid": 5001,
  		    "flags": "0xb0",
  		    "weight": 0
  		}
  	
  		Closest match in d1 is at index 0 with the following errors: 
  	
  		> $->ted->edges[8]->segment-routing[0]->adj-sid: d1 has element with value '5000' but in d2 it has value '5001'
  	
  
  > $->ted->edges: d2 has the following element at index 13 which is not present in d1: 
  
  	{
  	    "edge-id": "10.0.4.4",
  	    "status": "Sync",
  	    "origin": "ISIS_L2",
  	    "advertised-router": "0000.0000.0004",
  	    "local-vertex-id": 4,
  	    "remote-vertex-id": 2,
  	    "metric": 10,
  	    "edge-attributes": {
  	        "local-address": "10.0.4.4",
  	        "remote-address": "10.0.4.2",
  	        "max-link-bandwidth": 1250000,
  	        "max-resv-link-bandwidth": 1250000,
  	        "unreserved-bandwidth": [
  	            {
  	                "class-type-0": 1250000
  	            },
  	            {
  	                "class-type-1": 1250000
  	            },
  	            {
  	                "class-type-2": 1250000
  	            },
  	            {
  	                "class-type-3": 1250000
  	            },
  	            {
  	                "class-type-4": 1250000
  	            },
  	            {
  	                "class-type-5": 1250000
  	            },
  	            {
  	                "class-type-6": 1250000
  	            },
  	            {
  	                "class-type-7": 1250000
  	            }
  	        ]
  	    },
  	    "segment-routing": [
  	        {
  	            "adj-sid": 5000,
  	            "flags": "0x30",
  	            "weight": 0
  	        }
  	    ]
  	}
  
  	Closest match in d1 is at index 0 with the following errors: 
  
  	> $->ted->edges[0]->segment-routing: d2 has the following element at index 0 which is not present in d1: 
  	
  		{
  		    "adj-sid": 5000,
  		    "flags": "0x30",
  		    "weight": 0
  		}
  	
  		Closest match in d1 is at index 0 with the following errors: 
  	
  		> $->ted->edges[0]->segment-routing[0]->adj-sid: d1 has element with value '5001' but in d2 it has value '5000'

❓ isis_te_topo1.test_isis_te_topo1 test_step2(0.002 s)