Add support of different pci pathes
Change-Id: I0a1bd297afc6e2485ab9cbc650e74f95a958a50b
diff --git a/VERSION b/VERSION
index 65087b4..e25d8d9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.4
+1.1.5
diff --git a/vfioveth b/vfioveth
index 029e633..028ef9b 100644
--- a/vfioveth
+++ b/vfioveth
@@ -15,23 +15,27 @@
}
get_mac_with_vfpci() {
- local pf=$(readlink /sys/devices/pci*/*/$1/physfn | awk '{print substr($1,4)}')
- local pfName=$(ls /sys/devices/pci*/*/$pf/net/ | head -1)
- local idx=$(ls -l /sys/devices/pci*/*/$pf | awk -v vf=$1 'substr($11,4)==vf {print substr($9,7)}')
+ local vfdir=$(find /sys/devices/pci* -name $1)
+ local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
+ local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfName=$(ls $pfdir/net/ | head -1)
+ local idx=$(ls -l $pfdir | awk -v vf=$1 'substr($11,4)==vf {print substr($9,7)}')
local mac=$(ip link show dev $pfName | awk -v idx="$idx" '$1=="vf" && $2==idx {print substr($4,1,17)}')
echo $mac
}
add_vlan() {
vfpci=$(echo $CNI_CONF | jq -r '.deviceID')
- local pf=$(readlink /sys/devices/pci*/*/$vfpci/physfn | awk '{print substr($1,4)}')
- local pfName=$(ls /sys/devices/pci*/*/$pf/net/ | head -1)
- local idx=$(ls -l /sys/devices/pci*/*/$pf | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')
+ local vfdir=$(find /sys/devices/pci* -name $vfpci)
+ local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
+ local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfName=$(ls $pfdir/net/ | head -1)
+ local idx=$(ls -l $pfdir | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')
- vlan=$(echo $CNI_CONF | jq -r '.vlan // empty')
- if [ ! -z "$vlan" ]; then
+ vlan=$(echo $CNI_CONF | jq -r '.vlan // empty')
+ if [ ! -z "$vlan" ]; then
ip link set $pfName vf $idx vlan $vlan
- fi
+ fi
}
ipam() {
@@ -64,14 +68,16 @@
delete_vlan() {
vfpci=$(echo $CNI_CONF | jq -r '.deviceID')
- local pf=$(readlink /sys/devices/pci*/*/$vfpci/physfn | awk '{print substr($1,4)}')
- local pfName=$(ls /sys/devices/pci*/*/$pf/net/ | head -1)
- local idx=$(ls -l /sys/devices/pci*/*/$pf | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')
+ local vfdir=$(find /sys/devices/pci* -name $vfpci)
+ local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
+ local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfName=$(ls $pfdir/net/ | head -1)
+ local idx=$(ls -l $pfdir | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')
- vlan=$(echo $CNI_CONF | jq -r '.vlan // empty')
- if [ ! -z "$vlan" ]; then
- ip link set $pfName vf $idx vlan 0
- fi
+ vlan=$(echo $CNI_CONF | jq -r '.vlan // empty')
+ if [ ! -z "$vlan" ]; then
+ ip link set $pfName vf $idx vlan 0
+ fi
}
case $CNI_COMMAND in