kubectl-ko: fix trace when u2oInterconnection is enabled (#2836)

Author: zhangzujian

dist/images/kubectl-ko

@@ -242,7 +242,8 @@ trace(){
   if [ -z "$dstMac" ]; then
     vlan=$(kubectl get subnet "$ls" -o jsonpath={.spec.vlan})
     logicalGateway=$(kubectl get subnet "$ls" -o jsonpath={.spec.logicalGateway})
-    if [ ! -z "$vlan" -a "$logicalGateway" != "true" ]; then
+    u2oIC=$(kubectl get subnet "$ls" -o jsonpath={.spec.u2oInterconnection})
+    if [ ! -z "$vlan" -a "$logicalGateway" != "true" -a "$u2oIC" != "true" ]; then
       gateway=$(kubectl get subnet "$ls" -o jsonpath={.spec.gateway})
       if [[ "$gateway" =~ .*,.* ]]; then
         if [ "$af" = "4" ]; then
@@ -288,7 +289,7 @@ trace(){
       if [ -z "$lr" ]; then
         lr=$(kubectl get subnet "$ls" -o jsonpath={.spec.vpc})
       fi
-      dstMac=$(kubectl exec $OVN_NB_POD -n $KUBE_OVN_NS -c ovn-central -- ovn-nbctl --data=bare --no-heading --columns=mac find logical_router_port name="$lr"-"$ls" | tr -d '\r')
+      dstMac=$(kubectl exec $OVN_NB_POD -n $KUBE_OVN_NS -c ovn-central -- ovn-nbctl --data=bare --no-heading --columns=mac find logical_router_port name="$lr-$ls" | tr -d '\r')
     fi
   fi