Skip to content

Commit

Permalink
apiserver: organise facades
Browse files Browse the repository at this point in the history
Organise facades into subdirectories:
 - facades/agent
 - facades/client
 - facades/controller

There are a few facades that do not have
an obvious home:

 - storageprovisioner is run by the controllers
   (for model-level storage), and on machine
   agents (for machine-level storage).
 - imagemetadata is, unfortunately, serving two
   purposes: it serves the client, for listing,
   adding and removing image metadata; and it
   serves the image metadata worker. Because the
   image metadata client code is behind a feature
   flag, we could probably break API compatibility,
   and make it worker-only. I've left it alone for
   now, and put it in the facades/client package.
 - migrationtarget is for controllers to talk to
   each other, but it accepts only client
   authentication. Nevertheless, I've put it in the
   facades/controller package.

And then there were some bugs in facade auth:

 - logfwd was using AuthMachineAgent, and should
   have used AuthController. It has been updated
   to use the latter.
 - payloads had no auth at all; it has been updated
   to use AuthClient.
 - metricsmanager and undertaker: redundant calls
   to AuthMachineAgent, when AuthController would
   do. Simplified.
 - charmrevisionupdater: was allowing non-controller
   agents, now does not.
 - keymanager and highavailability: both were allowing
   controller unnecessarily; dropped.
  • Loading branch information
axw committed Jul 11, 2017
1 parent 2929f66 commit 6e125a7
Show file tree
Hide file tree
Showing 387 changed files with 229 additions and 231 deletions.
2 changes: 1 addition & 1 deletion api/agent/machine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/juju/juju/api"
apiagent "github.com/juju/juju/api/agent"
apiserveragent "github.com/juju/juju/apiserver/agent"
apiserveragent "github.com/juju/juju/apiserver/facades/agent/agent"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/juju/testing"
"github.com/juju/juju/mongo"
Expand Down
2 changes: 1 addition & 1 deletion api/backups/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/backups"
apiserverbackups "github.com/juju/juju/apiserver/backups"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
"github.com/juju/juju/apiserver/params"
backupstesting "github.com/juju/juju/state/backups/testing"
)
Expand Down
2 changes: 1 addition & 1 deletion api/backups/info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/backups"
apiserverbackups "github.com/juju/juju/apiserver/backups"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
"github.com/juju/juju/apiserver/params"
)

Expand Down
2 changes: 1 addition & 1 deletion api/backups/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/backups"
apiserverbackups "github.com/juju/juju/apiserver/backups"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
"github.com/juju/juju/apiserver/params"
)

Expand Down
2 changes: 1 addition & 1 deletion api/backups/upload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

apiserverbackups "github.com/juju/juju/apiserver/backups"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
)

type uploadSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion api/charmrevisionupdater/updater_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/api/charmrevisionupdater"
"github.com/juju/juju/apiserver/charmrevisionupdater/testing"
"github.com/juju/juju/apiserver/facades/controller/charmrevisionupdater/testing"
jujutesting "github.com/juju/juju/juju/testing"
"github.com/juju/juju/state"
)
Expand Down
4 changes: 2 additions & 2 deletions api/keymanager/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/keymanager"
keymanagerserver "github.com/juju/juju/apiserver/keymanager"
keymanagertesting "github.com/juju/juju/apiserver/keymanager/testing"
keymanagerserver "github.com/juju/juju/apiserver/facades/client/keymanager"
keymanagertesting "github.com/juju/juju/apiserver/facades/client/keymanager/testing"
"github.com/juju/juju/apiserver/params"
jujutesting "github.com/juju/juju/juju/testing"
"github.com/juju/juju/rpc"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/juju/juju/apiserver/authentication"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/apiserver/facades/agent/presence"
"github.com/juju/juju/apiserver/observer"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/apiserver/presence"
"github.com/juju/juju/permission"
"github.com/juju/juju/rpc/rpcreflect"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
apitesting "github.com/juju/juju/api/testing"
"github.com/juju/juju/apiserver"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/controller"
"github.com/juju/juju/apiserver/facades/client/controller"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/constraints"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
136 changes: 68 additions & 68 deletions apiserver/allfacades.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,76 +10,76 @@ import (
"github.com/juju/utils/featureflag"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/action"
"github.com/juju/juju/apiserver/agent" // ModelUser Write
"github.com/juju/juju/apiserver/agenttools"
"github.com/juju/juju/apiserver/annotations" // ModelUser Write
"github.com/juju/juju/apiserver/application" // ModelUser Write
"github.com/juju/juju/apiserver/applicationoffers"
"github.com/juju/juju/apiserver/applicationscaler"
"github.com/juju/juju/apiserver/backups" // ModelUser Write
"github.com/juju/juju/apiserver/block" // ModelUser Write
"github.com/juju/juju/apiserver/bundle"
"github.com/juju/juju/apiserver/charmrevisionupdater"
"github.com/juju/juju/apiserver/charms" // ModelUser Write
"github.com/juju/juju/apiserver/cleaner"
"github.com/juju/juju/apiserver/client" // ModelUser Write
"github.com/juju/juju/apiserver/cloud" // ModelUser Read
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/controller" // ModelUser Admin (although some methods check for read only)
"github.com/juju/juju/apiserver/crossmodelrelations"
"github.com/juju/juju/apiserver/deployer"
"github.com/juju/juju/apiserver/diskmanager"
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/apiserver/firewaller"
"github.com/juju/juju/apiserver/highavailability" // ModelUser Write
"github.com/juju/juju/apiserver/hostkeyreporter"
"github.com/juju/juju/apiserver/imagemanager" // ModelUser Write
"github.com/juju/juju/apiserver/imagemetadata"
"github.com/juju/juju/apiserver/instancepoller"
"github.com/juju/juju/apiserver/keymanager" // ModelUser Write
"github.com/juju/juju/apiserver/keyupdater"
"github.com/juju/juju/apiserver/leadership"
"github.com/juju/juju/apiserver/lifeflag"
"github.com/juju/juju/apiserver/logfwd"
loggerapi "github.com/juju/juju/apiserver/logger"
"github.com/juju/juju/apiserver/machine"
"github.com/juju/juju/apiserver/machineactions"
"github.com/juju/juju/apiserver/machinemanager" // ModelUser Write
"github.com/juju/juju/apiserver/machineundertaker"
"github.com/juju/juju/apiserver/meterstatus"
"github.com/juju/juju/apiserver/metricsadder"
"github.com/juju/juju/apiserver/metricsdebug" // ModelUser Write
"github.com/juju/juju/apiserver/metricsmanager"
"github.com/juju/juju/apiserver/migrationflag"
"github.com/juju/juju/apiserver/migrationmaster"
"github.com/juju/juju/apiserver/migrationminion"
"github.com/juju/juju/apiserver/migrationtarget" // ModelUser Write
"github.com/juju/juju/apiserver/modelconfig" // ModelUser Write
"github.com/juju/juju/apiserver/modelmanager" // ModelUser Write
"github.com/juju/juju/apiserver/modelupgrader"
"github.com/juju/juju/apiserver/payloads"
"github.com/juju/juju/apiserver/payloadshookcontext"
"github.com/juju/juju/apiserver/provisioner"
"github.com/juju/juju/apiserver/proxyupdater"
"github.com/juju/juju/apiserver/reboot"
"github.com/juju/juju/apiserver/remoterelations"
"github.com/juju/juju/apiserver/resources"
"github.com/juju/juju/apiserver/resourceshookcontext"
"github.com/juju/juju/apiserver/resumer"
"github.com/juju/juju/apiserver/retrystrategy"
"github.com/juju/juju/apiserver/singular"
"github.com/juju/juju/apiserver/spaces" // ModelUser Write
"github.com/juju/juju/apiserver/sshclient" // ModelUser Write
"github.com/juju/juju/apiserver/statushistory"
"github.com/juju/juju/apiserver/storage"
"github.com/juju/juju/apiserver/storageprovisioner"
"github.com/juju/juju/apiserver/subnets"
"github.com/juju/juju/apiserver/undertaker"
"github.com/juju/juju/apiserver/unitassigner"
"github.com/juju/juju/apiserver/uniter"
"github.com/juju/juju/apiserver/upgrader"
"github.com/juju/juju/apiserver/usermanager"
"github.com/juju/juju/apiserver/facades/agent/agent" // ModelUser Write
"github.com/juju/juju/apiserver/facades/agent/deployer"
"github.com/juju/juju/apiserver/facades/agent/diskmanager"
"github.com/juju/juju/apiserver/facades/agent/hostkeyreporter"
"github.com/juju/juju/apiserver/facades/agent/keyupdater"
"github.com/juju/juju/apiserver/facades/agent/leadership"
loggerapi "github.com/juju/juju/apiserver/facades/agent/logger"
"github.com/juju/juju/apiserver/facades/agent/machine"
"github.com/juju/juju/apiserver/facades/agent/machineactions"
"github.com/juju/juju/apiserver/facades/agent/meterstatus"
"github.com/juju/juju/apiserver/facades/agent/metricsadder"
"github.com/juju/juju/apiserver/facades/agent/migrationflag"
"github.com/juju/juju/apiserver/facades/agent/migrationminion"
"github.com/juju/juju/apiserver/facades/agent/payloadshookcontext"
"github.com/juju/juju/apiserver/facades/agent/provisioner"
"github.com/juju/juju/apiserver/facades/agent/proxyupdater"
"github.com/juju/juju/apiserver/facades/agent/reboot"
"github.com/juju/juju/apiserver/facades/agent/resourceshookcontext"
"github.com/juju/juju/apiserver/facades/agent/retrystrategy"
"github.com/juju/juju/apiserver/facades/agent/storageprovisioner"
"github.com/juju/juju/apiserver/facades/agent/unitassigner"
"github.com/juju/juju/apiserver/facades/agent/uniter"
"github.com/juju/juju/apiserver/facades/agent/upgrader"
"github.com/juju/juju/apiserver/facades/client/action"
"github.com/juju/juju/apiserver/facades/client/annotations" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/application" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/applicationoffers"
"github.com/juju/juju/apiserver/facades/client/backups" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/block" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/bundle"
"github.com/juju/juju/apiserver/facades/client/charms" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/client" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/cloud" // ModelUser Read
"github.com/juju/juju/apiserver/facades/client/controller" // ModelUser Admin (although some methods check for read only)
"github.com/juju/juju/apiserver/facades/client/highavailability" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/imagemanager" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/imagemetadata"
"github.com/juju/juju/apiserver/facades/client/keymanager" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/machinemanager" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/metricsdebug" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/modelconfig" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/modelmanager" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/payloads"
"github.com/juju/juju/apiserver/facades/client/resources"
"github.com/juju/juju/apiserver/facades/client/spaces" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/sshclient" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/storage"
"github.com/juju/juju/apiserver/facades/client/subnets"
"github.com/juju/juju/apiserver/facades/client/usermanager"
"github.com/juju/juju/apiserver/facades/controller/agenttools"
"github.com/juju/juju/apiserver/facades/controller/applicationscaler"
"github.com/juju/juju/apiserver/facades/controller/charmrevisionupdater"
"github.com/juju/juju/apiserver/facades/controller/cleaner"
"github.com/juju/juju/apiserver/facades/controller/crossmodelrelations"
"github.com/juju/juju/apiserver/facades/controller/firewaller"
"github.com/juju/juju/apiserver/facades/controller/instancepoller"
"github.com/juju/juju/apiserver/facades/controller/lifeflag"
"github.com/juju/juju/apiserver/facades/controller/logfwd"
"github.com/juju/juju/apiserver/facades/controller/machineundertaker"
"github.com/juju/juju/apiserver/facades/controller/metricsmanager"
"github.com/juju/juju/apiserver/facades/controller/migrationmaster"
"github.com/juju/juju/apiserver/facades/controller/migrationtarget" // ModelUser Write
"github.com/juju/juju/apiserver/facades/controller/modelupgrader"
"github.com/juju/juju/apiserver/facades/controller/remoterelations"
"github.com/juju/juju/apiserver/facades/controller/resumer"
"github.com/juju/juju/apiserver/facades/controller/singular"
"github.com/juju/juju/apiserver/facades/controller/statushistory"
"github.com/juju/juju/apiserver/facades/controller/undertaker"
"github.com/juju/juju/feature"
"github.com/juju/juju/state"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/juju/errors"

apiserverbackups "github.com/juju/juju/apiserver/backups"
"github.com/juju/juju/apiserver/common"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
"github.com/juju/juju/apiserver/httpattachment"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"gopkg.in/macaroon-bakery.v1/httpbakery"

"github.com/juju/juju/apiserver"
apiserverbackups "github.com/juju/juju/apiserver/backups"
apiserverbackups "github.com/juju/juju/apiserver/facades/client/backups"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
"github.com/juju/juju/state/backups"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/charms.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
ziputil "github.com/juju/utils/zip"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/apiserver/application"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/client/application"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
"github.com/juju/juju/state/storage"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/modeldestroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/utils/clock"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/metricsender"
"github.com/juju/juju/apiserver/facades/agent/metricsender"
)

