From 550eae9cfdc9f6a42ce5a81cf0873f8de7d1074b Mon Sep 17 00:00:00 2001 From: charan makkina Date: Wed, 28 Nov 2018 12:01:18 +0530 Subject: Fix: Rename the config folders inside dmm/stacks. Change-Id: Ie50f7f26ae7741e26572c9f2b5b049c458f4649e Signed-off-by: charan makkina --- demo/nginx_proxy/demo-1/setup_proxy.sh | 4 ++-- demo/nginx_proxy/demo-2/setup_proxy.sh | 4 ++-- stacks/lwip_stack/app_conf/module_config.json | 17 -------------- stacks/lwip_stack/app_conf/nStackConfig.json | 32 -------------------------- stacks/lwip_stack/app_conf/rd_config.json | 26 --------------------- stacks/lwip_stack/configure/module_config.json | 17 ++++++++++++++ stacks/lwip_stack/configure/nStackConfig.json | 32 ++++++++++++++++++++++++++ stacks/lwip_stack/configure/rd_config.json | 26 +++++++++++++++++++++ stacks/lwip_stack/doc/README.md | 6 ++--- stacks/lwip_stack/vagrant/start_nstackMain.sh | 2 +- stacks/rsocket/config/module_config.json | 20 ---------------- stacks/rsocket/config/rd_config.json | 10 -------- stacks/rsocket/configure/module_config.json | 20 ++++++++++++++++ stacks/rsocket/configure/rd_config.json | 10 ++++++++ stacks/rsocket/doc/README.md | 8 +++---- 15 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 stacks/lwip_stack/app_conf/module_config.json delete mode 100644 stacks/lwip_stack/app_conf/nStackConfig.json delete mode 100644 stacks/lwip_stack/app_conf/rd_config.json create mode 100644 stacks/lwip_stack/configure/module_config.json create mode 100644 stacks/lwip_stack/configure/nStackConfig.json create mode 100644 stacks/lwip_stack/configure/rd_config.json delete mode 100644 stacks/rsocket/config/module_config.json delete mode 100644 stacks/rsocket/config/rd_config.json create mode 100644 stacks/rsocket/configure/module_config.json create mode 100644 stacks/rsocket/configure/rd_config.json diff --git a/demo/nginx_proxy/demo-1/setup_proxy.sh b/demo/nginx_proxy/demo-1/setup_proxy.sh index 7dc4fa3..bd0d030 100644 --- a/demo/nginx_proxy/demo-1/setup_proxy.sh +++ b/demo/nginx_proxy/demo-1/setup_proxy.sh @@ -32,14 +32,14 @@ cp /DMM/demo/nginx_proxy/demo-1/vpp_config /etc/vpp/ cd /DMM/stacks/vpp/vpp/build-root/install-vpp_debug-native/vpp/bin #run vpp sudo ifconfig enp0s9 down -./vpp -c /etc/vpp/startup.conf +./vpp -c /etc/vpp/startup.conf #cp nginx libs cd /DMM/thirdparty/apps/nginx/release # Move the conf file. cp /DMM/demo/nginx_proxy/demo-1/module_config.json /DMM/thirdparty/apps/nginx/release/ -cp /DMM/stacks/lwip_stack/app_conf/nStackConfig.json /DMM/thirdparty/apps/nginx/release/ +cp /DMM/stacks/lwip_stack/configure/nStackConfig.json /DMM/thirdparty/apps/nginx/release/ cp /DMM/demo/nginx_proxy/demo-1/proxy_nginx.conf /DMM/thirdparty/apps/nginx/release/ cp /DMM/demo/nginx_proxy/demo-1/rd_config.json /DMM/thirdparty/apps/nginx/release/ mv /DMM/thirdparty/apps/nginx/release/proxy_nginx.conf /DMM/thirdparty/apps/nginx/release/nginx.conf diff --git a/demo/nginx_proxy/demo-2/setup_proxy.sh b/demo/nginx_proxy/demo-2/setup_proxy.sh index fc2039c..8c3d69a 100644 --- a/demo/nginx_proxy/demo-2/setup_proxy.sh +++ b/demo/nginx_proxy/demo-2/setup_proxy.sh @@ -32,14 +32,14 @@ cp /DMM/demo/nginx_proxy/demo-2/vpp_config /etc/vpp/ cd /DMM/stacks/vpp/vpp/build-root/install-vpp_debug-native/vpp/bin #run vpp sudo ifconfig enp0s9 down -./vpp -c /etc/vpp/startup.conf +./vpp -c /etc/vpp/startup.conf #cp nginx libs cd /DMM/thirdparty/apps/nginx/release # Move the conf file. cp /DMM/demo/nginx_proxy/demo-2/module_config.json /DMM/thirdparty/apps/nginx/release/ -cp /DMM/stacks/lwip_stack/app_conf/nStackConfig.json /DMM/thirdparty/apps/nginx/release/ +cp /DMM/stacks/lwip_stack/configure/nStackConfig.json /DMM/thirdparty/apps/nginx/release/ cp /DMM/demo/nginx_proxy/demo-2/proxy_nginx.conf /DMM/thirdparty/apps/nginx/release/ cp /DMM/demo/nginx_proxy/demo-2/rd_config.json /DMM/thirdparty/apps/nginx/release/ mv /DMM/thirdparty/apps/nginx/release/proxy_nginx.conf /DMM/thirdparty/apps/nginx/release/nginx.conf diff --git a/stacks/lwip_stack/app_conf/module_config.json b/stacks/lwip_stack/app_conf/module_config.json deleted file mode 100644 index c9c872b..0000000 --- a/stacks/lwip_stack/app_conf/module_config.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "default_stack_name": "kernel", - "module_list": [ - { - "stack_name": "kernel", - "libname": "./", - "deploytype": "1", - "stackid": "0", - }, - { - "stack_name": "lwip", - "libname": "liblwip_dpdk.so", - "deploytype": "3", - "stackid": "1", - }, - ] -} diff --git a/stacks/lwip_stack/app_conf/nStackConfig.json b/stacks/lwip_stack/app_conf/nStackConfig.json deleted file mode 100644 index 3cc54c5..0000000 --- a/stacks/lwip_stack/app_conf/nStackConfig.json +++ /dev/null @@ -1,32 +0,0 @@ -{ -"cfg_seg_socket": [ -{ - "socket_num": 8192, - "arp_stale_time": 300, - "arp_bc_retrans_num": 5 -} -], -"cfg_seg_log": [ -{ - "run_log_size": 50, - "run_log_count": 10, - "mon_log_size": 10, - "mon_log_count": 10 -} -], -"cfg_seg_thread_pri": [ -{ - "comment":"0:SCHED_OTHER, 1:SCHED_FIFO, 2:SCHED_RR", - "sched_policy": 0, - "thread_pri": 0 -} -], -"cfg_seg_path": [ -{ - "stackpool_log_path": "/var/log/nStack", - "master_log_path": "/var/log/nStack", - "nstack_log_path": "/var/log/nStack", - "dpdk_log_path": "/var/log/nstack-dpdk" -} -] -} diff --git a/stacks/lwip_stack/app_conf/rd_config.json b/stacks/lwip_stack/app_conf/rd_config.json deleted file mode 100644 index 3109bcd..0000000 --- a/stacks/lwip_stack/app_conf/rd_config.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "ip_route": [ - { - "subnet": "192.168.1.1/24", - "stack_name": "lwip", - }, - { - "subnet": "192.167.1.1/24", - "stack_name": "kernel", - }, - { - "subnet": "192.166.1.1/24", - "stack_name": "kernel", - } - ], - "prot_route": [ - { - "proto_type": "1", - "stack_name": "lwip", - }, - { - "proto_type": "2", - "stack_name": "kernel", - } - ], -} diff --git a/stacks/lwip_stack/configure/module_config.json b/stacks/lwip_stack/configure/module_config.json new file mode 100644 index 0000000..c9c872b --- /dev/null +++ b/stacks/lwip_stack/configure/module_config.json @@ -0,0 +1,17 @@ +{ + "default_stack_name": "kernel", + "module_list": [ + { + "stack_name": "kernel", + "libname": "./", + "deploytype": "1", + "stackid": "0", + }, + { + "stack_name": "lwip", + "libname": "liblwip_dpdk.so", + "deploytype": "3", + "stackid": "1", + }, + ] +} diff --git a/stacks/lwip_stack/configure/nStackConfig.json b/stacks/lwip_stack/configure/nStackConfig.json new file mode 100644 index 0000000..3cc54c5 --- /dev/null +++ b/stacks/lwip_stack/configure/nStackConfig.json @@ -0,0 +1,32 @@ +{ +"cfg_seg_socket": [ +{ + "socket_num": 8192, + "arp_stale_time": 300, + "arp_bc_retrans_num": 5 +} +], +"cfg_seg_log": [ +{ + "run_log_size": 50, + "run_log_count": 10, + "mon_log_size": 10, + "mon_log_count": 10 +} +], +"cfg_seg_thread_pri": [ +{ + "comment":"0:SCHED_OTHER, 1:SCHED_FIFO, 2:SCHED_RR", + "sched_policy": 0, + "thread_pri": 0 +} +], +"cfg_seg_path": [ +{ + "stackpool_log_path": "/var/log/nStack", + "master_log_path": "/var/log/nStack", + "nstack_log_path": "/var/log/nStack", + "dpdk_log_path": "/var/log/nstack-dpdk" +} +] +} diff --git a/stacks/lwip_stack/configure/rd_config.json b/stacks/lwip_stack/configure/rd_config.json new file mode 100644 index 0000000..3109bcd --- /dev/null +++ b/stacks/lwip_stack/configure/rd_config.json @@ -0,0 +1,26 @@ +{ + "ip_route": [ + { + "subnet": "192.168.1.1/24", + "stack_name": "lwip", + }, + { + "subnet": "192.167.1.1/24", + "stack_name": "kernel", + }, + { + "subnet": "192.166.1.1/24", + "stack_name": "kernel", + } + ], + "prot_route": [ + { + "proto_type": "1", + "stack_name": "lwip", + }, + { + "proto_type": "2", + "stack_name": "kernel", + } + ], +} diff --git a/stacks/lwip_stack/doc/README.md b/stacks/lwip_stack/doc/README.md index 6b533e0..a76b18a 100644 --- a/stacks/lwip_stack/doc/README.md +++ b/stacks/lwip_stack/doc/README.md @@ -32,11 +32,11 @@ a birds eye view of lwip in DMM pipeline mode. ```sh #export LD_LIBRARY_PATH=${dmm}/stacks/lwip_stack/release/lib64/ #export LD_PRELOAD=${dmm}/release/lib64/libnStackAPI.so - #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/lwip_stack/app_conf/module_config.json - #export NSTACK_MOD_CFG_RD=${dmm}/stacks/lwip_stack/app_conf/rd_config.json + #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/lwip_stack/configure/module_config.json + #export NSTACK_MOD_CFG_RD=${dmm}/stacks/lwip_stack/configure/rd_config.json #export NSTACK_LOG_ON=DBG (optional enable debug) ``` -- Steps 2: Modify rd_config.json(located at dmm/stacks/lwip_stack/app_config/) +- Steps 2: Modify rd_config.json(located at dmm/stacks/lwip_stack/configure/) ```sh #vim rd_config.json Eg. set "subnet": "192.168.21.1/24" diff --git a/stacks/lwip_stack/vagrant/start_nstackMain.sh b/stacks/lwip_stack/vagrant/start_nstackMain.sh index 0c6d0a4..674562a 100755 --- a/stacks/lwip_stack/vagrant/start_nstackMain.sh +++ b/stacks/lwip_stack/vagrant/start_nstackMain.sh @@ -82,7 +82,7 @@ sed -i 's!eth7!'$ifname'!1' network_data_tonStack.json cd $DMM_BUILD_SCRIPT_DIR/../release/bin cp -r . ../../stacks/lwip_stack/app_test cd $DMM_BUILD_SCRIPT_DIR/../stacks/lwip_stack/app_test -cp -r ../app_conf/*.json . +cp -r ../configure/*.json . sed -i 's!192.168.1.1!'$ifaddresscut'.0!1' rd_config.json diff --git a/stacks/rsocket/config/module_config.json b/stacks/rsocket/config/module_config.json deleted file mode 100644 index 736de24..0000000 --- a/stacks/rsocket/config/module_config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "default_stack_name": "kernel", /*when rd can't be find maybe choose the defualt one*/ - "module_list": [ - { - "stack_name": "kernel", /*stack name*/ - "libname": "./", /*library name, if loadtype is static, this maybe - null, else must give a library name*/ - "deploytype": "1", /*deploy model type:model type1, model type2, - model type3. Indicating single or multi process - deployment. Used during shared memory initialization.*/ - "stackid": "0", /*stack id, this must be ordered and not be repeated*/ - }, - { - "stack_name": "rsocket", - "libname": "libdmm_rsocket.so", - "deploytype": "1", - "stackid": "1", - }, - ] -} diff --git a/stacks/rsocket/config/rd_config.json b/stacks/rsocket/config/rd_config.json deleted file mode 100644 index 5c6f861..0000000 --- a/stacks/rsocket/config/rd_config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ip_route": [ - { - "subnet": "192.168.1.1/24", - "stack_name": "rsocket", - }, - ], - "prot_route": [ - ], -} diff --git a/stacks/rsocket/configure/module_config.json b/stacks/rsocket/configure/module_config.json new file mode 100644 index 0000000..736de24 --- /dev/null +++ b/stacks/rsocket/configure/module_config.json @@ -0,0 +1,20 @@ +{ + "default_stack_name": "kernel", /*when rd can't be find maybe choose the defualt one*/ + "module_list": [ + { + "stack_name": "kernel", /*stack name*/ + "libname": "./", /*library name, if loadtype is static, this maybe + null, else must give a library name*/ + "deploytype": "1", /*deploy model type:model type1, model type2, + model type3. Indicating single or multi process + deployment. Used during shared memory initialization.*/ + "stackid": "0", /*stack id, this must be ordered and not be repeated*/ + }, + { + "stack_name": "rsocket", + "libname": "libdmm_rsocket.so", + "deploytype": "1", + "stackid": "1", + }, + ] +} diff --git a/stacks/rsocket/configure/rd_config.json b/stacks/rsocket/configure/rd_config.json new file mode 100644 index 0000000..5c6f861 --- /dev/null +++ b/stacks/rsocket/configure/rd_config.json @@ -0,0 +1,10 @@ +{ + "ip_route": [ + { + "subnet": "192.168.1.1/24", + "stack_name": "rsocket", + }, + ], + "prot_route": [ + ], +} diff --git a/stacks/rsocket/doc/README.md b/stacks/rsocket/doc/README.md index 237db68..6cdacfb 100644 --- a/stacks/rsocket/doc/README.md +++ b/stacks/rsocket/doc/README.md @@ -34,10 +34,10 @@ dmm/release/lib64/libdmm_rsocket.so ```sh #export LD_LIBRARY_PATH=${dmm}/release/lib64 #export LD_PRELOAD=${dmm}/release/lib64/libnStackAPI.so - #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/rsocket/config/module_config.json - #export NSTACK_MOD_CFG_RD=${dmm}/stacks/rsocket/config/rd_config.json + #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/rsocket/configure/module_config.json + #export NSTACK_MOD_CFG_RD=${dmm}/stacks/rsocket/configure/rd_config.json ``` -- Steps 2: Modify rd_config.json(located at dmm/stacks/rsocket/config/) +- Steps 2: Modify rd_config.json(located at dmm/stacks/rsocket/configure/) ```sh #vim rd_config.json //set "subnet": "192.168.21.1/24" @@ -107,4 +107,4 @@ all using GSAPI macro control. https://wiki.fd.io/view/DMM https://github.com/ofiwg/librdmacm/blob/master/docs/rsocket https://github.com/rsocket/rsocket -http://www.mellanox.com/page/products_dyn?product_family=26 \ No newline at end of file +http://www.mellanox.com/page/products_dyn?product_family=26 -- cgit 1.2.3-korg