Merge pull request #7785 from volta-networks/fix_show_pce_confidence_for_pr

Add level of confidence to show pcep-session
This commit is contained in:
Donald Sharp 2021-01-09 15:36:56 -05:00 committed by GitHub
commit 75d7b33688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -1156,14 +1156,17 @@ static void print_pcep_session(struct vty *vty, struct pce_opts *pce_opts,
} }
if (pcc_info->is_best_multi_pce) { if (pcc_info->is_best_multi_pce) {
vty_out(vty, " MultiPCE precedence %d, best candidate\n", vty_out(vty, " Precedence %d, best candidate\n",
((pcc_info->precedence > 0) ? pcc_info->precedence ((pcc_info->precedence > 0) ? pcc_info->precedence
: DEFAULT_PCE_PRECEDENCE)); : DEFAULT_PCE_PRECEDENCE));
} else { } else {
vty_out(vty, " MultiPCE precedence %d\n", vty_out(vty, " Precedence %d\n",
((pcc_info->precedence > 0) ? pcc_info->precedence ((pcc_info->precedence > 0) ? pcc_info->precedence
: DEFAULT_PCE_PRECEDENCE)); : DEFAULT_PCE_PRECEDENCE));
} }
vty_out(vty, " Confidence %s\n",
((pcc_info->previous_best) ? "low"
: "normal"));
/* PCEPlib pcep session values, get a thread safe copy of the counters /* PCEPlib pcep session values, get a thread safe copy of the counters
*/ */

View File

@ -99,6 +99,7 @@ struct pcep_pcc_info {
uint32_t next_reqid; uint32_t next_reqid;
uint32_t next_plspid; uint32_t next_plspid;
bool is_best_multi_pce; bool is_best_multi_pce;
bool previous_best;
uint8_t precedence; uint8_t precedence;
}; };

View File

@ -1101,6 +1101,7 @@ void pcep_pcc_copy_pcc_info(struct pcc_state **pcc,
pcc_info->status = pcc_state->status; pcc_info->status = pcc_state->status;
pcc_info->pcc_id = pcc_state->id; pcc_info->pcc_id = pcc_state->id;
pcc_info->is_best_multi_pce = pcc_state->is_best; pcc_info->is_best_multi_pce = pcc_state->is_best;
pcc_info->previous_best = pcc_state->previous_best;
pcc_info->precedence = pcc_info->precedence =
pcc_state->pce_opts ? pcc_state->pce_opts->precedence : 0; pcc_state->pce_opts ? pcc_state->pce_opts->precedence : 0;
memcpy(&pcc_info->pcc_addr, &pcc_state->pcc_addr_tr, memcpy(&pcc_info->pcc_addr, &pcc_state->pcc_addr_tr,