diff --git a/clone.sh b/clone.sh new file mode 100755 index 0000000..77a120b --- /dev/null +++ b/clone.sh @@ -0,0 +1,28 @@ +#!/bin/bash +#command=$(cat testCommand.sh) +echo $command +username=$1 +password=$2 +ip=$3 +routerName=$4 +mapPort=$5 +/usr/bin/expect << EOD + + +spawn ssh $username@$ip -p$mapPort " + cd Documents + pwd +" +expect { + "(yes/no)?" { + send "yes\r"; + expect "password:"; + send "${password}\r"; + exp_continue; + } + "password:" { + send "${password}\r"; + exp_continue; + } +} +EOD diff --git a/doKill.sh b/doKill.sh index aa3e7fa..f12b619 100755 --- a/doKill.sh +++ b/doKill.sh @@ -4,8 +4,8 @@ echo $command username=$1 password=$2 ip=$3 -mapPort=$4 -name=$5 +name=$4 +mapPort=$5 /usr/bin/expect << EOD diff --git a/eval_deploy.sh b/eval_deploy.sh index 12b6038..58eca14 100755 --- a/eval_deploy.sh +++ b/eval_deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash command=$1 -DEBUG=0 +DEBUG=1 # 读取网络拓扑配置 json=`cat lab_topology.json` @@ -41,6 +41,7 @@ function deal(){ nbs=$(echo $list | jq ".[$index].nbs") #deal $routerName $network $site $router $mapPort $ip $username $password $nics $nbs & + echo "=======================开始处理$routerName===============" if [ $DEBUG -eq 1 ]; then echo echo routerName: $routerName @@ -62,9 +63,16 @@ function deal(){ "deploy") ./deploy_nfd.sh ;; + "update") + ./update.sh $username $password $ip $routerName $mapPort + ;; + "clone") + ./clone.sh $username $password $ip $routerName $mapPort + ;; "kill") - ./doKill.sh $username $password $ip $mapPort $routerName + ./doKill.sh $username $password $ip $routerName $mapPort esac + echo "=========================================================" } @@ -73,8 +81,6 @@ for index in `seq 0 $length` do # 获取到路由的名字 echo - echo "=======================开始处理$routerName===============" - deal $index & - echo "=========================================================" + deal $index echo done diff --git a/lab_topology.json b/lab_topology.json index 857a44c..2d57b09 100755 --- a/lab_topology.json +++ b/lab_topology.json @@ -1,9 +1,9 @@ [ { "name":"/ndn/edu/pkusz/pkun1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun1", + "router":"/pkun1", "id":0, "ip":"lab.pkusz.qjm253.cn", "mapPort":9751, @@ -34,35 +34,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun3", + "router":"/pkun3", "nicIndex":0 }, { "name":"/ndn/edu/pkusz/pkun2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun2", + "router":"/pkun2", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/mainn2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"mainn2", + "router":"/mainn2", "nicIndex":2 } ] }, { "name":"/ndn/edu/pkusz/pkun2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun2", + "router":"/pkun2", "id":1, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9752, "username":"pkun2", "password":"26035354", "nics":[ @@ -90,42 +90,42 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun3", + "router":"/pkun3", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/pkun1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun1", + "router":"/pkun1", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/hitn1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn1", + "router":"/hitn1", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/node0", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node0", + "router":"/node0", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/pkun3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun3", + "router":"/pkun3", "id":2, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9753, "username":"pkun3", "password":"26035354", "nics":[ @@ -153,28 +153,28 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun1", + "router":"/pkun1", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/pkun2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun2", + "router":"/pkun2", "nicIndex":2 } ] }, { "name":"/ndn/edu/pkusz/hitn1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn1", + "router":"/hitn1", "id":3, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9754, "username":"edward", "password":"201202", "nics":[ @@ -202,35 +202,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun2", + "router":"/pkun2", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/hitn2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn2", + "router":"/hitn2", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/hitn3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn3", + "router":"/hitn3", "nicIndex":2 } ] }, { "name":"/ndn/edu/pkusz/hitn2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn2", + "router":"/hitn2", "id":4, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9755, "username":"hitn2", "password":"26035354", "nics":[ @@ -258,35 +258,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/hitn1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn1", + "router":"/hitn1", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/hitn3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn3", + "router":"/hitn3", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/node2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node2", + "router":"/node2", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/hitn3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn3", + "router":"/hitn3", "id":5, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9756, "username":"hitn3", "password":"201202", "nics":[ @@ -314,28 +314,28 @@ "nbs":[ { "name":"/ndn/edu/pkusz/hitn1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn1", + "router":"/hitn1", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/hitn2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn2", + "router":"/hitn2", "nicIndex":3 } ] }, { "name":"/ndn/edu/pkusz/node0", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node0", + "router":"/node0", "id":6, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9757, "username":"node0", "password":"xuruiedward", "nics":[ @@ -363,42 +363,42 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun2", + "router":"/pkun2", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/main2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main2", + "router":"/main2", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/node1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node1", + "router":"/node1", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/node2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node2", + "router":"/node2", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/node1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node1", + "router":"/node1", "id":7, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9758, "username":"node1edward", "password":"xuruiedward", "nics":[ @@ -426,35 +426,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/node0", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node0", + "router":"/node0", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/node3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node3", + "router":"/node3", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/node5", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node5", + "router":"/node5", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/node2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node2", + "router":"/node2", "id":8, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9759, "username":"node3", "password":"xuruiedward", "nics":[ @@ -482,42 +482,42 @@ "nbs":[ { "name":"/ndn/edu/pkusz/node3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node3", + "router":"/node3", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/node0", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node0", + "router":"/node0", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/hitn2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"hitn2", + "router":"/hitn2", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/node6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node6", + "router":"/node6", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/node3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node3", + "router":"/node3", "id":9, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9760, "username":"node3edward", "password":"xuruiedward", "nics":[ @@ -545,35 +545,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/node1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node1", + "router":"/node1", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/node4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node4", + "router":"/node4", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/node2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node2", + "router":"/node2", "nicIndex":0 } ] }, { "name":"/ndn/edu/pkusz/node4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node4", + "router":"/node4", "id":10, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9761, "username":"node4edward", "password":"xuruiedward", "nics":[ @@ -601,35 +601,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/node3", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node3", + "router":"/node3", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/node5", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node5", + "router":"/node5", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/node6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node6", + "router":"/node6", "nicIndex":2 } ] }, { "name":"/ndn/edu/pkusz/node5", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node5", + "router":"/node5", "id":11, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9762, "username":"node5", "password":"xuruiedward", "nics":[ @@ -657,35 +657,35 @@ "nbs":[ { "name":"/ndn/edu/pkusz/main6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main6", + "router":"/main6", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/node1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node1", + "router":"/node1", "nicIndex":0 }, { "name":"/ndn/edu/pkusz/node4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node4", + "router":"/node4", "nicIndex":1 } ] }, { "name":"/ndn/edu/pkusz/node6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node6", + "router":"/node6", "id":12, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9763, "username":"node6", "password":"xuruiedward", "nics":[ @@ -705,28 +705,28 @@ "nbs":[ { "name":"/ndn/edu/pkusz/node2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node2", + "router":"/node2", "nicIndex":0 }, { "name":"/ndn/edu/pkusz/node4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node4", + "router":"/node4", "nicIndex":1 } ] }, { "name":"/ndn/edu/pkusz/main2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main2", + "router":"/main2", "id":13, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9764, "username":"mainn2", "password":"26035354", "nics":[ @@ -754,42 +754,42 @@ "nbs":[ { "name":"/ndn/edu/pkusz/pkun1", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"pkun1", + "router":"/pkun1", "nicIndex":0 }, { "name":"/ndn/edu/pkusz/node0", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node0", + "router":"/node0", "nicIndex":1 }, { "name":"/ndn/edu/pkusz/main4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main4", + "router":"/main4", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/main6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main6", + "router":"/main6", "nicIndex":2 } ] }, { "name":"/ndn/edu/pkusz/main4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main4", + "router":"/main4", "id":14, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9765, "username":"mainn4", "password":"26035354", "nics":[ @@ -817,28 +817,28 @@ "nbs":[ { "name":"/ndn/edu/pkusz/main6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main6", + "router":"/main6", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/main2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main2", + "router":"/main2", "nicIndex":3 } ] }, { "name":"/ndn/edu/pkusz/main6", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main6", + "router":"/main6", "id":15, "ip":"lab.pkusz.qjm253.cn", - "mapPort":9751, + "mapPort":9766, "username":"mainn2", "password":"26035354", "nics":[ @@ -866,23 +866,23 @@ "nbs":[ { "name":"/ndn/edu/pkusz/main2", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main2", + "router":"/main2", "nicIndex":2 }, { "name":"/ndn/edu/pkusz/main4", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"main4", + "router":"/main4", "nicIndex":3 }, { "name":"/ndn/edu/pkusz/node5", - "network":"/ndn/", + "network":"/ndn", "site":"/edu/pkusz", - "router":"node5", + "router":"/node5", "nicIndex":1 } ] diff --git a/update.sh b/update.sh index 4119d4c..fb522b2 100755 --- a/update.sh +++ b/update.sh @@ -5,12 +5,12 @@ username=$1 password=$2 ip=$3 routerName=$4 +mapPort=$5 /usr/bin/expect << EOD -spawn ssh $username@$ip " -cd Documents/CCNDeployment; -git pull +spawn ssh $username@$ip -p$mapPort" +git clone https://github.com/SunnyQjm/NDNDeployment.git " expect { "(yes/no)?" {