openshift
diff --git a/‎hack/import-restrictions.json
Lines changed: 15 additions & 3 deletions b/‎hack/import-restrictions.json
Lines changed: 15 additions & 3 deletions
diff --git a/‎pkg/cmd/server/start/start_allinone.go
Lines changed: 1 addition & 1 deletion b/‎pkg/cmd/server/start/start_allinone.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/openservicebroker/cmd/server/start.go renamed to ‎pkg/templateservicebroker/cmd/server/start.go
Lines changed: 1 addition & 1 deletion b/‎pkg/openservicebroker/cmd/server/start.go renamed to ‎pkg/templateservicebroker/cmd/server/start.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/openservicebroker/OWNERS renamed to ‎pkg/templateservicebroker/openservicebroker/OWNERS b/‎pkg/openservicebroker/OWNERS renamed to ‎pkg/templateservicebroker/openservicebroker/OWNERS
diff --git a/‎pkg/openservicebroker/api/helpers.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/helpers.go b/‎pkg/openservicebroker/api/helpers.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/helpers.go
diff --git a/‎pkg/openservicebroker/api/types.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/types.go b/‎pkg/openservicebroker/api/types.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/types.go
diff --git a/‎pkg/openservicebroker/api/validation.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/validation.go b/‎pkg/openservicebroker/api/validation.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/validation.go
diff --git a/‎pkg/openservicebroker/api/validation_test.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/validation_test.go b/‎pkg/openservicebroker/api/validation_test.go renamed to ‎pkg/templateservicebroker/openservicebroker/api/validation_test.go
diff --git a/‎pkg/openservicebroker/client/client.go renamed to ‎pkg/templateservicebroker/openservicebroker/client/client.go
Lines changed: 1 addition & 1 deletion b/‎pkg/openservicebroker/client/client.go renamed to ‎pkg/templateservicebroker/openservicebroker/client/client.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/openservicebroker/server/apiserver.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/apiserver.go
Lines changed: 1 addition & 1 deletion b/‎pkg/openservicebroker/server/apiserver.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/apiserver.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/openservicebroker/server/route.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/route.go
Lines changed: 1 addition & 1 deletion b/‎pkg/openservicebroker/server/route.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/route.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/openservicebroker/server/route_test.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/route_test.go
Lines changed: 4 additions & 2 deletions b/‎pkg/openservicebroker/server/route_test.go renamed to ‎pkg/templateservicebroker/openservicebroker/server/route_test.go
Lines changed: 4 additions & 2 deletions
diff --git a/‎pkg/template/servicebroker/README.md renamed to ‎pkg/templateservicebroker/servicebroker/README.md b/‎pkg/template/servicebroker/README.md renamed to ‎pkg/templateservicebroker/servicebroker/README.md
diff --git a/‎pkg/template/servicebroker/bind.go renamed to ‎pkg/templateservicebroker/servicebroker/bind.go
Lines changed: 3 additions & 3 deletions b/‎pkg/template/servicebroker/bind.go renamed to ‎pkg/templateservicebroker/servicebroker/bind.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎pkg/template/servicebroker/bind_test.go renamed to ‎pkg/templateservicebroker/servicebroker/bind_test.go b/‎pkg/template/servicebroker/bind_test.go renamed to ‎pkg/templateservicebroker/servicebroker/bind_test.go
diff --git a/‎pkg/template/servicebroker/catalog.go renamed to ‎pkg/templateservicebroker/servicebroker/catalog.go
Lines changed: 1 addition & 1 deletion b/‎pkg/template/servicebroker/catalog.go renamed to ‎pkg/templateservicebroker/servicebroker/catalog.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/template/servicebroker/catalog_test.go renamed to ‎pkg/templateservicebroker/servicebroker/catalog_test.go
Lines changed: 1 addition & 1 deletion b/‎pkg/template/servicebroker/catalog_test.go renamed to ‎pkg/templateservicebroker/servicebroker/catalog_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/template/servicebroker/deprovision.go renamed to ‎pkg/templateservicebroker/servicebroker/deprovision.go
Lines changed: 3 additions & 2 deletions b/‎pkg/template/servicebroker/deprovision.go renamed to ‎pkg/templateservicebroker/servicebroker/deprovision.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎pkg/template/servicebroker/lastoperation.go renamed to ‎pkg/templateservicebroker/servicebroker/lastoperation.go
Lines changed: 4 additions & 3 deletions b/‎pkg/template/servicebroker/lastoperation.go renamed to ‎pkg/templateservicebroker/servicebroker/lastoperation.go
Lines changed: 4 additions & 3 deletions
diff --git a/‎pkg/template/servicebroker/provision.go renamed to ‎pkg/templateservicebroker/servicebroker/provision.go
Lines changed: 3 additions & 2 deletions b/‎pkg/template/servicebroker/provision.go renamed to ‎pkg/templateservicebroker/servicebroker/provision.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎pkg/template/servicebroker/servicebroker.go renamed to ‎pkg/templateservicebroker/servicebroker/servicebroker.go
Lines changed: 1 addition & 1 deletion b/‎pkg/template/servicebroker/servicebroker.go renamed to ‎pkg/templateservicebroker/servicebroker/servicebroker.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/template/servicebroker/test-scripts/README.md renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/README.md b/‎pkg/template/servicebroker/test-scripts/README.md renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/README.md
diff --git a/‎pkg/template/servicebroker/test-scripts/bind.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/bind.sh b/‎pkg/template/servicebroker/test-scripts/bind.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/bind.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/catalog.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/catalog.sh b/‎pkg/template/servicebroker/test-scripts/catalog.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/catalog.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/clusterrole.yaml renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/clusterrole.yaml b/‎pkg/template/servicebroker/test-scripts/clusterrole.yaml renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/clusterrole.yaml
diff --git a/‎pkg/template/servicebroker/test-scripts/deprovision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/deprovision.sh b/‎pkg/template/servicebroker/test-scripts/deprovision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/deprovision.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/lastoperation-provision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/lastoperation-provision.sh b/‎pkg/template/servicebroker/test-scripts/lastoperation-provision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/lastoperation-provision.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/provision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/provision.sh b/‎pkg/template/servicebroker/test-scripts/provision.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/provision.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/shared.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/shared.sh b/‎pkg/template/servicebroker/test-scripts/shared.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/shared.sh
diff --git a/‎pkg/template/servicebroker/test-scripts/unbind.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/unbind.sh b/‎pkg/template/servicebroker/test-scripts/unbind.sh renamed to ‎pkg/templateservicebroker/servicebroker/test-scripts/unbind.sh
diff --git a/‎pkg/template/servicebroker/unbind.go renamed to ‎pkg/templateservicebroker/servicebroker/unbind.go
Lines changed: 3 additions & 2 deletions b/‎pkg/template/servicebroker/unbind.go renamed to ‎pkg/templateservicebroker/servicebroker/unbind.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎pkg/template/servicebroker/validation.go renamed to ‎pkg/templateservicebroker/servicebroker/validation.go
Lines changed: 1 addition & 1 deletion b/‎pkg/template/servicebroker/validation.go renamed to ‎pkg/templateservicebroker/servicebroker/validation.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/template/servicebroker/validation_test.go renamed to ‎pkg/templateservicebroker/servicebroker/validation_test.go
Lines changed: 1 addition & 1 deletion b/‎pkg/template/servicebroker/validation_test.go renamed to ‎pkg/templateservicebroker/servicebroker/validation_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/extended/templates/helpers.go
Lines changed: 1 addition & 1 deletion b/‎test/extended/templates/helpers.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/extended/templates/templateservicebroker_e2e.go
Lines changed: 2 additions & 2 deletions b/‎test/extended/templates/templateservicebroker_e2e.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/extended/templates/templateservicebroker_security.go
Lines changed: 2 additions & 2 deletions b/‎test/extended/templates/templateservicebroker_security.go
Lines changed: 2 additions & 2 deletions
@@ -219,7 +219,7 @@
 
   {
     "checkedPackageRoots": [
-      "github.com/openshift/origin/pkg/openservicebroker"
+      "github.com/openshift/origin/pkg/templateservicebroker"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
@@ -228,16 +228,28 @@
       "vendor/github.com/spf13/cobra",
       "vendor/golang.org",
       "github.com/openshift/origin/pkg/template/generated",
-      "github.com/openshift/origin/pkg/template/servicebroker"
+      "github.com/openshift/origin/pkg/template/servicebroker",
+      "github.com/openshift/origin/pkg/route/generated"
     ],
     "allowedImportPackages": [
       "vendor/github.com/golang/glog",
+      "vendor/k8s.io/kubernetes/pkg/api",
+      "vendor/k8s.io/kubernetes/pkg/apis/authorization",
+      "vendor/k8s.io/kubernetes/pkg/client/clientset_generated/clientset",
+      "vendor/k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset",
       "vendor/github.com/emicklei/go-restful",
       "vendor/github.com/lestrrat/go-jsschema",
       "vendor/k8s.io/kubernetes/pkg/controller",
       "vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util",
       "github.com/openshift/origin/pkg/api",
-      "github.com/openshift/origin/pkg/template/apis/template"
+      "github.com/openshift/origin/pkg/template/apis/template",
+      "github.com/openshift/origin/pkg/cmd/server/bootstrappolicy",
+      "github.com/openshift/origin/pkg/template/apis/template",
+      "github.com/openshift/origin/pkg/authorization/util",
+      "github.com/openshift/origin/pkg/template/apis/template/validation",
+      "github.com/openshift/origin/pkg/user/apis/user/validation",
+      "github.com/openshift/origin/pkg/route/apis/route",
+      "github.com/openshift/origin/pkg/serviceaccounts"
     ]
   }
 ]
