5 files changed, 194 insertions, 0 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index d5098ee51..f7c78908f 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -258,6 +258,20 @@ type MountValues struct {
 	Latest  bool
 }
 
+type NetworkListValues struct {
+	PodmanCommand
+	Filter []string
+	Quiet  bool
+}
+
+type NetworkRmValues struct {
+	PodmanCommand
+}
+
+type NetworkInspectValues struct {
+	PodmanCommand
+}
+
 type PauseValues struct {
 	PodmanCommand
 	All bool
diff --git a/cmd/podman/network.go b/cmd/podman/network.go
new file mode 100644
index 000000000..83a5e71ab
--- /dev/null
+++ b/cmd/podman/network.go
@@ -0,0 +1,31 @@
+//+build !remoteclient
+
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/spf13/cobra"
+)
+
+var networkcheckDescription = "Manage networks"
+var networkcheckCommand = cliconfig.PodmanCommand{
+	Command: &cobra.Command{
+		Use:   "network",
+		Short: "Manage Networks",
+		Long:  networkcheckDescription,
+		RunE:  commandRunE(),
+	},
+}
+
+// Commands that are universally implemented
+var networkcheckCommands = []*cobra.Command{
+	_networkinspectCommand,
+	_networklistCommand,
+	_networkrmCommand,
+}
+
+func init() {
+	networkcheckCommand.AddCommand(networkcheckCommands...)
+	networkcheckCommand.SetUsageTemplate(UsageTemplate())
+	rootCmd.AddCommand(networkcheckCommand.Command)
+}
diff --git a/cmd/podman/network_inspect.go b/cmd/podman/network_inspect.go
new file mode 100644
index 000000000..38aaf6ba4
--- /dev/null
+++ b/cmd/podman/network_inspect.go
@@ -0,0 +1,48 @@
+// +build !remoteclient
+
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	networkinspectCommand     cliconfig.NetworkInspectValues
+	networkinspectDescription = `Inspect network`
+	_networkinspectCommand    = &cobra.Command{
+		Use:   "inspect NETWORK [NETWORK...] [flags] ",
+		Short: "network inspect",
+		Long:  networkinspectDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			networkinspectCommand.InputArgs = args
+			networkinspectCommand.GlobalFlags = MainGlobalOpts
+			networkinspectCommand.Remote = remoteclient
+			return networkinspectCmd(&networkinspectCommand)
+		},
+		Example: `podman network inspect podman`,
+	}
+)
+
+func init() {
+	networkinspectCommand.Command = _networkinspectCommand
+	networkinspectCommand.SetHelpTemplate(HelpTemplate())
+	networkinspectCommand.SetUsageTemplate(UsageTemplate())
+}
+
+func networkinspectCmd(c *cliconfig.NetworkInspectValues) error {
+	if rootless.IsRootless() && !remoteclient {
+		return errors.New("network inspect is not supported for rootless mode")
+	}
+	if len(c.InputArgs) < 1 {
+		return errors.Errorf("at least one network name is required")
+	}
+	runtime, err := adapter.GetRuntimeNoStore(getContext(), &c.PodmanCommand)
+	if err != nil {
+		return err
+	}
+	return runtime.NetworkInspect(c)
+}
diff --git a/cmd/podman/network_list.go b/cmd/podman/network_list.go
new file mode 100644
index 000000000..16edf743b
--- /dev/null
+++ b/cmd/podman/network_list.go
@@ -0,0 +1,53 @@
+// +build !remoteclient
+
+package main
+
+import (
+	"errors"
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/spf13/cobra"
+)
+
+var (
+	networklistCommand     cliconfig.NetworkListValues
+	networklistDescription = `List networks`
+	_networklistCommand    = &cobra.Command{
+		Use:   "ls",
+		Args:  noSubArgs,
+		Short: "network list",
+		Long:  networklistDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			networklistCommand.InputArgs = args
+			networklistCommand.GlobalFlags = MainGlobalOpts
+			networklistCommand.Remote = remoteclient
+			return networklistCmd(&networklistCommand)
+		},
+		Example: `podman network list`,
+	}
+)
+
+func init() {
+	networklistCommand.Command = _networklistCommand
+	networklistCommand.SetHelpTemplate(HelpTemplate())
+	networklistCommand.SetUsageTemplate(UsageTemplate())
+	flags := networklistCommand.Flags()
+	// TODO enable filters based on something
+	//flags.StringSliceVarP(&networklistCommand.Filter, "filter", "f",  []string{}, "Pause all running containers")
+	flags.BoolVarP(&networklistCommand.Quiet, "quiet", "q", false, "display only names")
+}
+
+func networklistCmd(c *cliconfig.NetworkListValues) error {
+	if rootless.IsRootless() && !remoteclient {
+		return errors.New("network list is not supported for rootless mode")
+	}
+	if len(c.InputArgs) > 0 {
+		return errors.New("network list takes no arguments")
+	}
+	runtime, err := adapter.GetRuntimeNoStore(getContext(), &c.PodmanCommand)
+	if err != nil {
+		return err
+	}
+	return runtime.NetworkList(c)
+}
diff --git a/cmd/podman/network_rm.go b/cmd/podman/network_rm.go
new file mode 100644
index 000000000..50bd48cea
--- /dev/null
+++ b/cmd/podman/network_rm.go
@@ -0,0 +1,48 @@
+// +build !remoteclient
+
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	networkrmCommand     cliconfig.NetworkRmValues
+	networkrmDescription = `Remove networks`
+	_networkrmCommand    = &cobra.Command{
+		Use:   "rm [flags] NETWORK [NETWORK...]",
+		Short: "network rm",
+		Long:  networkrmDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			networkrmCommand.InputArgs = args
+			networkrmCommand.GlobalFlags = MainGlobalOpts
+			networkrmCommand.Remote = remoteclient
+			return networkrmCmd(&networkrmCommand)
+		},
+		Example: `podman network rm podman`,
+	}
+)
+
+func init() {
+	networkrmCommand.Command = _networkrmCommand
+	networkrmCommand.SetHelpTemplate(HelpTemplate())
+	networkrmCommand.SetUsageTemplate(UsageTemplate())
+}
+
+func networkrmCmd(c *cliconfig.NetworkRmValues) error {
+	if rootless.IsRootless() && !remoteclient {
+		return errors.New("network rm is not supported for rootless mode")
+	}
+	if len(c.InputArgs) < 1 {
+		return errors.Errorf("at least one network name is required")
+	}
+	runtime, err := adapter.GetRuntimeNoStore(getContext(), &c.PodmanCommand)
+	if err != nil {
+		return err
+	}
+	return runtime.NetworkRemove(c)
+}