diff options
author | charan makkina <charan795m@gmail.com> | 2018-11-28 12:01:18 +0530 |
---|---|---|
committer | charan makkina <charan795m@gmail.com> | 2018-12-24 11:54:13 +0530 |
commit | 550eae9cfdc9f6a42ce5a81cf0873f8de7d1074b (patch) | |
tree | 6b7725aef4853029951585126bf13c15fc718545 | |
parent | fa0dce9d94e9bfbdd9ec877036a101d2fd69f42c (diff) |
Fix: Rename the config folders inside dmm/stacks.
Change-Id: Ie50f7f26ae7741e26572c9f2b5b049c458f4649e
Signed-off-by: charan makkina <charan795m@gmail.com>
-rw-r--r-- | demo/nginx_proxy/demo-1/setup_proxy.sh | 4 | ||||
-rw-r--r-- | demo/nginx_proxy/demo-2/setup_proxy.sh | 4 | ||||
-rw-r--r-- | stacks/lwip_stack/configure/module_config.json (renamed from stacks/lwip_stack/app_conf/module_config.json) | 0 | ||||
-rw-r--r-- | stacks/lwip_stack/configure/nStackConfig.json (renamed from stacks/lwip_stack/app_conf/nStackConfig.json) | 0 | ||||
-rw-r--r-- | stacks/lwip_stack/configure/rd_config.json (renamed from stacks/lwip_stack/app_conf/rd_config.json) | 0 | ||||
-rw-r--r-- | stacks/lwip_stack/doc/README.md | 6 | ||||
-rwxr-xr-x | stacks/lwip_stack/vagrant/start_nstackMain.sh | 2 | ||||
-rw-r--r-- | stacks/rsocket/configure/module_config.json (renamed from stacks/rsocket/config/module_config.json) | 0 | ||||
-rw-r--r-- | stacks/rsocket/configure/rd_config.json (renamed from stacks/rsocket/config/rd_config.json) | 0 | ||||
-rw-r--r-- | stacks/rsocket/doc/README.md | 8 |
10 files changed, 12 insertions, 12 deletions
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/configure/module_config.json index c9c872b..c9c872b 100644 --- a/stacks/lwip_stack/app_conf/module_config.json +++ b/stacks/lwip_stack/configure/module_config.json diff --git a/stacks/lwip_stack/app_conf/nStackConfig.json b/stacks/lwip_stack/configure/nStackConfig.json index 3cc54c5..3cc54c5 100644 --- a/stacks/lwip_stack/app_conf/nStackConfig.json +++ b/stacks/lwip_stack/configure/nStackConfig.json diff --git a/stacks/lwip_stack/app_conf/rd_config.json b/stacks/lwip_stack/configure/rd_config.json index 3109bcd..3109bcd 100644 --- a/stacks/lwip_stack/app_conf/rd_config.json +++ b/stacks/lwip_stack/configure/rd_config.json 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/configure/module_config.json index 736de24..736de24 100644 --- a/stacks/rsocket/config/module_config.json +++ b/stacks/rsocket/configure/module_config.json diff --git a/stacks/rsocket/config/rd_config.json b/stacks/rsocket/configure/rd_config.json index 5c6f861..5c6f861 100644 --- a/stacks/rsocket/config/rd_config.json +++ b/stacks/rsocket/configure/rd_config.json 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 |