Merge pull request #692 from gnawux/fix_portmapping

Fix portmapping failure: bad IP address

Author: laijs

.travis.yml

@@ -16,7 +16,7 @@ env:
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev libvirt-bin aufs-tools wget libaio1 libpixman-1-0
+  - sudo apt-get install -y -qq autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev libvirt-bin aufs-tools wget libaio1 libpixman-1-0 netcat
   - wget https://s3-us-west-1.amazonaws.com/hypercontainer-download/qemu-hyper/qemu-hyper_2.4.1-1_amd64.deb && sudo dpkg -i --force-all qemu-hyper_2.4.1-1_amd64.deb
   - cd `mktemp -d`
   - mkdir -p ${GOPATH}/src/github.com/hyperhq

daemon/pod/provision.go

@@ -3,6 +3,7 @@ package pod
 import (
 	"fmt"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -419,7 +420,8 @@ func (p *XPod) prepareResources() error {
 			return err
 		}
 		if p.containerIP == "" {
-			p.containerIP = inf.descript.Ip
+			fields := strings.SplitN(inf.descript.Ip, "/", 2)
+			p.containerIP = fields[0]
 		}
 	}
 

hack/lib/test.sh

@@ -242,3 +242,25 @@ hyper::test::container_readonly_rootfs_and_volume() {
   sudo hyperctl rm $id
   test $res1 -eq 0 -a $res2 -eq 0
 }
+
+hyper::test::portmapping() {
+  echo "Container portmapping test"
+  ipaddr=$(ip addr show hyper0 |sed -ne 's/.*inet \([.0-9]\{7,15\}\)\/[0-9]\{1,2\} .*/\1/p')
+  echo "hyper0 address is $ipaddr"
+  started=
+  while read output; do
+    response=$(echo "$output" |tr -d "[:space:]")
+    echo "got $response"
+    if [ "x$started" == "x" ]; then
+      started=$response
+      sleep 3
+      nc $ipaddr 3000 <<END
+ok
+END
+    elif [ "x$response" = "xok" ]; then
+      return 0
+    else
+      return 1
+    fi
+  done < <(sudo hyperctl run -t --rm --publish 3000:1300 busybox:latest sh -c 'echo "start" ; nc -l -p 1300')
+}

hack/test-cmd.sh

@@ -199,6 +199,7 @@ __EOF__
   hyper::test::force_kill_container
   hyper::test::container_logs_no_newline
   hyper::test::container_readonly_rootfs_and_volume
+  hyper::test::portmapping
 
   stop_hyperd
 }