Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

isisd: Show correct level information for show isis interface detail json #17732

Merged
merged 1 commit into from
Jan 3, 2025
Merged

isisd: Show correct level information for show isis interface detail json #17732

merged 1 commit into from
Jan 3, 2025
+16 −21

Conversation

ton31337
Copy link
Member

@ton31337 ton31337 commented Dec 30, 2024 •
edited
Loading

Closes #17721

@ton31337
isisd: Show correct level information for `show isis interface detail…
360a0d6 
… json`

Having this configuration:

```
!
interface r1-eth0
 ip address 10.0.0.1/30
 ip router isis 1
 isis priority 44 level-1
 isis priority 88 level-2
 isis csnp-interval 90 level-1
 isis csnp-interval 99 level-2
 isis psnp-interval 70 level-1
 isis psnp-interval 50 level-2
 isis hello-interval level-1 120
 isis hello-interval level-2 150

!
interface r1-eth1
 ip address 10.0.0.10/30
 ip router isis 1
!
interface lo
 ip address 192.0.2.1/32
 ip router isis 1
 isis passive
!
router isis 1
net 49.0000.0000.0000.0001.00
 metric-style wide
```

Produces:

```
{
 "areas":[
   {
     "area":"1",
     "circuits":[
       {
         "circuit":2,
         "interface":{
           "name":"r1-eth0",
           "state":"Up",
           "is-passive":"active",
           "circuit-id":"0x2",
           "type":"lan",
           "level":"L1L2",
           "snpa":"6e28.9c92.da5e",
           "levels":[
             {
               "level":"L1",
               "metric":10,
               "active-neighbors":1,
               "hello-interval":120,
               "holddown":{
                 "count":10,
                 "pad":"yes"
               },
               "cnsp-interval":90,
               "psnp-interval":70,
               "lan":{
                 "priority":44,
                 "is-dis":"no"
               }
             },
             {
               "level":"L2",
               "metric":10,
               "active-neighbors":1,
               "hello-interval":120, <<<<<<<<<<<<<<<<<<
               "holddown":{
                 "count":10,
                 "pad":"yes"
               },
               "cnsp-interval":90, <<<<<<<<<<<<<<<<<<
               "psnp-interval":70, <<<<<<<<<<<<<<<<<<
               "lan":{
                 "priority":44, <<<<<<<<<<<<<<<<<<
                 "is-dis":"no"
               }
             }
           ],
...
```

Fixes: 9fee4d4 ("isisd: Add json to show isis interface command.")

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
@ton31337 ton31337 mentioned this pull request Dec 30, 2024
Closed
2 tasks
@ton31337
Copy link
Member Author

@Mergifyio backport stable/10.2 stable/10.1 stable/10.0 stable/9.1 stable/9.0 stable/8.5 stable/8.4

@mergify Mergify
Copy link

mergify bot commented Dec 30, 2024 •
edited
Loading

backport stable/10.2 stable/10.1 stable/10.0 stable/9.1 stable/9.0 stable/8.5 stable/8.4

✅ Backports have been created

@mjstapp mjstapp merged commit 385a219 into FRRouting:master Jan 3, 2025
16 checks passed
This was referenced Jan 3, 2025
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@ton31337 ton31337 deleted the fix/isisd_detail_json branch January 3, 2025 12:51
mjstapp added a commit that referenced this pull request Jan 3, 2025
@mjstapp
Merge pull request #17757 from FRRouting/mergify/bp/stable/10.0/pr-17732
ae3d2f0 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
mjstapp added a commit that referenced this pull request Jan 3, 2025
@mjstapp
Merge pull request #17755 from FRRouting/mergify/bp/stable/10.2/pr-17732
50e6e7d 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
ton31337 added a commit that referenced this pull request Jan 3, 2025
@ton31337
Merge pull request #17760 from FRRouting/mergify/bp/stable/8.5/pr-17732
a1c6086 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
ton31337 added a commit that referenced this pull request Jan 3, 2025
@ton31337
Merge pull request #17761 from FRRouting/mergify/bp/stable/8.4/pr-17732
65614ea 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
ton31337 added a commit that referenced this pull request Jan 4, 2025
@ton31337
Merge pull request #17756 from FRRouting/mergify/bp/stable/10.1/pr-17732
22769ad 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
ton31337 added a commit that referenced this pull request Jan 4, 2025
@ton31337
Merge pull request #17758 from FRRouting/mergify/bp/stable/9.1/pr-17732
f915053 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
ton31337 added a commit that referenced this pull request Jan 4, 2025
@ton31337
Merge pull request #17759 from FRRouting/mergify/bp/stable/9.0/pr-17732
795bea4 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjstapp mjstapp mjstapp approved these changes

Assignees
No one assigned
Labels
backport bugfix isis master size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

IS-IS: the difference between "show isis interface detail json" and "show isis interface detail".
2 participants
@ton31337 @mjstapp