Use new locket Client for Presence/Locks

[#102329896]

Signed-off-by: Andrew Edgar <[email protected]>

Author: jfmyers9

cmd/bbs/main.go

@@ -203,7 +203,7 @@ func initializeLockMaintainer(logger lager.Logger, client *api.Client, sessionMa
 	if err != nil {
 		logger.Fatal("Couldn't create consul session", err)
 	}
-	presenceManager := locket.New(session, clock.NewClock(), logger)
+	presenceManager := locket.NewClient(session, clock.NewClock(), logger)
 
 	uuid, err := uuid.NewV4()
 	if err != nil {

cmd/bbs/master_lock_test.go

@@ -2,7 +2,7 @@ package main_test
 
 import (
 	"github.com/cloudfoundry-incubator/bbs/cmd/bbs/testrunner"
-	"github.com/cloudfoundry-incubator/runtime-schema/bbs/shared"
+	"github.com/cloudfoundry-incubator/locket"
 	"github.com/tedsuo/ifrit/ginkgomon"
 
 	. "github.com/onsi/ginkgo"
@@ -12,7 +12,7 @@ import (
 var _ = Describe("MasterLock", func() {
 	Context("when the bbs cannot obtain the bbs lock", func() {
 		BeforeEach(func() {
-			err := consulSession.AcquireLock(shared.LockSchemaPath("bbs_lock"), []byte{})
+			err := consulSession.AcquireLock(locket.LockSchemaPath("bbs_lock"), []byte{})
 			Expect(err).NotTo(HaveOccurred())
 
 			bbsRunner = testrunner.New(bbsBinPath, bbsArgs)

cmd/bbs/ping_test.go

@@ -2,7 +2,7 @@ package main_test
 
 import (
 	"github.com/cloudfoundry-incubator/bbs/cmd/bbs/testrunner"
-	"github.com/cloudfoundry-incubator/runtime-schema/bbs/shared"
+	"github.com/cloudfoundry-incubator/locket"
 	"github.com/tedsuo/ifrit/ginkgomon"
 
 	. "github.com/onsi/ginkgo"
@@ -30,7 +30,7 @@ var _ = Describe("Ping API", func() {
 
 		Context("when the BBS Server is not the leader", func() {
 			BeforeEach(func() {
-				err := consulSession.AcquireLock(shared.LockSchemaPath("bbs_lock"), []byte{})
+				err := consulSession.AcquireLock(locket.LockSchemaPath("bbs_lock"), []byte{})
 				Expect(err).NotTo(HaveOccurred())
 
 				bbsRunner = testrunner.New(bbsBinPath, bbsArgs)

db/consul/cells_loader_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/cloudfoundry-incubator/bbs/db"
 	"github.com/cloudfoundry-incubator/bbs/models"
-	"github.com/cloudfoundry-incubator/runtime-schema/bbs/services_bbs"
+	"github.com/cloudfoundry-incubator/locket"
 	oldmodels "github.com/cloudfoundry-incubator/runtime-schema/models"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -24,7 +24,7 @@ var _ = Describe("CellsLoader", func() {
 		var (
 			clock *fakeclock.FakeClock
 
-			bbs                *services_bbs.ServicesBBS
+			locketClient       locket.Client
 			presence1          ifrit.Process
 			presence2          ifrit.Process
 			firstCellPresence  oldmodels.CellPresence
@@ -35,7 +35,7 @@ var _ = Describe("CellsLoader", func() {
 		BeforeEach(func() {
 			logger = lagertest.NewTestLogger("test")
 			clock = fakeclock.NewFakeClock(time.Now())
-			bbs = services_bbs.New(consulSession, clock, logger)
+			locketClient = locket.NewClient(consulSession, clock, logger)
 
 			firstCellPresence = oldmodels.NewCellPresence("first-rep", "1.2.3.4", "the-zone", oldmodels.NewCellCapacity(128, 1024, 3), []string{}, []string{})
 			secondCellPresence = oldmodels.NewCellPresence("second-rep", "4.5.6.7", "the-zone", oldmodels.NewCellCapacity(128, 1024, 3), []string{}, []string{})
@@ -57,10 +57,10 @@ var _ = Describe("CellsLoader", func() {
 
 			BeforeEach(func() {
 				cellsLoader = consulDB.NewCellsLoader(logger)
-				presence1 = ifrit.Invoke(bbs.NewCellPresence(firstCellPresence, retryInterval))
+				presence1 = ifrit.Invoke(locketClient.NewCellPresence(firstCellPresence, retryInterval))
 
 				Eventually(func() ([]oldmodels.CellPresence, error) {
-					return bbs.Cells()
+					return locketClient.Cells()
 				}).Should(HaveLen(1))
 
 				cells, err = cellsLoader.Cells()
@@ -74,10 +74,10 @@ var _ = Describe("CellsLoader", func() {
 
 			Context("when one more cell is added", func() {
 				BeforeEach(func() {
-					presence2 = ifrit.Invoke(bbs.NewCellPresence(secondCellPresence, retryInterval))
+					presence2 = ifrit.Invoke(locketClient.NewCellPresence(secondCellPresence, retryInterval))
 
 					Eventually(func() ([]oldmodels.CellPresence, error) {
-						return bbs.Cells()
+						return locketClient.Cells()
 					}).Should(HaveLen(2))
 				})