Commit def058ee authored by wangyongshou's avatar wangyongshou

modify problem of interrupt

parent 889a772a
...@@ -8,7 +8,6 @@ vpp_n3_gw=192.168.2.199 ...@@ -8,7 +8,6 @@ vpp_n3_gw=192.168.2.199
vpp_n6_gw=192.168.2.1 vpp_n6_gw=192.168.2.1
#n4 config #n4 config
n4_gnb=192.168.10.10
n4_smf=192.168.2.35 n4_smf=192.168.2.35
n4_upf=192.168.2.21 n4_upf=192.168.2.21
n4_logSize=100 n4_logSize=100
...@@ -55,7 +55,9 @@ function config_file(){ ...@@ -55,7 +55,9 @@ function config_file(){
cp -f $current/new_run_upf.sh $UPFINSTALL/scripts cp -f $current/new_run_upf.sh $UPFINSTALL/scripts
#etc #etc
cp -f $configure/template/n4_config.yaml $UPFINSTALL/etc
cp -f $configure/template/n4.template $UPFINSTALL/etc
#cp -f $configure/template/n4_config.yaml $UPFINSTALL/etc
cp -f $configure/template/startup_debug.template $UPFINSTALL/etc cp -f $configure/template/startup_debug.template $UPFINSTALL/etc
#cp -f $configure/template/vppe.conf $UPFINSTALL/etc #cp -f $configure/template/vppe.conf $UPFINSTALL/etc
cp -f $configure/upf.conf $UPFINSTALL/etc cp -f $configure/upf.conf $UPFINSTALL/etc
......
...@@ -229,12 +229,13 @@ function set_cpu_interrupt() ...@@ -229,12 +229,13 @@ function set_cpu_interrupt()
echo "cpunum:$CPUCORES, cpumask:$CPU_MASK" echo "cpunum:$CPUCORES, cpumask:$CPU_MASK"
$base/plugin/interreput -i $CPU_MASK $base/tools/interreput -i $CPU_MASK
} }
function generate_instance() function generate_instance()
{ {
cp -f $base/etc/startup_debug.template $base/etc/vppe.conf cp -f $base/etc/startup_debug.template $base/etc/vppe.conf
cp -f $base/etc/n4.template $base/etc/n4_config.yaml
CPUCORES=$(echo `cat /proc/cpuinfo| grep "processor"| wc -l`) CPUCORES=$(echo `cat /proc/cpuinfo| grep "processor"| wc -l`)
...@@ -256,7 +257,7 @@ function generate_instance() ...@@ -256,7 +257,7 @@ function generate_instance()
sed -i s/@VPPHOST_IP@/${UPF_N6_GW}/ $VPP_CONFIG > /dev/null 2>&1; sed -i s/@VPPHOST_IP@/${UPF_N6_GW}/ $VPP_CONFIG > /dev/null 2>&1;
#n4 config #n4 config
sed -i s/@gnb@/${UPF_N4_GNB}/ $VPP_N4 > /dev/null 2>&1; sed -i s/@gnb@/${UPF_N3_GW}/ $VPP_N4 > /dev/null 2>&1;
sed -i s/@smf@/${UPF_N4_SMF}/ $VPP_N4 > /dev/null 2>&1; sed -i s/@smf@/${UPF_N4_SMF}/ $VPP_N4 > /dev/null 2>&1;
sed -i s/@upf@/${UPF_N4_UPF}/ $VPP_N4 > /dev/null 2>&1; sed -i s/@upf@/${UPF_N4_UPF}/ $VPP_N4 > /dev/null 2>&1;
sed -i s/@logSize@/${UPF_N4_LOGSIZE}/ $VPP_N4 > /dev/null 2>&1; sed -i s/@logSize@/${UPF_N4_LOGSIZE}/ $VPP_N4 > /dev/null 2>&1;
...@@ -271,8 +272,6 @@ function get_driver() ...@@ -271,8 +272,6 @@ function get_driver()
echo "ERROR N3 $UPF_N3_NAME cat not get driver\n" echo "ERROR N3 $UPF_N3_NAME cat not get driver\n"
echo "advice reboot" echo "advice reboot"
exit 0 exit 0
else
echo "$UPF_N3_NAME pci $UPF_N3_DRIVER"
fi fi
UPF_N6_DRIVER=$(echo `$base/tools/ethtool -i $UPF_N6_NAME | grep "driver" | awk '{print $2}'`) UPF_N6_DRIVER=$(echo `$base/tools/ethtool -i $UPF_N6_NAME | grep "driver" | awk '{print $2}'`)
...@@ -280,8 +279,6 @@ function get_driver() ...@@ -280,8 +279,6 @@ function get_driver()
echo "ERROR N6 $UPF_N6_NAME can not get driver\n" echo "ERROR N6 $UPF_N6_NAME can not get driver\n"
echo "advice reboot" echo "advice reboot"
exit 0 exit 0
else
echo "$UPF_N6_NAME pci $UPF_N6_DRIVER"
fi fi
} }
...@@ -292,8 +289,6 @@ function get_pci() ...@@ -292,8 +289,6 @@ function get_pci()
echo "ERROR N3 $UPF_N3_NAME can not get pci\n" echo "ERROR N3 $UPF_N3_NAME can not get pci\n"
echo "advice reboot" echo "advice reboot"
exit 0 exit 0
else
echo "$UPF_N3_NAME pci $UPF_N3_PCI"
fi fi
UPF_N6_PCI=$(echo `$base/tools/ethtool -i $UPF_N6_NAME | grep "bus-info" | awk '{print $2}'`) UPF_N6_PCI=$(echo `$base/tools/ethtool -i $UPF_N6_NAME | grep "bus-info" | awk '{print $2}'`)
...@@ -301,8 +296,6 @@ function get_pci() ...@@ -301,8 +296,6 @@ function get_pci()
echo "ERROR N6 $UPF_N6_NAME can not get pci" echo "ERROR N6 $UPF_N6_NAME can not get pci"
echo "advice reboot" echo "advice reboot"
exit 0 exit 0
else
echo "$UPF_N6_NAME pci $UPF_N6_PCI"
fi fi
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment