Update README.md and resolve installation error

1. Remove waf_shell.sh
2. Update README.md
3. Add a quagga configuration patch
4. Fix a syntax error in install.sh
5. Update .gitignore

Author: kansokusha

.gitignore

@@ -1,14 +1,9 @@
 .DS_Store
-openvswitch-*
 ns-allinone-*/*
-openflow/*
 mininet/*
-pygccxml/*
-gccxml/*
 .idea/*
 *.ropeproject*
 *.tar.bz2
 *.zip
 *.deb
-waf_shell.sh
 opennet_help.txt

README.md

@@ -20,24 +20,24 @@ Supports Ubuntu 14.04.3
     # ./configure.sh
     # ./install.sh master
 
-After a successful installation, the script will show "OpenNet installation complete."  
+After a successful installation, the script will show "OpenNet installation has completed."  
 
 Run OpenNet
 -----------
-Before using OpenNet, you need to prepare SDN controller by yourself.  
-Please try following commands to run the simulation:  
+With an SDN controller, the example script should work fine.  
 
     $ sudo su -
     # cd OpenNet
-    # ./waf_shell.sh
-    # cd ../../mininet/examples/opennet
+    # git clone https://github.com/noxrepo/pox.git
+    # cd OpenNet/pox
+    # ./pox.py forwarding.l2_learning &
+    # cd OpenNet/mininet/examples/opennet
     # python wifiroaming.py
 
-Do not type "sudo python wifiroaming.py", sudo will affect the environment  
-variable required by simulation.  
+Do not run the example as "sudo python wifiroaming.py".  
+Sudo will replace environment variables and make the simulation fail.  
 
-If the simulation script cannot connect to the controller,  
-stop the network-manager may help.  
+If the simulation script cannot connect to the controller, stop the network-manager may help.  
 
     # service network-manager stop
 

ansible/roles/ez_setup/tasks/main.yml

@@ -16,7 +16,7 @@
   register: gg
   tags: ez_setup
 - name: Remove ez_setup source code
-  command: "rm ez_setup.py"
-  args:
-    chdir: "{{ file_path }}"
-  tags: ez_setup
+  file:
+    path: "{{ file_path }}/ez_setup.py"
+    state: absent
+  tags: ez_setup

ansible/roles/help/templates/help.txt.j2

@@ -1,9 +1,12 @@
 =======================================================================
-OpenNet installation complete.
-Before using OpenNet, you need to prepare SDN controller by yourself.
+OpenNet installation has completed.
+With an SDN controller, the example script should work fine.
 =======================================================================
-Please try following commands to run the simulation
-$ sudo ./waf_shell.sh
+$ sudo su -
+# cd {{ home_location }}
+# git clone https://github.com/noxrepo/pox.git
+# cd {{ home_location }}/pox
+# ./pox.py forwarding.l2_learning &
 # cd {{ home_location }}/mininet/examples/opennet
 # python wifiroaming.py
 

ansible/roles/ns3/tasks/main.yml

@@ -56,12 +56,6 @@
 - name: Configure dynamic linker run-time bindings
   command: "ldconfig"
   tags: ns3
-- name: Create Waf Shell
-  template:
-    src: "waf_shell.sh.j2"
-    dest: "{{ home_location }}/waf_shell.sh"
-    mode: 0744
-  tags: ns3
 - name: Remove NS3 source code
   file:
     path: "{{ home_location }}/ns-allinone-{{ NS3_VERSION }}.tar.bz2"

ansible/roles/ns3/templates/waf_shell.sh.j2

@@ -0,0 +1,10 @@
+--- quagga/configure.ac	2016-01-25 22:42:27.500861718 +0800
++++ quagga-patch/configure.ac	2016-01-25 22:43:25.292774828 +0800
+@@ -10,6 +10,7 @@ AC_PREREQ(2.53)
+ AC_INIT(Quagga, 0.99.25-dev, [https://bugzilla.quagga.net])
+ CONFIG_ARGS="$*"
+ AC_SUBST(CONFIG_ARGS)
++AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_SRCDIR(lib/zebra.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 

ansible/roles/quagga/files/quagga-configure.patch

@@ -14,10 +14,13 @@
     version: "quagga-{{ QUAGGA_VERSION }}"
   tags: quagga
 
-- name: Use Autotools
-  command: "./update-autotools"
-  args:
-    chdir: "{{ quagga_dir_path }}"
+- name: Patch configure.ac
+  patch:
+    src: "{{ item }}"
+    basedir: "{{ quagga_dir_path }}"
+    strip: 1
+  with_items:
+    - quagga-configure.patch
   tags: quagga
 
 - name: Autoreconf

ansible/roles/quagga/tasks/main.yml

@@ -96,7 +96,7 @@ fi
 echo "***Check hostname in /etc/hosts"
 for i in "$@"; do
     HOST_STATUS=$(cat /etc/hosts | grep -w $i | awk '{print $2}')
-    if [ -z $HOST_STATUS ]; then
+    if [[ -z $HOST_STATUS ]]; then
         echo "Can Not find hostname '$i' in /etc/hosts, please check."
         echo "The format should be like:"
         echo "10.0.0.1 master"