@@ -27,7 +27,7 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 	"github.com/openshift/origin/pkg/cmd/server/start/kubernetes"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	tsbcmd "github.com/openshift/origin/pkg/openservicebroker/cmd/server"
+	tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 
@@ -20,9 +20,9 @@ import (
 
 	"io/ioutil"
 
-	"github.com/openshift/origin/pkg/openservicebroker/server"
 	"github.com/openshift/origin/pkg/template/servicebroker/apis/config"
 	configinstall "github.com/openshift/origin/pkg/template/servicebroker/apis/config/install"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/server"
 )
 
 type TemplateServiceBrokerServerOptions struct {
 
@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apiserver/pkg/authentication/user"
 
-	"github.com/openshift/origin/pkg/openservicebroker/api"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 type Client interface {
 
@@ -18,7 +18,7 @@ import (
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templateinformer "github.com/openshift/origin/pkg/template/generated/informers/internalversion"
 	templateinternalclientset "github.com/openshift/origin/pkg/template/generated/internalclientset"
-	templateservicebroker "github.com/openshift/origin/pkg/template/servicebroker"
+	templateservicebroker "github.com/openshift/origin/pkg/templateservicebroker/servicebroker"
 )
 
 // TODO: this file breaks the layering of pkg/openservicebroker and
 
@@ -14,8 +14,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apiserver/pkg/authentication/user"
 
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // minimum supported client version
 
@@ -11,9 +11,11 @@ import (
 	"testing"
 
 	restful "github.com/emicklei/go-restful"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
-	"github.com/openshift/origin/pkg/openservicebroker/client"
+
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/client"
 )
 
 const validUUID = "decd59a9-1dd2-453e-942e-2deba96bfa96"
 
@@ -3,13 +3,14 @@ package servicebroker
 import (
 	"bytes"
 	"encoding/base64"
-
 	"errors"
 	"fmt"
 	"net/http"
 	"reflect"
 	"strings"
 
+	"github.com/golang/glog"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -21,11 +22,10 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/authorization"
 
-	"github.com/golang/glog"
 	"github.com/openshift/origin/pkg/authorization/util"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 	uservalidation "github.com/openshift/origin/pkg/user/apis/user/validation"
 )
 
 
@@ -10,8 +10,8 @@ import (
 	jsschema "github.com/lestrrat/go-jsschema"
 
 	oapi "github.com/openshift/origin/pkg/api"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 const (
 
@@ -8,8 +8,8 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 func TestServiceFromTemplate(t *testing.T) {
 
@@ -3,16 +3,17 @@ package servicebroker
 import (
 	"net/http"
 
+	"github.com/golang/glog"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authentication/user"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/authorization"
 
-	"github.com/golang/glog"
 	"github.com/openshift/origin/pkg/authorization/util"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // Deprovision is the reverse of Provision.  We clean up the TemplateInstance,
 
@@ -5,15 +5,16 @@ import (
 	"net/http"
 
 	"github.com/golang/glog"
-	"github.com/openshift/origin/pkg/authorization/util"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
-	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authentication/user"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/authorization"
+
+	"github.com/openshift/origin/pkg/authorization/util"
+	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // LastOperation returns the status of an asynchronous operation.  Currently
 
@@ -4,17 +4,18 @@ import (
 	"net/http"
 	"reflect"
 
+	"github.com/golang/glog"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apiserver/pkg/authentication/user"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/authorization"
 
-	"github.com/golang/glog"
 	"github.com/openshift/origin/pkg/authorization/util"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 	uservalidation "github.com/openshift/origin/pkg/user/apis/user/validation"
 )
 
 
@@ -13,13 +13,13 @@ import (
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	extrouteclientset "github.com/openshift/origin/pkg/route/generated/clientset/typed/route/v1"
 	"github.com/openshift/origin/pkg/serviceaccounts"
 	templateinformer "github.com/openshift/origin/pkg/template/generated/informers/internalversion/template/internalversion"
 	templateclientset "github.com/openshift/origin/pkg/template/generated/internalclientset"
 	internalversiontemplate "github.com/openshift/origin/pkg/template/generated/internalclientset/typed/template/internalversion"
 	templatelister "github.com/openshift/origin/pkg/template/generated/listers/template/internalversion"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // Broker represents the template service broker.  It implements
 
@@ -3,15 +3,16 @@ package servicebroker
 import (
 	"net/http"
 
+	"github.com/golang/glog"
+
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/kubernetes/pkg/apis/authorization"
 
-	"github.com/golang/glog"
 	"github.com/openshift/origin/pkg/authorization/util"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // Unbind is the reverse of Bind.  Currently it simply removes the binding ID
 
@@ -5,9 +5,9 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	"github.com/openshift/origin/pkg/openservicebroker/api"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templatevalidation "github.com/openshift/origin/pkg/template/apis/template/validation"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 // ValidateProvisionRequest ensures that a ProvisionRequest is valid, beyond
 
@@ -3,7 +3,7 @@ package servicebroker
 import (
 	"testing"
 
-	"github.com/openshift/origin/pkg/openservicebroker/api"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
 )
 
 const validUUID = "4f8a47f7-900f-48b4-aad1-865760feaa04"
 
@@ -21,8 +21,8 @@ import (
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
-	osbclient "github.com/openshift/origin/pkg/openservicebroker/client"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	osbclient "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/client"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
@@ -17,11 +17,11 @@ import (
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
-	"github.com/openshift/origin/pkg/openservicebroker/client"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templateapiv1 "github.com/openshift/origin/pkg/template/apis/template/v1"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/client"
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
 
@@ -16,9 +16,9 @@ import (
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
-	"github.com/openshift/origin/pkg/openservicebroker/api"
-	"github.com/openshift/origin/pkg/openservicebroker/client"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"
+	"github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/client"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
 	exutil "github.com/openshift/origin/test/extended/util"
 )
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/openshift/origin/pkg/cmd/server/crypto"`
`28`	`28`	`"github.com/openshift/origin/pkg/cmd/server/start/kubernetes"`
`29`	`29`	`cmdutil "github.com/openshift/origin/pkg/cmd/util"`
`30`		`- tsbcmd "github.com/openshift/origin/pkg/openservicebroker/cmd/server"`
	`30`	`+ tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"`
`31`	`31`	`"k8s.io/apimachinery/pkg/util/wait"`
`32`	`32`	`)`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ import (`
`20`	`20`
`21`	`21`	`"io/ioutil"`
`22`	`22`
`23`		`- "github.com/openshift/origin/pkg/openservicebroker/server"`
`24`	`23`	`"github.com/openshift/origin/pkg/template/servicebroker/apis/config"`
`25`	`24`	`configinstall "github.com/openshift/origin/pkg/template/servicebroker/apis/config/install"`
	`25`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/server"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`type TemplateServiceBrokerServerOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`14`	`14`	`"k8s.io/apiserver/pkg/authentication/user"`
`15`	`15`
`16`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
	`16`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`type Client interface {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
`19`	`19`	`templateinformer "github.com/openshift/origin/pkg/template/generated/informers/internalversion"`
`20`	`20`	`templateinternalclientset "github.com/openshift/origin/pkg/template/generated/internalclientset"`
`21`		`- templateservicebroker "github.com/openshift/origin/pkg/template/servicebroker"`
	`21`	`+ templateservicebroker "github.com/openshift/origin/pkg/templateservicebroker/servicebroker"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// TODO: this file breaks the layering of pkg/openservicebroker and`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`15`	`15`	`"k8s.io/apiserver/pkg/authentication/user"`
`16`	`16`
`17`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
`18`	`17`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
	`18`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// minimum supported client version`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`jsschema "github.com/lestrrat/go-jsschema"`
`11`	`11`
`12`	`12`	`oapi "github.com/openshift/origin/pkg/api"`
`13`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
`14`	`13`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
	`14`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`
`9`	`9`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`10`	`10`
`11`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
`12`	`11`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
	`12`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestServiceFromTemplate(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`
`6`	`6`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`7`	`7`
`8`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
`9`	`8`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
`10`	`9`	`templatevalidation "github.com/openshift/origin/pkg/template/apis/template/validation"`
	`10`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ValidateProvisionRequest ensures that a ProvisionRequest is valid, beyond`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package servicebroker`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/openshift/origin/pkg/openservicebroker/api"`
	`6`	`+ "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/api"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const validUUID = "4f8a47f7-900f-48b4-aad1-865760feaa04"`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import (`
`21`	`21`	`e2e "k8s.io/kubernetes/test/e2e/framework"`
`22`	`22`
`23`	`23`	`authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"`
`24`		`- osbclient "github.com/openshift/origin/pkg/openservicebroker/client"`
`25`	`24`	`templateapi "github.com/openshift/origin/pkg/template/apis/template"`
	`25`	`+ osbclient "github.com/openshift/origin/pkg/templateservicebroker/openservicebroker/client"`
`26`	`26`	`userapi "github.com/openshift/origin/pkg/user/apis/user"`
`27`	`27`	`exutil "github.com/openshift/origin/test/extended/util"`
`28`	`28`	`)`