Replaces test added to the noNeutronSuite, with an new test in the localServerSuite that clears the test networks in the arrange phase.

manadart · manadart · commit 011fb3f580f1 · 2018-08-08T16:41:28.000+02:00
diff --git a/provider/openstack/local_test.go b/provider/openstack/local_test.go
@@ -32,6 +32,7 @@ import (
 	"gopkg.in/goose.v2/nova"
 	"gopkg.in/goose.v2/testservices/hook"
 	"gopkg.in/goose.v2/testservices/identityservice"
+	"gopkg.in/goose.v2/testservices/neutronmodel"
 	"gopkg.in/goose.v2/testservices/neutronservice"
 	"gopkg.in/goose.v2/testservices/novaservice"
 	"gopkg.in/goose.v2/testservices/openstackservice"
@@ -580,6 +581,27 @@ func (s *localServerSuite) TestStartInstanceNetworkNotSetReturnsError(c *gc.C) {
 	or supply it via --config when creating a new model`)
 }
 
+func (s *localServerSuite) TestStartInstanceNoNetworksNetworkNotSetNoError(c *gc.C) {
+	// Modify the server that is created by default, to clear the networks.
+	model := neutronmodel.New()
+	for _, net := range model.AllNetworks() {
+		model.RemoveNetwork(net.Id)
+	}
+	s.srv.Openstack.Neutron.AddNeutronModel(model)
+	s.srv.Openstack.Nova.AddNeutronModel(model)
+
+	cfg, err := s.env.Config().Apply(coretesting.Attrs{
+		"network": "",
+	})
+	c.Assert(err, jc.ErrorIsNil)
+	err = s.env.SetConfig(cfg)
+	c.Assert(err, jc.ErrorIsNil)
+
+	inst, _, _, err := testing.StartInstance(s.env, s.callCtx, s.ControllerUUID, "100")
+	c.Check(inst, gc.NotNil)
+	c.Assert(err, jc.ErrorIsNil)
+}
+
 func (s *localServerSuite) TestStartInstanceNetworksDifferentAZ(c *gc.C) {
 	// If both the network and external-network config values are
 	// specified, there is not check for them being on different
@@ -2680,22 +2702,6 @@ func (s *noNeutronSuite) TestUpdateGroupControllerNoNeutron(c *gc.C) {
 	))
 }
 
-func (s *noNeutronSuite) TestStartInstanceNetworkNotSetNoError(c *gc.C) {
-	cfg, err := s.env.Config().Apply(coretesting.Attrs{
-		"network": "",
-	})
-	c.Assert(err, jc.ErrorIsNil)
-	err = s.env.SetConfig(cfg)
-	c.Assert(err, jc.ErrorIsNil)
-
-	callCtx := context.NewCloudCallContext()
-	ctrlUUID := coretesting.FakeControllerConfig().ControllerUUID()
-
-	inst, _, _, err := testing.StartInstance(s.env, callCtx, ctrlUUID, "100")
-	c.Assert(err, jc.ErrorIsNil)
-	c.Check(inst, gc.NotNil)
-}
-
 func createNovaSecurityGroup(c *gc.C, client *nova.Client, name string) {
 	c.Logf("creating group %q", name)
 	_, err := client.CreateSecurityGroup(name, "")
