Merge pull request #447 from 01org/revert-445-singlevm

Revert "singlevm : Add networking automation (macvlan and DHCP Server)"

testutil/singlevm/configuration.yaml

@@ -9,9 +9,6 @@ configure:
   image_service:
     url: http://glance.example.com
   launcher:
-    compute_net: 198.51.100.1/24
-    mgmt_net: 198.51.100.1/24
     disk_limit: false
-    mem_limit: false
   identity_service:
     url: http://keystone.example.com

testutil/singlevm/setup.sh

@@ -207,27 +207,6 @@ sudo cp -f clear-"${LATEST}"-cloud.img /var/lib/ciao/images
 cd /var/lib/ciao/images
 sudo ln -sf clear-"${LATEST}"-cloud.img df3768da-31f5-4ba6-82f0-127a1a705169
 
-# Set macvlan interface
-if [ -x "$(command -v ip)" ]; then
-   sudo ip link add name eth10 type bridge
-   sudo ip link add link eth10 name macvlan0 type macvlan mode bridge
-   sudo ip addr add 198.51.100.1/24 brd 198.51.100.255 dev macvlan0
-   sudo ip link set dev macvlan0 up
-   sudo ip -d link show macvlan0
-   sudo ip link set dev eth10 up
-   sudo ip -d link show eth10
-else
-    echo 'ip command is not supported'
-fi
-
-# Set DHCP server with dnsmasq
-sudo mkdir -p /var/lib/misc
-if [ -x "$(command -v ip)" ]; then
-    dnsmasq -C $ciao_scripts/dnsmasq.conf.macvlan0
-else
-    echo 'dnsmasq command is not supported'
-fi
-
 #Kick off the agents
 cd "$ciao_bin"
 "$ciao_bin"/run_scheduler.sh  &> /dev/null
@@ -311,7 +290,7 @@ do
 
 	echo "Attempting to ssh to: $ssh_ip"
 
-	if [[ "$ssh_check" == *SSH-2.0-OpenSSH_* ]]
+	if [[ "$ssh_check" == *SSH-2.0-OpenSSH_7.2* ]]
 	then
 		echo "SSH connectivity verified"
 		break
@@ -348,6 +327,3 @@ fi
 #Also kill the CNCI (as there is no other way to delete it today)
 sudo killall qemu-system-x86_64
 sudo rm -rf /var/lib/ciao/instances
-#Destroy all networking pieces
-sudo killall dnsmasq
-ip link del eth10