Renaming vt/topotools to vt/topo/helpers.

go/cmd/topo2topo/topo2topo.go

@@ -11,7 +11,7 @@ import (
 	log "github.com/golang/glog"
 	"github.com/youtube/vitess/go/tb"
 	"github.com/youtube/vitess/go/vt/topo"
-	"github.com/youtube/vitess/go/vt/topotools"
+	"github.com/youtube/vitess/go/vt/topo/helpers"
 )
 
 var fromTopo = flag.String("from", "", "topology to copy data from")
@@ -46,15 +46,15 @@ func main() {
 	toTS := topo.GetServerByName(*toTopo)
 
 	if *doKeyspaces {
-		topotools.CopyKeyspaces(fromTS, toTS)
+		helpers.CopyKeyspaces(fromTS, toTS)
 	}
 	if *doShards {
-		topotools.CopyShards(fromTS, toTS, *deleteKeyspaceShards)
+		helpers.CopyShards(fromTS, toTS, *deleteKeyspaceShards)
 	}
 	if *doShardReplications {
-		topotools.CopyShardReplications(fromTS, toTS)
+		helpers.CopyShardReplications(fromTS, toTS)
 	}
 	if *doTablets {
-		topotools.CopyTablets(fromTS, toTS)
+		helpers.CopyTablets(fromTS, toTS)
 	}
 }

go/vt/topo/helpers/copy.go

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// topotools package contains a few utility classes to handle topo.Server
-// objects, and transitions.
-package topotools
+// helpers package contains a few utility classes to handle topo.Server
+// objects, and transitions from one topo implementation to another.
+package helpers
 
 import (
 	"fmt"

go/vt/topo/helpers/copy_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package topotools
+package helpers
 
 import (
 	"os"
@@ -87,7 +87,7 @@ func createSetup(t *testing.T) (topo.Server, topo.Server) {
 		t.Fatalf("cannot create slave tablet: %v", err)
 	}
 
-	os.Setenv("ZK_CLIENT_CONFIG", testfiles.Locate("topotools_test_zk_client.json"))
+	os.Setenv("ZK_CLIENT_CONFIG", testfiles.Locate("topo_helpers_test_zk_client.json"))
 	cells, err := fromTS.GetKnownCells()
 	if err != nil {
 		t.Fatalf("fromTS.GetKnownCells: %v", err)

go/vt/topo/helpers/tee.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package topotools
+package helpers
 
 import (
 	"fmt"

go/vt/topo/helpers/tee_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package topotools
+package helpers
 
 import (
 	"reflect"

go/vt/topo/helpers/tee_topo_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package topotools
+package helpers
 
 import (
 	"fmt"