Skip to content
Snippets Groups Projects
Commit 60bdf170 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent f834af4d
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!284Resolve: "(CNIT) Multi-Granular Optical Nodes and Optical Transpoders management"
Hide whitespace changes
Inline Side-by-side
src/tests/ofc24/get_all.sh
+ 16
− 4
View file @ 60bdf170
#!/bin/bash #!/bin/bash
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
~/tfs-ctrl/src/tests/ofc24/get_bands.sh > bands.json ~/tfs-ctrl/src/tests/ofc24/get_bands.sh > bands.json
~/tfs-ctrl/src/tests/ofc24/get_links.sh > links.json ~/tfs-ctrl/src/tests/ofc24/get_links.sh > links.json
~/tfs-ctrl/src/tests/ofc24/get_lightpath.sh > lightpath.json ~/tfs-ctrl/src/tests/ofc24/get_lightpath.sh > lightpath.json
src/tests/ofc24/get_bands.sh
+ 16
− 5
View file @ 60bdf170
#!/bin/bash #!/bin/bash
ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}') # Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
#echo $ip ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}')
echo $ip
#push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin") #push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin")
links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetOpticalBands") links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetOpticalBands")
echo $links
echo $links
\ No newline at end of file
src/tests/ofc24/get_lightpath.sh
+ 16
− 5
View file @ 60bdf170
#!/bin/bash #!/bin/bash
ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}') # Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
#echo $ip ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}')
echo $ip
#push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin") #push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin")
links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetLightpaths") links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetLightpaths")
echo $links
echo $links
\ No newline at end of file
src/tests/ofc24/get_links.sh
+ 16
− 5
View file @ 60bdf170
#!/bin/bash #!/bin/bash
ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}') # Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
#echo $ip ip=$(sudo kubectl get all --all-namespaces | grep service/opticalcontrollerservice | awk '{print $4}')
echo $ip
#push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin") #push=$(curl -X GET "http://$ip:10060/OpticalTFS/GetTopology/admin/admin")
links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetLinks") links=$(curl -X GET "http://$ip:10060/OpticalTFS/GetLinks")
echo $links
echo $links
\ No newline at end of file
src/tests/ofc24/r_t.sh
+ 1
− 1
View file @ 60bdf170
...@@ -28,4 +28,4 @@ docker rm na2 ...@@ -28,4 +28,4 @@ docker rm na2
screen -dmS t1 -T xterm sh -c "docker run --name t1 -p 10.0.2.4:2023:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/oc23bgp.img:latest bash -c 'cp /files/transponders_x4.xml demoECOC21.xml ; ./startNetconfAgent.sh'" screen -dmS t1 -T xterm sh -c "docker run --name t1 -p 10.0.2.4:2023:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/oc23bgp.img:latest bash -c 'cp /files/transponders_x4.xml demoECOC21.xml ; ./startNetconfAgent.sh'"
screen -dmS t3 -T xterm sh -c "docker run --name na3 -p 10.0.2.4:2025:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/flexscale-node.img:latest bash -c 'cp /files/platform_r1.xml init_openconfig-platform.xml ; ./startNetconfAgent.sh'" screen -dmS t3 -T xterm sh -c "docker run --name na3 -p 10.0.2.4:2025:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/flexscale-node.img:latest bash -c 'cp /files/platform_r1.xml init_openconfig-platform.xml ; ./startNetconfAgent.sh'"
screen -dmS t2 -T xterm sh -c "docker run --name t2 -p 10.0.2.4:2024:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/oc23bgp.img:latest bash -c 'cp /files/transponders_x4_2.xml demoECOC21.xml ; ./startNetconfAgent.sh'" screen -dmS t2 -T xterm sh -c "docker run --name t2 -p 10.0.2.4:2024:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/oc23bgp.img:latest bash -c 'cp /files/transponders_x4_2.xml demoECOC21.xml ; ./startNetconfAgent.sh'"
screen -dmS t4 -T xterm sh -c "docker run --name na2 -p 10.0.2.4:2026:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/flexscale-node.img:latest bash -c 'cp /files/platform_r2.xml init_openconfig-platform.xml ; ./startNetconfAgent.sh'" screen -dmS t4 -T xterm sh -c "docker run --name na2 -p 10.0.2.4:2026:2022 -v /home/tfs/tfs-ctrl/src/tests/ofc24/tempOC/files:/files -it asgamb1/flexscale-node.img:latest bash -c 'cp /files/platform_r2.xml init_openconfig-platform.xml ; ./startNetconfAgent.sh'"
\ No newline at end of file
src/tests/ofc24/run_test.sh
+ 21
− 14
View file @ 60bdf170
#!/bin/bash #!/bin/bash
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
docker stop na1 docker stop na1
docker rm na1 docker rm na1
screen -dmS t1 -T xterm sh -c "docker run -p 10.0.2.10:2023:2022 -v ~/tfs-ctrl/src/tests/ofc24/tempOC/files:/files --name na1 -it asgamb1/oc23bgp.img:latest screen -dmS t1 -T xterm sh -c "docker run -p 10.0.2.10:2023:2022 -v ~/tfs-ctrl/src/tests/ofc24/tempOC/files:/files --name na1 -it asgamb1/oc23bgp.img:latest"
" sleep 2
sleep 2 if [ "$( docker container inspect -f '{{.State.Running}}' na1)" = "true" ]; then
if [ "$( docker container inspect -f '{{.State.Running}}' na1)" = "true" ]; then docker exec na1 sh -c " cp /files/platform_t1.xml demoECOC21.xml ; /confd/examples.confd/OC23/startNetconfAgent.sh; "
else
echo "your container is not running yet"
fi
docker exec na1 sh -c " cp /files/platform_t1.xml demoECOC21.xml ;
/confd/examples.confd/OC23/startNetconfAgent.sh; "
else
echo "your container is not running yet"
fi
src/tests/ofc24/tempOC/files/startNetconfAgent.sh
+ 14
− 0
View file @ 60bdf170
#!/bin/bash #!/bin/bash
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License
make clean make clean
make all make all
#make init #make init
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment