sdg0919
diff --git a/‎apiserver/facades/client/spaces/package_test.go
Lines changed: 1 addition & 1 deletion b/‎apiserver/facades/client/spaces/package_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎apiserver/facades/client/spaces/spaces.go
Lines changed: 13 additions & 2 deletions b/‎apiserver/facades/client/spaces/spaces.go
Lines changed: 13 additions & 2 deletions
diff --git a/‎environs/mocks/package_mock.go
Lines changed: 2 additions & 17 deletions b/‎environs/mocks/package_mock.go
Lines changed: 2 additions & 17 deletions
diff --git a/‎environs/networking.go
Lines changed: 0 additions & 23 deletions b/‎environs/networking.go
Lines changed: 0 additions & 23 deletions
@@ -76,7 +76,7 @@ func (s *APISuite) SetupMocks(c *gc.C, supportSpaces bool, providerSpaces bool)
 
 	mockNetworkEnviron := environmocks.NewMockNetworkingEnviron(ctrl)
 	mockNetworkEnviron.EXPECT().SupportsSpaces(gomock.Any()).Return(supportSpaces, nil).AnyTimes()
-	mockNetworkEnviron.EXPECT().SupportsProviderSpaces(gomock.Any()).Return(providerSpaces, nil).AnyTimes()
+	mockNetworkEnviron.EXPECT().SupportsSpaceDiscovery(gomock.Any()).Return(providerSpaces, nil).AnyTimes()
 
 	mockProvider := environmocks.NewMockCloudEnvironProvider(ctrl)
 	mockProvider.EXPECT().Open(gomock.Any()).Return(mockNetworkEnviron, nil).AnyTimes()
 
@@ -531,9 +531,20 @@ func (api *API) ensureSpacesAreMutable() error {
 func (api *API) ensureSpacesNotProviderSourced() error {
 	env, err := environs.GetEnviron(api.backing, environs.New)
 	if err != nil {
-		return errors.Annotate(err, "getting environ")
+		return errors.Annotate(err, "retrieving environ")
+	}
+
+	netEnv, ok := env.(environs.NetworkingEnviron)
+	if !ok {
+		return errors.NotSupportedf("provider networking")
+	}
+
+	providerSourced, err := netEnv.SupportsSpaceDiscovery(api.context)
+	if err != nil {
+		return errors.Trace(err)
 	}
-	if environs.SupportsProviderSpaces(api.context, env) {
+
+	if providerSourced {
 		return errors.NotSupportedf("modifying provider-sourced spaces")
 	}
 	return nil
 
@@ -48,12 +48,6 @@ type Networking interface {
 	// unless a general API failure occurs.
 	SupportsSpaces(ctx context.ProviderCallContext) (bool, error)
 
-	// SupportsProviderSpaces returns whether the current environment supports
-	// provider spaces. Some providers support specific crud actions, like renaming.
-	// The returned error satisfies errors.IsNotSupported(),
-	// unless a general API failure occurs.
-	SupportsProviderSpaces(ctx context.ProviderCallContext) (bool, error)
-
 	// SupportsSpaceDiscovery returns whether the current environment
 	// supports discovering spaces from the provider. The returned error
 	// satisfies errors.IsNotSupported(), unless a general API failure occurs.
@@ -147,23 +141,6 @@ func SupportsSpaces(ctx context.ProviderCallContext, env BootstrapEnviron) bool
 	return ok
 }
 
-// SupportsSpaces checks if the environment implements NetworkingEnviron
-// and also if it supports spaces.
-func SupportsProviderSpaces(ctx context.ProviderCallContext, env BootstrapEnviron) bool {
-	netEnv, ok := supportsNetworking(env)
-	if !ok {
-		return false
-	}
-	ok, err := netEnv.SupportsProviderSpaces(ctx)
-	if err != nil {
-		if !errors.IsNotSupported(err) {
-			logger.Errorf("checking model provider spaces support failed with: %v", err)
-		}
-		return false
-	}
-	return ok
-}
-
 // SupportsContainerAddresses checks if the environment will let us allocate
 // addresses for containers from the host ranges.
 func SupportsContainerAddresses(ctx context.ProviderCallContext, env BootstrapEnviron) bool {