Fixed typos and updated functest sim for Newton deployments

Change-Id: I278f1327445793c5cf843e36c074c46c7b8fe89b
Signed-off-by: juraj.linkes <jlinkes@cisco.com>

diff --git a/scripts/functest_sim.sh b/scripts/functest_sim.sh
index e328b50..5c22e64 100755 (executable)
--- a/scripts/functest_sim.sh
+++ b/scripts/functest_sim.sh
@@ -6,7 +6,7 @@ neutron subnet-create --name test-subnet test-net 192.168.20.0/24
 net_id=`neutron net-list | grep test-net | cut -f 2 -d " "`
 
 # ATTACH NETWORK TO ROUTER
-echo "Attaching external and tenant networks to reouter"
+echo "Attaching external and tenant networks to router"
 neutron router-create test-router
 neutron router-interface-add test-router test-subnet
 neutron router-gateway-set test-router external
@@ -19,7 +19,7 @@ nova secgroup-add-rule test-secgroup tcp 22 22 0.0.0.0/0
 
 # FIRST VM
 echo "Creating first VM in the network and adding the security group to it"
-nova boot --image cirros-0.3.4 --flavor 1 --nic net-id=$net_id test-vm1
+nova boot --image cirros-0.3.4 --flavor nfv --nic net-id=$net_id test-vm1
 nova add-secgroup test-vm1 test-secgroup
 
 echo "Waiting 7 seconds for the VM to come up"
@@ -27,7 +27,7 @@ sleep 7
 
 # SECOND VM
 echo "Creating second VM in the network and adding the security group to it"
-nova boot --image cirros-0.3.4 --flavor 1 --nic net-id=$net_id test-vm2
+nova boot --image cirros-0.3.4 --flavor nfv --nic net-id=$net_id test-vm2
 nova add-secgroup test-vm2 test-secgroup
 
 # FLOATING IP

diff --git a/scripts/post_apex.sh b/scripts/post_apex.sh
index c4ccf7d..70ec4d6 100755 (executable)
--- a/scripts/post_apex.sh
+++ b/scripts/post_apex.sh
@@ -26,9 +26,9 @@ IFS=$'\n'
 nova_list=`ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null stack@$undercloud_ip ". stackrc && nova list | tail -n+4 | head -n-1 | sed 's/ //g'" 2> /dev/null`
 node_list=($nova_list)
 IFS="$OIFS"
-echo
 for node in "${node_list[@]}"
 do
+    echo
     node_fields=`echo $node | cut -d "|" -f 3,7`
     node_name=`echo $node_fields | cut -d "|" -f 1`
     node_ip=`echo $node_fields | cut -d "=" -f 2`