Skip to content

OCPBUGS-49650: fix topology crash #96

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 3, 2025
Merged

OCPBUGS-49650: fix topology crash #96

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
12 changes: 6 additions & 6 deletions src/views/hostnetworkconfiguration/utils/LevelsLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class LevelsLayout extends BaseLayout implements Layout {

// Method to sort nodes by their level
private sortNodesByLevel(nodes: LayoutNode[]): LayoutNode[] {
return nodes.sort((a, b) => {
return (nodes || []).sort((a, b) => {
const aLevel = a?.element?.getData()?.level;
const bLevel = b?.element?.getData()?.level;
return aLevel - bLevel;
Expand All @@ -30,7 +30,7 @@ export class LevelsLayout extends BaseLayout implements Layout {
// Method to count nodes per level
private countNodesPerLevel(nodes: LayoutNode[]): { [level: number]: number } {
const levelCounts: { [level: number]: number } = {};
nodes.forEach((node) => {
(nodes || []).forEach((node) => {
const level = node?.element?.getData()?.level;
if (!levelCounts[level]) {
levelCounts[level] = 0;
Expand Down Expand Up @@ -65,7 +65,7 @@ export class LevelsLayout extends BaseLayout implements Layout {
let padX = 0;
let padY = 0;

groupNodes.forEach((node) => {
(groupNodes || []).forEach((node) => {
if (padX < node.width) {
padX = node.width;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ export class LevelsLayout extends BaseLayout implements Layout {
let maxX = x;
let maxY = y;

sortedNodes.forEach((node) => {
(sortedNodes || []).forEach((node) => {
if (node?.element?.getData()?.level !== currentLevel) {
// Move to the next level when the level changes
currentLevel = node?.element?.getData()?.level;
Expand Down Expand Up @@ -143,7 +143,7 @@ export class LevelsLayout extends BaseLayout implements Layout {
// Method to group nodes by their parent group
private groupNodesByParent(): { [groupId: string]: LayoutNode[] } {
const groups: { [groupId: string]: LayoutNode[] } = {};
this.nodes.forEach((node) => {
(this.nodes || []).forEach((node) => {
const parentGroupId = node.element.getParent()?.getId();
if (parentGroupId) {
if (!groups[parentGroupId]) {
Expand All @@ -160,7 +160,7 @@ export class LevelsLayout extends BaseLayout implements Layout {
maxGroupWidth: number;
maxGroupHeight: number;
} {
const groupDimensions = Object.keys(groups).map((key) =>
const groupDimensions = Object.keys(groups || {}).map((key) =>
this.positionGroupNodes(groups[key], 0, 0),
);
const maxGroupWidth = Math.max(...groupDimensions.map((dim) => dim.width));
Expand Down
4 changes: 2 additions & 2 deletions src/views/hostnetworkconfiguration/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ const getNNCEConfiguredInterfaces = (

const configured: NodeNetworkConfigurationInterface[] = [];

const desiredInterfaces = enhancement.status.desiredState.interfaces;
const currentInterfaces = state.status.currentState.interfaces;
const desiredInterfaces = enhancement.status.desiredState.interfaces || [];
const currentInterfaces = state.status.currentState.interfaces || [];

desiredInterfaces.forEach((desiredIface) => {
if (findInterfaceByName(currentInterfaces, desiredIface.name)) {
Expand Down