Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-UPF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-UPF
Commits
d7efdbf8
Commit
d7efdbf8
authored
Jul 15, 2021
by
wangyongshou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace vpp config
parent
8b205259
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
21 deletions
+49
-21
etc/template/upf.conf
etc/template/upf.conf
+9
-10
scripts/build_upf.sh
scripts/build_upf.sh
+15
-5
scripts/config_upf.sh
scripts/config_upf.sh
+25
-6
No files found.
etc/template/upf.conf
View file @
d7efdbf8
...
...
@@ -45,26 +45,25 @@ dpdk {
dev
default
{
num
-
rx
-
queues
1
}
dev
@
PCI_ADDR_ID_ENTRY
@
dev
@
N3_PCI
@
{
name
if_n3
num
-
rx
-
queues
2
num
-
tx
-
queues
1
num
-
rx
-
queues
2
num
-
tx
-
queues
1
ipaddr
@
N3_IP
@
netmask
32
gateway
@
N3_GW
@
ipaddr
@
N3_IP
@
netmask
32
gateway
@
N3_GW
@
}
dev
@
PCI_ADDR_ID_EXPORT
@
dev
@
N6_PCI
@
{
name
if_n6
num
-
rx
-
queues
1
num
-
rx
-
queues
1
ipaddr
@
N6_IP
@
netmask
32
gateway
@
VPPHOST_IP
@
gateway
@
N6_GW
@
}
uio
-
driver
vfio
-
pci
...
...
scripts/build_upf.sh
View file @
d7efdbf8
...
...
@@ -27,7 +27,7 @@ function pre_create(){
fi
if
[
!
-d
$UPFINSTALL
/etc
]
;
then
sudo mkdir
-p
$UPFINSTALL
/etc
sudo mkdir
-p
$UPFINSTALL
/etc
fi
if
[
!
-d
$UPFINSTALL
/scripts
]
;
then
...
...
@@ -36,15 +36,23 @@ function pre_create(){
if
[
!
-d
$UPFINSTALL
/tools
]
;
then
sudo mkdir
-p
$UPFINSTALL
/tools
cp
-f
/sbin/ethtool
$UPFINSTALL
/tools
fi
}
function
config_file
(){
cp
$configure
/template/
*
$UPFINSTALL
/etc
#scripts
cp
-f
$current
/config_upf.sh
$UPFINSTALL
/scripts
cp
-f
$current
/install_upf.sh
$UPFINSTALL
/scripts
cp
-f
$current
/run_upf.sh
$UPFINSTALL
/scripts
#etc
cp
-f
$configure
/template/n4_config.yaml
$UPFINSTALL
/etc
cp
-f
$configure
/template/upf.conf
$UPFINSTALL
/etc
#tools
cp
-f
/sbin/ethtool
$UPFINSTALL
/tools
}
function
pre_install
(){
...
...
@@ -231,17 +239,19 @@ function main() {
;;
--vpp-dp
|
--vpp-debug-pkg
)
pre_create
config_file
make_vpp_package debug
shift
;
;;
--vpp-rp
|
--vpp-release-pkg
)
pre_create
config_file
make_vpp_package release
shift
;
;;
--n4-dp
|
--vpp-debug-pkg
)
config_file
pre_create
config_file
make_n4_package
shift
;
;;
...
...
scripts/config_upf.sh
View file @
d7efdbf8
#!/bin/bash
current
=
"
$PWD
"
base
=
$(
dirname
"
$PWD
"
)
VPP_CONFIG
=
$base
/etc
#vpp config
UPF_N3_NAME
=
""
UPF_N6_NAME
=
""
...
...
@@ -34,9 +39,14 @@ function get_inter_pci() {
function
generate_instance
(){
echo
"generate_instance"
#sed s/@N3_GW@/${N3_GW_IP}/ ./startup_debug.conf > /dev/null 2>&1;
sed
-i
s/@N3_PCI@/
${
UPF_N3_PCI
}
/ ./upf.conf
>
/dev/null 2>&1
;
sed
-i
s/@N6_PCI@/
${
UPF_N6_PCI
}
/ ./upf.conf
>
/dev/null 2>&1
;
sed
-i
s/@N3_IP@/
${
UPF_N3_IP
}
/ ./upf.conf
>
/dev/null 2>&1
;
sed
-i
s/@N6_IP@/
${
UPF_N6_IP
}
/ ./upf.conf
>
/dev/null 2>&1
;
sed
-i
s/@N3_GW@/
${
UPF_N3_GW
}
/ ./upf.conf
>
/dev/null 2>&1
;
sed
-i
s/@N6_GW@/
${
UPF_N6_GW
}
/ ./upf.conf
>
/dev/null 2>&1
;
}
...
...
@@ -44,10 +54,11 @@ function generate_instance(){
function
read_config
()
{
file_name
=
$1
while
read
line
do
eval
"
$line
"
done
<
upf.txt
done
<
$file_name
echo
"vpp config"
UPF_N3_NAME
=
$vpp_n3_name
...
...
@@ -63,10 +74,10 @@ function read_config() {
echo
"UPF_N6_IP:
$UPF_N6_IP
"
UPF_N3_GW
=
$vpp_n3_gw
echo
"
vpp_n6_gw
:
$UPF_N3_GW
"
echo
"
UPF_N3_GW
:
$UPF_N3_GW
"
UPF_N6_GW
=
$vpp_n6_gw
echo
"
vpp_n6_gw
:
$UPF_N6_GW
"
echo
"
UPF_N6_GW
:
$UPF_N6_GW
"
UPF_CPU
=
$vpp_cpu
echo
"vpp_cpu:
$UPF_CPU
"
...
...
@@ -94,7 +105,15 @@ function read_config() {
}
function
main
()
{
read_config
filename
=
$1
if
[
!
-f
$filename
]
;
then
echo
"no exist
$filename
"
return
fi
read_config
$filename
generate_instance
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment