From 3613483222cf12f62171544e4d81fee616b471b0 Mon Sep 17 00:00:00 2001
From: Tom Denham <tom.denham@metaswitch.com>
Date: Mon, 1 Jun 2015 15:35:57 -0700
Subject: [PATCH] Update remote driver to use destiantion prefix.

Required since #193

Signedeoff-by: Tom Denham <tom.denham@metaswitch.com>
---
 drivers/remote/driver.go      | 2 +-
 drivers/remote/driver_test.go | 6 +++---
 drivers/remote/messages.go    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/remote/driver.go b/drivers/remote/driver.go
index ffeb720..44c9356 100644
--- a/drivers/remote/driver.go
+++ b/drivers/remote/driver.go
@@ -168,7 +168,7 @@ func (d *driver) Join(nid, eid types.UUID, sboxKey string, jinfo driverapi.JoinI
 			return fmt.Errorf("no correlating interface %d in supplied interface names", i)
 		}
 		supplied := ifaceNames[i]
-		if err := iface.SetNames(supplied.SrcName, supplied.DstName); err != nil {
+		if err := iface.SetNames(supplied.SrcName, supplied.DstPrefix); err != nil {
 			return errorWithRollback(fmt.Sprintf("failed to set interface name: %s", err), d.Leave(nid, eid))
 		}
 	}
diff --git a/drivers/remote/driver_test.go b/drivers/remote/driver_test.go
index 27703ea..671821e 100644
--- a/drivers/remote/driver_test.go
+++ b/drivers/remote/driver_test.go
@@ -144,7 +144,7 @@ func (test *testEndpoint) SetNames(src string, dst string) error {
 		test.t.Fatalf(`Wrong SrcName; expected "%s", got "%s"`, test.src, src)
 	}
 	if test.dst != dst {
-		test.t.Fatalf(`Wrong DstName; expected "%s", got "%s"`, test.dst, dst)
+		test.t.Fatalf(`Wrong DstPrefix; expected "%s", got "%s"`, test.dst, dst)
 	}
 	return nil
 }
@@ -217,8 +217,8 @@ func TestRemoteDriver(t *testing.T) {
 			"ResolvConfPath": ep.resolvConfPath,
 			"InterfaceNames": []map[string]interface{}{
 				map[string]interface{}{
-					"SrcName": ep.src,
-					"DstName": ep.dst,
+					"SrcName":   ep.src,
+					"DstPrefix": ep.dst,
 				},
 			},
 		}
diff --git a/drivers/remote/messages.go b/drivers/remote/messages.go
index 8e03a16..fdf0c49 100644
--- a/drivers/remote/messages.go
+++ b/drivers/remote/messages.go
@@ -120,8 +120,8 @@ type joinRequest struct {
 }
 
 type ifaceName struct {
-	SrcName string
-	DstName string
+	SrcName   string
+	DstPrefix string
 }
 
 type joinResponse struct {