state: add, test payloads functionality

Removed original payload persistence component and registration.
nammn · Jun 18, 2016 · d36789d · d36789d
1 parent e60fa83
commit d36789d
Show file tree

Hide file tree

Showing 28 changed files with 1,049 additions and 2,165 deletions.
diff --git a/component/all/payload.go b/component/all/payload.go
@@ -20,8 +20,6 @@ import (
 	internalserver "github.com/juju/juju/payload/api/private/server"
 	"github.com/juju/juju/payload/api/server"
 	"github.com/juju/juju/payload/context"
-	"github.com/juju/juju/payload/persistence"
-	payloadstate "github.com/juju/juju/payload/state"
 	"github.com/juju/juju/payload/status"
 	"github.com/juju/juju/state"
 	unitercontext "github.com/juju/juju/worker/uniter/runner/context"
@@ -33,7 +31,6 @@ const payloadsHookContextFacade = payload.ComponentName + "-hook-context"
 type payloads struct{}
 
 func (c payloads) registerForServer() error {
-	c.registerState()
 	c.registerPublicFacade()
 
 	c.registerHookContext()
@@ -47,7 +44,7 @@ func (c payloads) registerForClient() error {
 }
 
 func (payloads) newPublicFacade(st *state.State, resources *common.Resources, authorizer common.Authorizer) (*server.PublicAPI, error) {
-	up, err := st.EnvPayloads()
+	up, err := st.ModelPayloads()
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -195,25 +192,3 @@ func (payloads) registerHookContextCommands() {
 		return cmd, nil
 	})
 }
-
-func (payloads) registerState() {
-	if !markRegistered(payload.ComponentName, "state") {
-		return
-	}
-
-	newUnitPayloads := func(db state.Persistence, unit, machine string) (state.UnitPayloads, error) {
-		persist := persistence.NewPersistence(db)
-		unitPersist := persistence.NewUnitPersistence(persist, unit)
-		return payloadstate.NewUnitPayloads(unitPersist, unit, machine), nil
-	}
-
-	newEnvPayloads := func(db state.Persistence) (state.EnvPayloads, error) {
-		persist := persistence.NewPersistence(db)
-		envPayloads := payloadstate.EnvPayloads{
-			Persist: persist,
-		}
-		return envPayloads, nil
-	}
-
-	state.SetPayloadsComponent(newEnvPayloads, newUnitPayloads)
-}
diff --git a/payload/persistence/base_test.go b/payload/persistence/base_test.go
diff --git a/payload/persistence/mongo.go b/payload/persistence/mongo.go