[VOL-5488] fetch nni-port ID from voltdevice
Change-Id: I12a81dbb4e45cb4728f49d1d6324afc1ed6260b1
Signed-off-by: Akash Reddy Kankanala <akash.kankanala@radisys.com>
diff --git a/internal/pkg/application/vnets.go b/internal/pkg/application/vnets.go
index 8a23636..e4f96be 100644
--- a/internal/pkg/application/vnets.go
+++ b/internal/pkg/application/vnets.go
@@ -1953,7 +1953,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return nil, err
}
- inport, _ = GetApplication().GetPortID(nniPort)
+ inport, _ = GetApplication().GetDevicePortID(device.Name, nniPort)
}
subFlow.SetInPort(inport)
@@ -2051,7 +2051,7 @@
logger.Errorw(ctx, "Failed to fetch nni port from vpv", log.Fields{"error": err, "device": vpv.Device})
return nil, err
}
- nniport, err := GetApplication().GetPortID(nni)
+ nniport, err := GetApplication().GetDevicePortID(vpv.Device, nni)
if err != nil {
logger.Errorw(ctx, "Failed to fetch port ID for nni", log.Fields{"error": err, "nni": nni})
return nil, err
@@ -2212,7 +2212,7 @@
if err != nil {
return nil, err
}
- nniport, err := GetApplication().GetPortID(nni)
+ nniport, err := GetApplication().GetDevicePortID(vpv.Device, nni)
if err != nil {
return nil, err
}
@@ -2717,7 +2717,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return true
}
- if portID, err := va.GetPortID(nniPort); err == nil {
+ if portID, err := va.GetDevicePortID(device.Name, nniPort); err == nil {
if state, _ := controller.GetController().GetPortState(device.Name, nniPort); state != controller.PortStateUp {
logger.Warnw(ctx, "Skipping Dev Flow Configuration - Port Down", log.Fields{"Device": device})
return true
@@ -2777,7 +2777,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return true
}
- nniPortID, err := va.GetPortID(nniPort)
+ nniPortID, err := va.GetDevicePortID(device.Name, nniPort)
if err != nil {
logger.Errorw(ctx, "Push ICMPv6 Failed - Failed to get NNI Port Id", log.Fields{"Port": device.NniPort, "Reason": err.Error})
}
@@ -2829,7 +2829,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return true
}
- if portID, err := va.GetPortID(nniPort); err == nil {
+ if portID, err := va.GetDevicePortID(device.Name, nniPort); err == nil {
if state, _ := controller.GetController().GetPortState(device.Name, nniPort); state != controller.PortStateUp {
logger.Warnw(ctx, "Skipping ICMPv6 Flow Deletion - Port Down", log.Fields{"Device": device})
return true
@@ -2883,7 +2883,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return true
}
- nniPortID, err := va.GetPortID(nniPort)
+ nniPortID, err := va.GetDevicePortID(device.Name, nniPort)
if err != nil {
logger.Errorw(ctx, "Delete ICMPv6 Failed - Failed to get NNI Port Id", log.Fields{"Port": device.NniPort, "Reason": err.Error})
}
@@ -2950,7 +2950,7 @@
logger.Errorw(ctx, "Error getting NNI port", log.Fields{"Error": err})
return true
}
- if portID, err := va.GetPortID(nniPort); err == nil {
+ if portID, err := va.GetDevicePortID(device.Name, nniPort); err == nil {
if state, _ := controller.GetController().GetPortState(device.Name, nniPort); state != controller.PortStateUp {
logger.Warnw(ctx, "Skipping ICMPv6 Flow Deletion - Port Down", log.Fields{"Device": device})
return false