summaryrefslogtreecommitdiffstats
path: root/stacks
diff options
context:
space:
mode:
authorrainbow_0206 <jiangwenjiang@huawei.com>2018-09-18 19:39:52 +0800
committerrainbow_0206 <jiangwenjiang@huawei.com>2018-10-09 19:11:54 +0800
commit74d149fea978f0200a1d3af07e0efccaf0ee993a (patch)
treeef4755271258c8409ee6e55f3da76f0a7bc58396 /stacks
parent2827d26800e19858d4a9856c8a8f977a273f9910 (diff)
Fix: delete g_nstack_plane_info and fix json file
Change-Id: Ib9d92b547af01ee5d46723b15d5aea3fcbe2b989 Signed-off-by: rainbow_0206 <jiangwenjiang@huawei.com>
Diffstat (limited to 'stacks')
-rw-r--r--stacks/lwip_stack/app_conf/module_config.json2
-rw-r--r--stacks/lwip_stack/app_conf/rd_config.json10
-rw-r--r--stacks/rsocket/config/rd_config.json2
-rw-r--r--stacks/vpp/configure/rd_config.json10
4 files changed, 12 insertions, 12 deletions
diff --git a/stacks/lwip_stack/app_conf/module_config.json b/stacks/lwip_stack/app_conf/module_config.json
index a179ad4..f1b3458 100644
--- a/stacks/lwip_stack/app_conf/module_config.json
+++ b/stacks/lwip_stack/app_conf/module_config.json
@@ -13,7 +13,7 @@
"stackid": "0",
},
{
- "stack_name": "stackx",
+ "stack_name": "lwip",
"function_name": "nstack_stack_register",
"libname": "libnstack.so",
"loadtype": "dynmic",
diff --git a/stacks/lwip_stack/app_conf/rd_config.json b/stacks/lwip_stack/app_conf/rd_config.json
index 38374bc..3109bcd 100644
--- a/stacks/lwip_stack/app_conf/rd_config.json
+++ b/stacks/lwip_stack/app_conf/rd_config.json
@@ -2,25 +2,25 @@
"ip_route": [
{
"subnet": "192.168.1.1/24",
- "type": "nstack-dpdk",
+ "stack_name": "lwip",
},
{
"subnet": "192.167.1.1/24",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
},
{
"subnet": "192.166.1.1/24",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
}
],
"prot_route": [
{
"proto_type": "1",
- "type": "nstack-dpdk",
+ "stack_name": "lwip",
},
{
"proto_type": "2",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
}
],
}
diff --git a/stacks/rsocket/config/rd_config.json b/stacks/rsocket/config/rd_config.json
index ea1fc7b..5c6f861 100644
--- a/stacks/rsocket/config/rd_config.json
+++ b/stacks/rsocket/config/rd_config.json
@@ -2,7 +2,7 @@
"ip_route": [
{
"subnet": "192.168.1.1/24",
- "type": "nstack-rsocket",
+ "stack_name": "rsocket",
},
],
"prot_route": [
diff --git a/stacks/vpp/configure/rd_config.json b/stacks/vpp/configure/rd_config.json
index 2ea10d1..166fbec 100644
--- a/stacks/vpp/configure/rd_config.json
+++ b/stacks/vpp/configure/rd_config.json
@@ -2,25 +2,25 @@
"ip_route": [
{
"subnet": "192.168.1.1/24",
- "type": "nstack-vpp",
+ "stack_name": "vpp_hoststack",
},
{
"subnet": "10.145.240.1/24",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
},
{
"subnet": "192.166.1.1/24",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
}
],
"prot_route": [
{
"proto_type": "1",
- "type": "nstack-vpp",
+ "stack_name": "vpp_hoststack",
},
{
"proto_type": "2",
- "type": "nstack-kernel",
+ "stack_name": "kernel",
}
],
}