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

[BF] bird2: Remove stray whitespace when no MD5 #852

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BF] bird2: Remove stray whitespace when no MD5 #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ protocol bgp pb_as42_vli3_ipv4 {
import where f_import_as42();
export none;
};

password "mcWsqMdzGwTKt67g";
}

Expand Down Expand Up @@ -583,7 +582,6 @@ protocol bgp pb_as112_vli4_ipv4 {
import where f_import_as112();
export none;
};

password "w83fmGpRDtaKomQo";
}

Expand Down Expand Up @@ -729,7 +727,6 @@ protocol bgp pb_as1213_vli1_ipv4 {
import where f_import_as1213();
export none;
};

password "N7rX2SdfbRsyBLTm";
}

Expand Down
2 changes: 0 additions & 2 deletions data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ protocol bgp pb_as1213_vli1_ipv6 {
import where f_import_as1213();
export none;
};

password "N7rX2SdfbRsyBLTm";
}

Expand Down Expand Up @@ -488,7 +487,6 @@ protocol bgp pb_as25441_vli6_ipv6 {
import where f_import_as25441();
export none;
};

password "X8Ks9QnbER9cyzU3";
}

Expand Down
6 changes: 3 additions & 3 deletions resources/views/api/v4/router/collector/bird2/neighbors.foil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ function f_import_as<?= $int['autsys'] ?>()
import where f_import_as<?= $int['autsys'] ?>();
export none;
};

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
password "<?= $int['bgpmd5secret'] ?>";
<?php endif; ?>
}

<?php endforeach; ?>
5 changes: 3 additions & 2 deletions resources/views/api/v4/router/server/bird2/neighbors.foil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,9 @@
table t_<?= $int['fvliid'] ?>_as<?= $int['autsys'] ?>;
export filter f_export_as<?= $int['autsys'] ?>;
};
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
password "<?= $int['bgpmd5secret'] ?>";
<?php endif; ?>
}

<?php endforeach; ?>
Expand Down