Merge pull request #42 from smarterclayton/port_mappings_lost_locally

Port mappings lost on local gear deploy

Author: smarterclayton

cmd/gear/commands.go

@@ -334,8 +334,9 @@ func deployContainers(cmd *cobra.Command, args []string) {
 			}
 		},
 		OnSuccess: func(r *CliJobResponse, w io.Writer, job interface{}) {
-			instance, _ := changes.Instances.Find(job.(*http.HttpInstallContainerRequest).InstallContainerRequest.Id)
-			if pairs, ok := r.Pending["Ports"].(port.PortPairs); ok {
+			installJob := job.(*http.HttpInstallContainerRequest)
+			instance, _ := changes.Instances.Find(installJob.Id)
+			if pairs, ok := installJob.PortMappingsFrom(r.Pending); ok {
 				if !instance.Ports.Update(pairs) {
 					fmt.Fprintf(os.Stderr, "Not all ports listed %+v were returned by the server %+v", instance.Ports, pairs)
 				}

contrib/build

@@ -61,13 +61,15 @@ else
 	go install -tags "$tags" github.com/openshift/geard/cmd/gear
 	go install -tags "$tags" github.com/openshift/geard/cmd/switchns
 	go install -tags "$tags" github.com/openshift/geard/ssh/cmd/gear-auth-keys-command
+	echo "..done"
 
 	if $copy_binaries; then
+		echo "Copying binaries.."
 		sudo /usr/bin/cp -f $ORIG_GOPATH/bin/gear-auth-keys-command /usr/sbin/
 		sudo /usr/bin/cp -f $ORIG_GOPATH/bin/switchns /usr/bin
 		sudo /usr/bin/cp -f $ORIG_GOPATH/bin/gear /usr/bin
 		sudo chmod +s /usr/bin/switchns
 		sudo restorecon -v /usr/sbin/gear-auth-keys-command /usr/bin/gear /usr/bin/switchns
+  	echo "..done"
 	fi
-	echo "..done"  
 fi

deployment/links.go

@@ -189,6 +189,7 @@ func (link containerLink) appendLinks() error {
 				if !found {
 					return errors.New(fmt.Sprintf("deployment: instance does not expose %d for link %s", port, link.String()))
 				}
+				log.Printf("appending %d on %s: %+v %+v", port, instance.Id, mapping, instance)
 
 				instance.links = append(instance.links, InstanceLink{
 					NetworkLink: containers.NetworkLink{

git/permission.go

@@ -5,7 +5,6 @@ import (
 	"github.com/openshift/geard/containers"
 	"github.com/openshift/geard/ssh"
 	"github.com/openshift/geard/utils"
-	"log"
 	"os"
 )
 
@@ -30,7 +29,6 @@ func (r repositoryPermission) CreatePermission(locator ssh.KeyLocator, value *ut
 		}
 	}
 
-	log.Printf("debug: Id %s", p.Id)
 	id, err := containers.NewIdentifier(p.Id)
 	if err != nil {
 		return err

http/marshal.go

@@ -39,12 +39,12 @@ func (h *HttpInstallContainerRequest) MarshalHttpRequestBody(w io.Writer) error
 func (h *HttpInstallContainerRequest) UnmarshalHttpResponse(headers http.Header, r io.Reader, mode ResponseContentMode) (interface{}, error) {
 	if r == nil {
 		pending := make(map[string]interface{})
-		if s := headers.Get("X-PortMapping"); s != "" {
+		if s := headers.Get("X-" + jobs.PendingPortMappingName); s != "" {
 			ports, err := port.FromPortPairHeader(s)
 			if err != nil {
 				return nil, err
 			}
-			pending["Ports"] = ports
+			pending[jobs.PendingPortMappingName] = ports
 		}
 		return pending, nil
 	}

jobs/install_container.go

@@ -16,6 +16,8 @@ import (
 
 var ErrContainerCreateFailedPortsReserved = SimpleJobError{JobResponseError, "Unable to create container: some ports could not be reserved."}
 
+const PendingPortMappingName = "PortMapping"
+
 // Installing a Container
 //
 // This job will install a given container definition as a systemd service unit,
@@ -184,7 +186,7 @@ func (req *InstallContainerRequest) Execute(resp JobResponse) {
 		return
 	}
 	if len(reserved) > 0 {
-		resp.WritePendingSuccess("PortMapping", reserved)
+		resp.WritePendingSuccess(PendingPortMappingName, reserved)
 	}
 
 	var portSpec string
@@ -359,3 +361,8 @@ func (j *InstallContainerRequest) Join(job Job, complete <-chan bool) (joined bo
 	joined = true
 	return
 }
+
+func (j *InstallContainerRequest) PortMappingsFrom(pending map[string]interface{}) (port.PortPairs, bool) {
+	p, ok := pending[PendingPortMappingName].(port.PortPairs)
+	return p, ok
+}

port/port.go

@@ -65,7 +65,7 @@ func NewHostPort(hostport string) (HostPort, error) {
 }
 
 func (hostport HostPort) String() string {
-	return net.JoinHostPort(hostport.Host, string(hostport.Port))
+	return net.JoinHostPort(hostport.Host, hostport.Port.String())
 }
 
 func (hostport HostPort) Empty() bool {