4 files changed, 13 insertions, 46 deletions
diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go
index 17f39bd8b..74646090d 100644
--- a/cmd/podman/networks/create.go
+++ b/cmd/podman/networks/create.go
@@ -14,7 +14,7 @@ import (
 var (
 	networkCreateDescription = `create CNI networks for containers and pods`
 	networkCreateCommand     = &cobra.Command{
-		Use:     "create [flags] [NETWORK]",
+		Use:     "create [options] [NETWORK]",
 		Short:   "network create",
 		Long:    networkCreateDescription,
 		RunE:    networkCreate,
@@ -34,9 +34,9 @@ func networkCreateFlags(flags *pflag.FlagSet) {
 	flags.IPNetVar(&networkCreateOptions.Range, "ip-range", net.IPNet{}, "allocate container IP from range")
 	flags.StringVar(&networkCreateOptions.MacVLAN, "macvlan", "", "create a Macvlan connection based on this device")
 	// TODO not supported yet
-	//flags.StringVar(&networkCreateOptions.IPamDriver, "ipam-driver", "",  "IP Address Management Driver")
+	// flags.StringVar(&networkCreateOptions.IPamDriver, "ipam-driver", "",  "IP Address Management Driver")
 	// TODO enable when IPv6 is working
-	//flags.BoolVar(&networkCreateOptions.IPV6, "IPv6", false, "enable IPv6 networking")
+	// flags.BoolVar(&networkCreateOptions.IPV6, "IPv6", false, "enable IPv6 networking")
 	flags.IPNetVar(&networkCreateOptions.Subnet, "subnet", net.IPNet{}, "subnet in CIDR format")
 	flags.BoolVar(&networkCreateOptions.DisableDNS, "disable-dns", false, "disable dns plugin")
 }
diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go
index c36125948..25ee7e574 100644
--- a/cmd/podman/networks/inspect.go
+++ b/cmd/podman/networks/inspect.go
@@ -1,15 +1,8 @@
 package network
 
 import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"text/tabwriter"
-	"text/template"
-
-	"github.com/containers/podman/v2/cmd/podman/parse"
+	"github.com/containers/podman/v2/cmd/podman/inspect"
 	"github.com/containers/podman/v2/cmd/podman/registry"
-	"github.com/containers/podman/v2/cmd/podman/report"
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
@@ -17,17 +10,14 @@ import (
 var (
 	networkinspectDescription = `Inspect network`
 	networkinspectCommand     = &cobra.Command{
-		Use:     "inspect [flags] NETWORK [NETWORK...]",
+		Use:     "inspect [options] NETWORK [NETWORK...]",
 		Short:   "network inspect",
 		Long:    networkinspectDescription,
 		RunE:    networkInspect,
 		Example: `podman network inspect podman`,
 		Args:    cobra.MinimumNArgs(1),
 	}
-)
-
-var (
-	networkInspectOptions entities.NetworkInspectOptions
+	inspectOpts *entities.InspectOptions
 )
 
 func init() {
@@ -36,36 +26,13 @@ func init() {
 		Command: networkinspectCommand,
 		Parent:  networkCmd,
 	})
+	inspectOpts = new(entities.InspectOptions)
 	flags := networkinspectCommand.Flags()
-	flags.StringVarP(&networkInspectOptions.Format, "format", "f", "", "Pretty-print network to JSON or using a Go template")
+	flags.StringVarP(&inspectOpts.Format, "format", "f", "", "Pretty-print network to JSON or using a Go template")
 }
 
 func networkInspect(_ *cobra.Command, args []string) error {
-	responses, err := registry.ContainerEngine().NetworkInspect(registry.Context(), args, entities.NetworkInspectOptions{})
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case parse.MatchesJSONFormat(networkInspectOptions.Format) || networkInspectOptions.Format == "":
-		b, err := json.MarshalIndent(responses, "", "  ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(b))
-	default:
-		row := report.NormalizeFormat(networkInspectOptions.Format)
-		// There can be more than 1 in the inspect output.
-		row = "{{range . }}" + row + "{{end}}"
-		tmpl, err := template.New("inspectNetworks").Parse(row)
-		if err != nil {
-			return err
-		}
+	inspectOpts.Type = inspect.NetworkType
+	return inspect.Inspect(args, *inspectOpts)
 
-		w := tabwriter.NewWriter(os.Stdout, 8, 2, 0, ' ', 0)
-		defer w.Flush()
-
-		return tmpl.Execute(w, responses)
-	}
-	return nil
 }
diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go
index c53f50c9f..532af631e 100644
--- a/cmd/podman/networks/list.go
+++ b/cmd/podman/networks/list.go
@@ -19,7 +19,7 @@ import (
 var (
 	networklistDescription = `List networks`
 	networklistCommand     = &cobra.Command{
-		Use:     "ls",
+		Use:     "ls [options]",
 		Args:    validate.NoArgs,
 		Short:   "network list",
 		Long:    networklistDescription,
@@ -36,7 +36,7 @@ var (
 
 func networkListFlags(flags *pflag.FlagSet) {
 	// TODO enable filters based on something
-	//flags.StringSliceVarP(&networklistCommand.Filter, "filter", "f",  []string{}, "Pause all running containers")
+	// flags.StringSliceVarP(&networklistCommand.Filter, "filter", "f",  []string{}, "Pause all running containers")
 	flags.StringVarP(&networkListOptions.Format, "format", "f", "", "Pretty-print networks to JSON or using a Go template")
 	flags.BoolVarP(&networkListOptions.Quiet, "quiet", "q", false, "display only names")
 	flags.StringVarP(&networkListOptions.Filter, "filter", "", "", "Provide filter values (e.g. 'name=podman')")
diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go
index 86aad43cb..3d7db941a 100644
--- a/cmd/podman/networks/rm.go
+++ b/cmd/podman/networks/rm.go
@@ -16,7 +16,7 @@ import (
 var (
 	networkrmDescription = `Remove networks`
 	networkrmCommand     = &cobra.Command{
-		Use:     "rm [flags] NETWORK [NETWORK...]",
+		Use:     "rm [options] NETWORK [NETWORK...]",
 		Short:   "network rm",
 		Long:    networkrmDescription,
 		RunE:    networkRm,