Configure director properties first

[#153952078]

Signed-off-by: Kalai Wei <[email protected]>

Author: davewalter

commands/configure_director.go

@@ -41,6 +41,20 @@ func (c ConfigureDirector) Execute(args []string) error {
 		return fmt.Errorf("could not parse configure-director flags: %s", err)
 	}
 
+	c.logger.Printf("started configuring director options for bosh tile")
+
+	err = c.service.Properties(api.DirectorProperties{
+		DirectorConfiguration: json.RawMessage(c.Options.DirectorConfiguration),
+		IAASConfiguration:     json.RawMessage(c.Options.IAASConfiguration),
+		SecurityConfiguration: json.RawMessage(c.Options.SecurityConfiguration),
+		SyslogConfiguration:   json.RawMessage(c.Options.SyslogConfiguration),
+	})
+	if err != nil {
+		return fmt.Errorf("properties could not be applied: %s", err)
+	}
+
+	c.logger.Printf("finished configuring director options for bosh tile")
+
 	if c.Options.AZConfiguration != "" {
 		c.logger.Printf("started configuring availability zone options for bosh tile")
 
@@ -78,20 +92,6 @@ func (c ConfigureDirector) Execute(args []string) error {
 		c.logger.Printf("finished configuring network assignment options for bosh tile")
 	}
 
-	c.logger.Printf("started configuring director options for bosh tile")
-
-	err = c.service.Properties(api.DirectorProperties{
-		DirectorConfiguration: json.RawMessage(c.Options.DirectorConfiguration),
-		IAASConfiguration:     json.RawMessage(c.Options.IAASConfiguration),
-		SecurityConfiguration: json.RawMessage(c.Options.SecurityConfiguration),
-		SyslogConfiguration:   json.RawMessage(c.Options.SyslogConfiguration),
-	})
-	if err != nil {
-		return fmt.Errorf("properties could not be applied: %s", err)
-	}
-
-	c.logger.Printf("finished configuring director options for bosh tile")
-
 	return nil
 }
 

commands/configure_director_test.go

@@ -64,14 +64,14 @@ var _ = Describe("ConfigureDirector", func() {
 			}))
 
 			Expect(logger.PrintfCallCount()).To(Equal(8))
-			Expect(logger.PrintfArgsForCall(0)).To(Equal("started configuring availability zone options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(1)).To(Equal("finished configuring availability zone options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(2)).To(Equal("started configuring network options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(3)).To(Equal("finished configuring network options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(4)).To(Equal("started configuring network assignment options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(5)).To(Equal("finished configuring network assignment options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(6)).To(Equal("started configuring director options for bosh tile"))
-			Expect(logger.PrintfArgsForCall(7)).To(Equal("finished configuring director options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(0)).To(Equal("started configuring director options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(1)).To(Equal("finished configuring director options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(2)).To(Equal("started configuring availability zone options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(3)).To(Equal("finished configuring availability zone options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(4)).To(Equal("started configuring network options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(5)).To(Equal("finished configuring network options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(6)).To(Equal("started configuring network assignment options for bosh tile"))
+			Expect(logger.PrintfArgsForCall(7)).To(Equal("finished configuring network assignment options for bosh tile"))
 		})
 
 		Context("when no director configuration flags are provided", func() {