var sendMetrics = func(st metricsender.ModelBackend) error {
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/modeldestroy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/common"
commontesting "github.com/juju/juju/apiserver/common/testing"
"github.com/juju/juju/apiserver/metricsender"
"github.com/juju/juju/apiserver/facades/agent/metricsender"
"github.com/juju/juju/instance"
"github.com/juju/juju/juju/testing"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/modelstatus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/controller"
"github.com/juju/juju/apiserver/facade/facadetest"
"github.com/juju/juju/apiserver/facades/client/controller"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/instance"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/agent"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/agent/agent"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/cloud"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/agent"
"github.com/juju/juju/apiserver/common"
commontesting "github.com/juju/juju/apiserver/common/testing"
"github.com/juju/juju/apiserver/facades/agent/agent"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/juju/testing"
"github.com/juju/juju/state"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/deployer"
"github.com/juju/juju/apiserver/facades/agent/deployer"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/juju/testing"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/diskmanager"
"github.com/juju/juju/apiserver/facades/agent/diskmanager"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/hostkeyreporter"
"github.com/juju/juju/apiserver/facades/agent/hostkeyreporter"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/state"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/keyupdater"
"github.com/juju/juju/apiserver/facades/agent/keyupdater"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/apiserver/leadership"
"github.com/juju/juju/apiserver/facades/agent/leadership"
"github.com/juju/juju/apiserver/params"
coreleadership "github.com/juju/juju/core/leadership"
)
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/leadership"
"github.com/juju/juju/apiserver/facades/agent/leadership"
"github.com/juju/juju/apiserver/params"
coreleadership "github.com/juju/juju/core/leadership"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/logger"
"github.com/juju/juju/apiserver/facades/agent/logger"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/machine"
"github.com/juju/juju/apiserver/facades/agent/machine"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/network"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/apiserver/machineactions"
"github.com/juju/juju/apiserver/facades/agent/machineactions"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state"
)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/meterstatus"
meterstatustesting "github.com/juju/juju/apiserver/meterstatus/testing"
"github.com/juju/juju/apiserver/facades/agent/meterstatus"
meterstatustesting "github.com/juju/juju/apiserver/facades/agent/meterstatus/testing"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
jujutesting "github.com/juju/juju/juju/testing"
Expand Down
File renamed without changes.
Loading

0 comments on commit 6e125a7

Please sign in to comment.