2.9 into develop

CONTRIBUTING.md

@@ -309,7 +309,7 @@ Many tests use a standalone instance of `mongod` as part of their setup. The
 `mongod` binary found in `$PATH` is executed by these suites.  If you don't already have MongoDB installed, or have difficulty using your installed version to run Juju tests, you may want to install the [`juju-db` snap](https://snapcraft.io/juju-db), which is guaranteed to work with Juju.
 
 ```bash
-sudo snap install juju-db
+sudo snap install juju-db --channel 4.4/stable
 sudo snap alias juju-db.mongod mongod
 sudo snap alias juju-db.mongo mongo
 ```

apiserver/facades/client/controller/controller.go

@@ -750,6 +750,7 @@ var runMigrationPrechecks = func(
 		backend,
 		targetControllerVersion,
 		modelPresence, controllerPresence,
+		cloudspec.MakeCloudSpecGetterForModel(st),
 	); err != nil {
 		return errors.Annotate(err, "source prechecks failed")
 	}

apiserver/facades/client/modelupgrader/register.go

@@ -10,6 +10,7 @@ import (
 	"github.com/juju/names/v4"
 
 	"github.com/juju/juju/apiserver/common"
+	"github.com/juju/juju/apiserver/common/cloudspec"
 	apiservererrors "github.com/juju/juju/apiserver/errors"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/docker/registry"
@@ -46,6 +47,7 @@ func newFacadeV1(ctx facade.Context) (*ModelUpgraderAPI, error) {
 
 	urlGetter := common.NewToolsURLGetter(modelUUID, systemState)
 	toolsFinder := common.NewToolsFinder(configGetter, st, urlGetter, newEnviron)
+	environscloudspecGetter := cloudspec.MakeCloudSpecGetter(pool)
 
 	// Since we know this is a user tag (because AuthClient is true),
 	// we just do the type assertion to the UserTag.
@@ -63,5 +65,6 @@ func newFacadeV1(ctx facade.Context) (*ModelUpgraderAPI, error) {
 		auth,
 		context.CallContext(st),
 		registry.New,
+		environscloudspecGetter,
 	)
 }

apiserver/facades/client/modelupgrader/upgrader.go

@@ -19,6 +19,7 @@ import (
 	"github.com/juju/juju/docker/registry"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/bootstrap"
+	environscloudspec "github.com/juju/juju/environs/cloudspec"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/context"
 	"github.com/juju/juju/rpc/params"
@@ -39,7 +40,8 @@ type ModelUpgraderAPI struct {
 	callContext context.ProviderCallContext
 	newEnviron  common.NewEnvironFunc
 
-	registryAPIFunc func(repoDetails docker.ImageRepoDetails) (registry.Registry, error)
+	registryAPIFunc         func(repoDetails docker.ImageRepoDetails) (registry.Registry, error)
+	environscloudspecGetter func(names.ModelTag) (environscloudspec.CloudSpec, error)
 }
 
 // NewModelUpgraderAPI creates a new api server endpoint for managing
@@ -53,6 +55,7 @@ func NewModelUpgraderAPI(
 	authorizer facade.Authorizer,
 	callCtx context.ProviderCallContext,
 	registryAPIFunc func(docker.ImageRepoDetails) (registry.Registry, error),
+	environscloudspecGetter func(names.ModelTag) (environscloudspec.CloudSpec, error),
 ) (*ModelUpgraderAPI, error) {
 	if !authorizer.AuthClient() {
 		return nil, apiservererrors.ErrPerm
@@ -67,15 +70,16 @@ func NewModelUpgraderAPI(
 	}
 
 	return &ModelUpgraderAPI{
-		statePool:       stPool,
-		check:           blockChecker,
-		authorizer:      authorizer,
-		toolsFinder:     toolsFinder,
-		apiUser:         apiUser,
-		isAdmin:         isAdmin,
-		callContext:     callCtx,
-		newEnviron:      newEnviron,
-		registryAPIFunc: registryAPIFunc,
+		statePool:               stPool,
+		check:                   blockChecker,
+		authorizer:              authorizer,
+		toolsFinder:             toolsFinder,
+		apiUser:                 apiUser,
+		isAdmin:                 isAdmin,
+		callContext:             callCtx,
+		newEnviron:              newEnviron,
+		registryAPIFunc:         registryAPIFunc,
+		environscloudspecGetter: environscloudspecGetter,
 	}, nil
 }
 
@@ -182,7 +186,8 @@ func (m *ModelUpgraderAPI) UpgradeModel(arg params.UpgradeModelParams) (result p
 	}
 
 	if err := m.validateModelUpgrade(false, modelTag, targetVersion, st, model); err != nil {
-		return result, errors.Trace(err)
+		result.Error = apiservererrors.ServerError(err)
+		return result, nil
 	}
 	if arg.DryRun {
 		return result, nil
@@ -266,20 +271,23 @@ func (m *ModelUpgraderAPI) validateModelUpgrade(
 	var blockers *upgradevalidation.ModelUpgradeBlockers
 	defer func() {
 		if err == nil && blockers != nil {
-			err = apiservererrors.ServerError(
-				errors.NewNotSupported(nil,
-					fmt.Sprintf(
-						"cannot upgrade to %q due to issues with these models:\n%s",
-						targetVersion, blockers,
-					),
+			err = errors.NewNotSupported(nil,
+				fmt.Sprintf(
+					"cannot upgrade to %q due to issues with these models:\n%s",
+					targetVersion, blockers,
 				),
 			)
 		}
 	}()
 
+	cloudspec, err := m.environscloudspecGetter(modelTag)
+	if err != nil {
+		return errors.Trace(err)
+	}
+
 	isControllerModel := model.IsControllerModel()
 	if !isControllerModel {
-		validators := upgradevalidation.ValidatorsForModelUpgrade(force, targetVersion)
+		validators := upgradevalidation.ValidatorsForModelUpgrade(force, targetVersion, cloudspec)
 		checker := upgradevalidation.NewModelUpgradeCheck(modelTag.Id(), m.statePool, st, model, validators...)
 		blockers, err = checker.Validate()
 		if err != nil {
@@ -290,7 +298,7 @@ func (m *ModelUpgraderAPI) validateModelUpgrade(
 
 	checker := upgradevalidation.NewModelUpgradeCheck(
 		modelTag.Id(), m.statePool, st, model,
-		upgradevalidation.ValidatorsForControllerUpgrade(true, targetVersion)...,
+		upgradevalidation.ValidatorsForControllerUpgrade(true, targetVersion, cloudspec)...,
 	)
 	blockers, err = checker.Validate()
 	if err != nil {
@@ -301,12 +309,18 @@ func (m *ModelUpgraderAPI) validateModelUpgrade(
 	if err != nil {
 		return errors.Trace(err)
 	}
-	validators := upgradevalidation.ValidatorsForControllerUpgrade(false, targetVersion)
 	for _, modelUUID := range modelUUIDs {
 		if modelUUID == modelTag.Id() {
 			// We have done checks for controller model above already.
 			continue
 		}
+
+		cloudspec, err := m.environscloudspecGetter(names.NewModelTag(modelUUID))
+		if err != nil {
+			return errors.Trace(err)
+		}
+		validators := upgradevalidation.ValidatorsForControllerUpgrade(false, targetVersion, cloudspec)
+
 		st, err := m.statePool.Get(modelUUID)
 		if err != nil {
 			return errors.Trace(err)

apiserver/facades/client/modelupgrader/upgrader_test.go

@@ -4,6 +4,8 @@
 package modelupgrader_test
 
 import (
+	"net/http"
+
 	"github.com/golang/mock/gomock"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
@@ -24,13 +26,16 @@ import (
 	"github.com/juju/juju/docker/registry/image"
 	registrymocks "github.com/juju/juju/docker/registry/mocks"
 	"github.com/juju/juju/environs"
+	environscloudspec "github.com/juju/juju/environs/cloudspec"
 	"github.com/juju/juju/environs/context"
 	envtools "github.com/juju/juju/environs/tools"
+	"github.com/juju/juju/provider/lxd"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state"
 	coretesting "github.com/juju/juju/testing"
 	coretools "github.com/juju/juju/tools"
 	"github.com/juju/juju/upgrades/upgradevalidation"
+	upgradevalidationmocks "github.com/juju/juju/upgrades/upgradevalidation/mocks"
 )
 
 type modelUpgradeSuite struct {
@@ -45,6 +50,7 @@ type modelUpgradeSuite struct {
 	bootstrapEnviron *mocks.MockBootstrapEnviron
 	blockChecker     *mocks.MockBlockCheckerInterface
 	registryProvider *registrymocks.MockRegistry
+	cloudSpec        environscloudspec.CloudSpec
 }
 
 var _ = gc.Suite(&modelUpgradeSuite{})
@@ -60,6 +66,7 @@ func (s *modelUpgradeSuite) SetUpTest(c *gc.C) {
 	}
 
 	s.callContext = context.NewEmptyCloudCallContext()
+	s.cloudSpec = environscloudspec.CloudSpec{Type: "lxd"}
 }
 
 func (s *modelUpgradeSuite) getModelUpgraderAPI(c *gc.C) (*gomock.Controller, *modelupgrader.ModelUpgraderAPI) {
@@ -81,6 +88,9 @@ func (s *modelUpgradeSuite) getModelUpgraderAPI(c *gc.C) (*gomock.Controller, *m
 		func(docker.ImageRepoDetails) (registry.Registry, error) {
 			return s.registryProvider, nil
 		},
+		func(names.ModelTag) (environscloudspec.CloudSpec, error) {
+			return s.cloudSpec, nil
+		},
 	)
 	c.Assert(err, jc.ErrorIsNil)
 	return ctrl, api
@@ -133,6 +143,14 @@ func (s *modelUpgradeSuite) assertUpgradeModelForControllerModelJuju3(c *gc.C, d
 		3: version.MustParse("2.9.1"),
 	})
 
+	server := upgradevalidationmocks.NewMockServer(ctrl)
+	serverFactory := upgradevalidationmocks.NewMockServerFactory(ctrl)
+	s.PatchValue(&upgradevalidation.NewServerFactory,
+		func(httpClient *http.Client) lxd.ServerFactory {
+			return serverFactory
+		},
+	)
+
 	ctrlModelTag := coretesting.ModelTag
 	model1ModelUUID, err := utils.NewUUID()
 	c.Assert(err, jc.ErrorIsNil)
@@ -215,6 +233,10 @@ func (s *modelUpgradeSuite) assertUpgradeModelForControllerModelJuju3(c *gc.C, d
 			"yakkety",
 			"zesty",
 		).Return(nil, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.2"),
+
 		ctrlState.EXPECT().AllModelUUIDs().Return([]string{ctrlModelTag.Id(), model1ModelUUID.String()}, nil),
 
 		// 2. Check other models.
@@ -251,6 +273,9 @@ func (s *modelUpgradeSuite) assertUpgradeModelForControllerModelJuju3(c *gc.C, d
 			"yakkety",
 			"zesty",
 		).Return(nil, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.2"),
 	}
 	if !dryRun {
 		assertions = append(assertions,
@@ -290,6 +315,14 @@ func (s *modelUpgradeSuite) TestUpgradeModelForControllerModelJuju3Failed(c *gc.
 		3: version.MustParse("2.9.2"),
 	})
 
+	server := upgradevalidationmocks.NewMockServer(ctrl)
+	serverFactory := upgradevalidationmocks.NewMockServerFactory(ctrl)
+	s.PatchValue(&upgradevalidation.NewServerFactory,
+		func(httpClient *http.Client) lxd.ServerFactory {
+			return serverFactory
+		},
+	)
+
 	ctrlModelTag := coretesting.ModelTag
 	model1ModelUUID, err := utils.NewUUID()
 	c.Assert(err, jc.ErrorIsNil)
@@ -372,6 +405,9 @@ func (s *modelUpgradeSuite) TestUpgradeModelForControllerModelJuju3Failed(c *gc.
 			"yakkety",
 			"zesty",
 		).Return(map[string]int{"xenial": 2}, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.1"),
 		ctrlModel.EXPECT().Owner().Return(names.NewUserTag("admin")),
 		ctrlModel.EXPECT().Name().Return("controller"),
 
@@ -415,29 +451,35 @@ func (s *modelUpgradeSuite) TestUpgradeModelForControllerModelJuju3Failed(c *gc.
 			"saucy": 11, "trusty": 12, "utopic": 13, "vivid": 14, "wily": 15,
 			"xenial": 16, "yakkety": 17, "zesty": 18,
 		}, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.1"),
 		model1.EXPECT().Owner().Return(names.NewUserTag("admin")),
 		model1.EXPECT().Name().Return("model-1"),
 	)
 
-	_, err = api.UpgradeModel(
+	result, err := api.UpgradeModel(
 		params.UpgradeModelParams{
 			ModelTag:      ctrlModelTag.String(),
 			TargetVersion: version.MustParse("3.9.99"),
 		},
 	)
-	c.Assert(err.Error(), gc.Equals, `
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(result.Error.Error(), gc.Equals, `
 cannot upgrade to "3.9.99" due to issues with these models:
 "admin/controller":
 - current model ("2.9.1") has to be upgraded to "2.9.2" at least
 - unable to upgrade, database node 1 (1.1.1.1) has state FATAL, node 2 (2.2.2.2) has state ARBITER, node 3 (3.3.3.3) has state RECOVERING
 - mongo version has to be "4.4" at least, but current version is "4.3"
 - the model hosts deprecated windows machine(s): win10(1) win7(2)
 - the model hosts deprecated ubuntu machine(s): xenial(2)
+- LXD version has to be at least "5.2.0", but current version is only "5.1.0"
 "admin/model-1":
 - current model ("2.9.0") has to be upgraded to "2.9.2" at least
 - model is under "exporting" mode, upgrade blocked
 - the model hosts deprecated windows machine(s): win10(1) win7(3)
-- the model hosts deprecated ubuntu machine(s): artful(1) cosmic(2) disco(3) eoan(4) groovy(5) hirsute(6) impish(7) precise(8) quantal(9) raring(10) saucy(11) trusty(12) utopic(13) vivid(14) wily(15) xenial(16) yakkety(17) zesty(18)`[1:])
+- the model hosts deprecated ubuntu machine(s): artful(1) cosmic(2) disco(3) eoan(4) groovy(5) hirsute(6) impish(7) precise(8) quantal(9) raring(10) saucy(11) trusty(12) utopic(13) vivid(14) wily(15) xenial(16) yakkety(17) zesty(18)
+- LXD version has to be at least "5.2.0", but current version is only "5.1.0"`[1:])
 }
 
 func (s *modelUpgradeSuite) assertUpgradeModelJuju3(c *gc.C, dryRun bool) {
@@ -448,6 +490,14 @@ func (s *modelUpgradeSuite) assertUpgradeModelJuju3(c *gc.C, dryRun bool) {
 		3: version.MustParse("2.9.1"),
 	})
 
+	server := upgradevalidationmocks.NewMockServer(ctrl)
+	serverFactory := upgradevalidationmocks.NewMockServerFactory(ctrl)
+	s.PatchValue(&upgradevalidation.NewServerFactory,
+		func(httpClient *http.Client) lxd.ServerFactory {
+			return serverFactory
+		},
+	)
+
 	modelUUID := coretesting.ModelTag.Id()
 	model := mocks.NewMockModel(ctrl)
 	st := mocks.NewMockState(ctrl)
@@ -504,10 +554,12 @@ func (s *modelUpgradeSuite) assertUpgradeModelJuju3(c *gc.C, dryRun bool) {
 			"yakkety",
 			"zesty",
 		).Return(nil, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.2"),
 	}
 	if !dryRun {
 		assertions = append(assertions,
-			// s.statePool.EXPECT().Get(modelUUID).Return(st, nil),
 			st.EXPECT().SetModelAgentVersion(version.MustParse("3.9.99"), nil, false).Return(nil),
 		)
 	}
@@ -543,6 +595,14 @@ func (s *modelUpgradeSuite) TestUpgradeModelJuju3Failed(c *gc.C) {
 		3: version.MustParse("2.9.1"),
 	})
 
+	server := upgradevalidationmocks.NewMockServer(ctrl)
+	serverFactory := upgradevalidationmocks.NewMockServerFactory(ctrl)
+	s.PatchValue(&upgradevalidation.NewServerFactory,
+		func(httpClient *http.Client) lxd.ServerFactory {
+			return serverFactory
+		},
+	)
+
 	modelUUID := coretesting.ModelTag.Id()
 	model := mocks.NewMockModel(ctrl)
 	st := mocks.NewMockState(ctrl)
@@ -603,22 +663,26 @@ func (s *modelUpgradeSuite) TestUpgradeModelJuju3Failed(c *gc.C) {
 			"saucy": 11, "trusty": 12, "utopic": 13, "vivid": 14, "wily": 15,
 			"xenial": 16, "yakkety": 17, "zesty": 18,
 		}, nil),
+		// - check LXD version.
+		serverFactory.EXPECT().RemoteServer(s.cloudSpec).Return(server, nil),
+		server.EXPECT().ServerVersion().Return("5.1"),
 		model.EXPECT().Owner().Return(names.NewUserTag("admin")),
 		model.EXPECT().Name().Return("model-1"),
 	)
-	_, err := api.UpgradeModel(
+	result, err := api.UpgradeModel(
 		params.UpgradeModelParams{
 			ModelTag:      coretesting.ModelTag.String(),
 			TargetVersion: version.MustParse("3.9.99"),
 		},
 	)
-	c.Logf(err.Error())
-	c.Assert(err.Error(), gc.Equals, `
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(result.Error.Error(), gc.Equals, `
 cannot upgrade to "3.9.99" due to issues with these models:
 "admin/model-1":
 - unexpected upgrade series lock found
 - the model hosts deprecated windows machine(s): win10(1) win7(3)
-- the model hosts deprecated ubuntu machine(s): artful(1) cosmic(2) disco(3) eoan(4) groovy(5) hirsute(6) impish(7) precise(8) quantal(9) raring(10) saucy(11) trusty(12) utopic(13) vivid(14) wily(15) xenial(16) yakkety(17) zesty(18)`[1:])
+- the model hosts deprecated ubuntu machine(s): artful(1) cosmic(2) disco(3) eoan(4) groovy(5) hirsute(6) impish(7) precise(8) quantal(9) raring(10) saucy(11) trusty(12) utopic(13) vivid(14) wily(15) xenial(16) yakkety(17) zesty(18)
+- LXD version has to be at least "5.2.0", but current version is only "5.1.0"`[1:])
 }
 
 func (s *modelUpgradeSuite) TestAbortCurrentUpgrade(c *gc.C) {