Merge pull request #5811 from tingtli/httport

add http port change case, do task 339

xCAT-test/autotest/testcase/httpport/cases0

@@ -0,0 +1,99 @@
+start:http_port_change
+description:Add test cases for bug fix 2629, change http port and then generate genesis (mknb). 
+label:mn_only,discovery
+cmd:netstat -nlp|grep  -E "apache2|httpd"
+check:output =~ 80
+cmd:lsdef -t site  -i httpport -c |awk -F"=" '{print $2}'
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/httpport/change_http_port.sh 80 8898
+cmd:netstat -nlp|grep  -E "apache2|httpd"
+check:output =~ 8898
+check:rc==0
+cmd:chdef -t site httpport=8898
+check:rc==0
+cmd:lsdef -t site  -i httpport -c
+check:output =~ 8898
+check:rc==0
+cmd:dir="/tftpboot/pxelinux.cfg/p";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi 
+cmd:mknb ppc64 
+check:rc==0
+cmd: #!/bin/bash
+# get all filename in specified path
+path=/tftpboot/pxelinux.cfg/p/
+files=$(ls $path)
+for filename in $files
+do
+ echo "The file is $filename"
+ grep 8898 $path$filename
+ if [ $? != 0 ];then
+    echo "port 8898 does not exist"
+    exit 1;
+ fi
+ links=$(grep 8898 $path$filename|awk -F " " '{print $2}')
+ for link in $links
+ do
+  wget $link
+  if [ $? != 0 ];then
+    echo "wget file $link failed"
+    exit 1;
+  else
+    echo "wget file $link succeed"
+  fi
+ done
+done
+rm -rf genesis*
+check:rc==0
+cmd:dir="/tftpboot/xcat/xnba/nets";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi
+cmd:mknb x86_64 
+check:rc==0
+cmd:#!/bin/bash
+# get all filename in specified path
+path=/tftpboot/xcat/xnba/nets/
+rm -rf $path*.elilo
+files=$(ls $path)
+mnip=$(lsdef -t site -i master -c |awk -F"=" '{print $2}')
+echo "The mn ip is $mnip"
+for filename in $files
+do
+ echo "The file is $filename"
+ grep 8898 $path$filename
+ if [ $? != 0 ];then
+    echo "port 8898 does not exist"
+    exit 1;
+ fi
+ grep "next-server" $path$filename
+ if [  $? == 0 ];then
+    sed -i "s/\${next-server}/$mnip/g"  $path$filename
+ fi
+ 
+ if [ "${filename##*.}"x = "uefi"x ];then
+    links=$(grep 8898 $path$filename|awk -F " " '{print $2}')
+ else
+    links=$(grep 8898 $path$filename|awk -F " " '{print $4}') 
+ fi
+  
+ for link in $links
+ do
+  wget $link
+  if [ $? != 0 ];then
+    echo "wget file $link failed"
+    exit 1;
+  else
+    echo "wget file $link succeed"
+  fi
+ done
+done
+rm -rf genesis*
+rm -rf elilo* 
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/httpport/change_http_port.sh 8898 80
+cmd:netstat -nlp|grep  -E "apache2|httpd"
+check:output =~ 80 
+check:rc==0
+cmd:chdef -t site httpport=80
+check:rc==0
+cmd:lsdef -t site  -i httpport -c
+check:output =~ 80 
+check:rc==0
+cmd:dir="/tftpboot/pxelinux.cfg/p"; rm -rf $dir; if [ -d ${dir}".bak" ];then mv ${dir}".bak" $dir; fi
+cmd:dir="/tftpboot/xcat/xnba/nets"; rm -rf $dir; if [ -d ${dir}".bak" ];then mv ${dir}".bak" $dir; fi
+end

xCAT-test/autotest/testcase/httpport/change_http_port.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+if [ -f "/etc/httpd/conf/httpd.conf" ]; then
+    config="/etc/httpd/conf/httpd.conf"
+elif [ -f "/etc/apache2/ports.conf" ]; then
+    config="/etc/apache2/ports.conf"
+elif [ -f "/etc/apache2/listen.conf" ]; then
+    config="/etc/apache2/listen.conf"
+fi
+port=`awk -F' ' '/^[Ll]isten / {print $2}' $config`
+echo "The original httpd port is $port in $config"
+
+echo "start to change httpd listen port to $2"
+sed -i  "s/^Listen $1/Listen $2/g" $config
+if [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then
+    sed -i "s/VirtualHost \*:$1/VirtualHost \*:$2/g" /etc/apache2/sites-enabled/000-default.conf
+    service apache2 stop
+    sleep 1
+    service apache2 start
+else
+    service httpd stop
+    sleep 1
+    service httpd start
+fi
+exit