allows vms command to filter by deployment via -d

Author: tjvman

cmd/factory.go

@@ -47,6 +47,10 @@ func (f Factory) New(args []string) (Cmd, error) {
 			opts.Deployment = boshOpts.DeploymentOpt
 		}
 
+		if opts, ok := command.(*VMsOpts); ok {
+			opts.Deployment = boshOpts.DeploymentOpt
+		}
+
 		if opts, ok := command.(*TasksOpts); ok {
 			opts.Deployment = boshOpts.DeploymentOpt
 		}

cmd/factory_test.go

@@ -186,6 +186,16 @@ var _ = Describe("Factory", func() {
 		})
 	})
 
+	Describe("vms command", func() {
+		It("is passed the deployment flag", func() {
+			cmd, err := factory.New([]string{"vms", "--deployment", "deployment"})
+			Expect(err).ToNot(HaveOccurred())
+
+			opts := cmd.Opts.(*VMsOpts)
+			Expect(opts.Deployment).To(Equal("deployment"))
+		})
+	})
+
 	Describe("tasks command", func() {
 		It("is passed the deployment flag", func() {
 			cmd, err := factory.New([]string{"tasks", "--deployment", "deployment"})

cmd/opts.go

@@ -510,9 +510,10 @@ type InstancesOpts struct {
 }
 
 type VMsOpts struct {
-	Details bool `long:"details" short:"i" description:"Show details including VM CID, persistent disk CID, etc."`
-	DNS     bool `long:"dns"               description:"Show DNS A records"`
-	Vitals  bool `long:"vitals"            description:"Show vitals"`
+	Details    bool `long:"details" short:"i" description:"Show details including VM CID, persistent disk CID, etc."`
+	DNS        bool `long:"dns"               description:"Show DNS A records"`
+	Vitals     bool `long:"vitals"            description:"Show vitals"`
+	Deployment string
 	cmd
 }
 

cmd/vms.go

@@ -18,11 +18,6 @@ func NewVMsCmd(ui boshui.UI, director boshdir.Director) VMsCmd {
 }
 
 func (c VMsCmd) Run(opts VMsOpts) error {
-	deployments, err := c.director.Deployments()
-	if err != nil {
-		return err
-	}
-
 	instTable := InstanceTable{
 		// VMs command should always show VM specifics
 		VMDetails: true,
@@ -32,32 +27,59 @@ func (c VMsCmd) Run(opts VMsOpts) error {
 		Vitals:  opts.Vitals,
 	}
 
+	if len(opts.Deployment) > 0 {
+		dep, err := c.director.FindDeployment(opts.Deployment)
+		if err != nil {
+			return err
+		}
+
+		return c.printDeployment(dep, instTable)
+	}
+
+	return c.printDeployments(instTable)
+}
+
+func (c VMsCmd) printDeployments(instTable InstanceTable) error {
+	deployments, err := c.director.Deployments()
+	if err != nil {
+		return err
+	}
+
 	for _, dep := range deployments {
-		vmInfos, err := dep.VMInfos()
+		err := c.printDeployment(dep, instTable)
 		if err != nil {
 			return err
 		}
+	}
+
+	return nil
+}
 
-		table := boshtbl.Table{
-			Title: fmt.Sprintf("Deployment '%s'", dep.Name()),
+func (c VMsCmd) printDeployment(dep boshdir.Deployment, instTable InstanceTable) error {
+	vmInfos, err := dep.VMInfos()
+	if err != nil {
+		return err
+	}
 
-			Content: "vms",
+	table := boshtbl.Table{
+		Title: fmt.Sprintf("Deployment '%s'", dep.Name()),
 
-			HeaderVals: instTable.AsValues(instTable.Header()),
+		Content: "vms",
 
-			SortBy: []boshtbl.ColumnSort{{Column: 0, Asc: true}},
+		HeaderVals: instTable.AsValues(instTable.Header()),
 
-			Notes: []string{"(*) Bootstrap node"},
-		}
+		SortBy: []boshtbl.ColumnSort{{Column: 0, Asc: true}},
 
-		for _, info := range vmInfos {
-			row := instTable.AsValues(instTable.ForVMInfo(info))
+		Notes: []string{"(*) Bootstrap node"},
+	}
 
-			table.Rows = append(table.Rows, row)
-		}
+	for _, info := range vmInfos {
+		row := instTable.AsValues(instTable.ForVMInfo(info))
 
-		c.ui.PrintTable(table)
+		table.Rows = append(table.Rows, row)
 	}
 
+	c.ui.PrintTable(table)
+
 	return nil
 }