diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-10-10 01:31:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-10-10 01:31:45 +0000 |
| commit | d622bf60c1894488276928f350c22e7a95008161 (patch) | |
| tree | cdffa038feb893dbe218ce3d9a326bf70f81be05 /stacks | |
| parent | 88ef84f0e10ff670c9465800193e42c8f6a5aa9f (diff) | |
| parent | 74d149fea978f0200a1d3af07e0efccaf0ee993a (diff) | |
Merge "Fix: delete g_nstack_plane_info and fix json file"
Diffstat (limited to 'stacks')
| -rw-r--r-- | stacks/lwip_stack/app_conf/module_config.json | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/app_conf/rd_config.json | 10 | ||||
| -rw-r--r-- | stacks/rsocket/config/rd_config.json | 2 | ||||
| -rw-r--r-- | stacks/vpp/configure/rd_config.json | 10 |
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", } ], } |