Rename functions

Haiyan Meng · Haiyan Meng · commit 0e6dfc00c26a · 2016-07-15T20:27:27.000-04:00
Signed-off-by: Haiyan Meng &lt;hmeng@redhat.com&gt;
diff --git a/generate/generate.go b/generate/generate.go
@@ -71,7 +71,7 @@ func New() Generator {
 				},
 			},
 		},
-		Hostname: "shell",
+		Hostname: "mrsdalloway",
 		Mounts: []rspec.Mount{
 			{
 				Destination: "/proc",
@@ -683,8 +683,8 @@ func parseIDMapping(idms string) (rspec.IDMapping, error) {
 	return idMapping, nil
 }
 
-// ClearLinuxUIDMapping clears g.spec.Linux.UIDMappings.
-func (g Generator) ClearLinuxUIDMapping() {
+// ClearLinuxUIDMappings clear g.spec.Linux.UIDMappings.
+func (g Generator) ClearLinuxUIDMappings() {
 	g.spec.Linux.UIDMappings = []rspec.IDMapping{}
 }
 
@@ -699,8 +699,8 @@ func (g Generator) AddLinuxUIDMapping(uidMap string) error {
 	return nil
 }
 
-// ClearLinuxGIDMapping clears g.spec.Linux.GIDMappings.
-func (g Generator) ClearLinuxGIDMapping() {
+// ClearLinuxGIDMappings clear g.spec.Linux.GIDMappings.
+func (g Generator) ClearLinuxGIDMappings() {
 	g.spec.Linux.GIDMappings = []rspec.IDMapping{}
 }
 
@@ -742,8 +742,8 @@ func parseHook(s string) rspec.Hook {
 	return rspec.Hook{Path: path, Args: args}
 }
 
-// ClearPreStartHook clears g.spec.Hooks.Prestart.
-func (g Generator) ClearPreStartHook() {
+// ClearPreStartHooks clear g.spec.Hooks.Prestart.
+func (g Generator) ClearPreStartHooks() {
 	g.spec.Hooks.Prestart = []rspec.Hook{}
 }
 
@@ -754,8 +754,8 @@ func (g Generator) AddPreStartHook(s string) error {
 	return nil
 }
 
-// ClearPostStopHook clears g.spec.Hooks.Poststop.
-func (g Generator) ClearPostStopHook() {
+// ClearPostStopHooks clear g.spec.Hooks.Poststop.
+func (g Generator) ClearPostStopHooks() {
 	g.spec.Hooks.Poststop = []rspec.Hook{}
 }
 
@@ -766,8 +766,8 @@ func (g Generator) AddPostStopHook(s string) error {
 	return nil
 }
 
-// ClearPostStartHook clears g.spec.Hooks.Poststart.
-func (g Generator) ClearPostStartHook() {
+// ClearPostStartHooks clear g.spec.Hooks.Poststart.
+func (g Generator) ClearPostStartHooks() {
 	g.spec.Hooks.Poststart = []rspec.Hook{}
 }
 
@@ -932,8 +932,8 @@ func mapStrToNamespace(ns string, path string) (rspec.Namespace, error) {
 	}
 }
 
-// ClearLinuxNamespace clears g.spec.Linux.Namespaces.
-func (g Generator) ClearLinuxNamespace() {
+// ClearLinuxNamespaces clear g.spec.Linux.Namespaces.
+func (g Generator) ClearLinuxNamespaces() {
 	g.spec.Linux.Namespaces = []rspec.Namespace{}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func New() Generator {`
`71`	`71`	`},`
`72`	`72`	`},`
`73`	`73`	`},`
`74`		`- Hostname: "shell",`
	`74`	`+ Hostname: "mrsdalloway",`
`75`	`75`	`Mounts: []rspec.Mount{`
`76`	`76`	`{`
`77`	`77`	`Destination: "/proc",`
`@@ -683,8 +683,8 @@ func parseIDMapping(idms string) (rspec.IDMapping, error) {`
`683`	`683`	`return idMapping, nil`
`684`	`684`	`}`
`685`	`685`
`686`		`-// ClearLinuxUIDMapping clears g.spec.Linux.UIDMappings.`
`687`		`-func (g Generator) ClearLinuxUIDMapping() {`
	`686`	`+// ClearLinuxUIDMappings clear g.spec.Linux.UIDMappings.`
	`687`	`+func (g Generator) ClearLinuxUIDMappings() {`
`688`	`688`	`g.spec.Linux.UIDMappings = []rspec.IDMapping{}`
`689`	`689`	`}`
`690`	`690`
`@@ -699,8 +699,8 @@ func (g Generator) AddLinuxUIDMapping(uidMap string) error {`
`699`	`699`	`return nil`
`700`	`700`	`}`
`701`	`701`
`702`		`-// ClearLinuxGIDMapping clears g.spec.Linux.GIDMappings.`
`703`		`-func (g Generator) ClearLinuxGIDMapping() {`
	`702`	`+// ClearLinuxGIDMappings clear g.spec.Linux.GIDMappings.`
	`703`	`+func (g Generator) ClearLinuxGIDMappings() {`
`704`	`704`	`g.spec.Linux.GIDMappings = []rspec.IDMapping{}`
`705`	`705`	`}`
`706`	`706`
`@@ -742,8 +742,8 @@ func parseHook(s string) rspec.Hook {`
`742`	`742`	`return rspec.Hook{Path: path, Args: args}`
`743`	`743`	`}`
`744`	`744`
`745`		`-// ClearPreStartHook clears g.spec.Hooks.Prestart.`
`746`		`-func (g Generator) ClearPreStartHook() {`
	`745`	`+// ClearPreStartHooks clear g.spec.Hooks.Prestart.`
	`746`	`+func (g Generator) ClearPreStartHooks() {`
`747`	`747`	`g.spec.Hooks.Prestart = []rspec.Hook{}`
`748`	`748`	`}`
`749`	`749`
`@@ -754,8 +754,8 @@ func (g Generator) AddPreStartHook(s string) error {`
`754`	`754`	`return nil`
`755`	`755`	`}`
`756`	`756`
`757`		`-// ClearPostStopHook clears g.spec.Hooks.Poststop.`
`758`		`-func (g Generator) ClearPostStopHook() {`
	`757`	`+// ClearPostStopHooks clear g.spec.Hooks.Poststop.`
	`758`	`+func (g Generator) ClearPostStopHooks() {`
`759`	`759`	`g.spec.Hooks.Poststop = []rspec.Hook{}`
`760`	`760`	`}`
`761`	`761`
`@@ -766,8 +766,8 @@ func (g Generator) AddPostStopHook(s string) error {`
`766`	`766`	`return nil`
`767`	`767`	`}`
`768`	`768`
`769`		`-// ClearPostStartHook clears g.spec.Hooks.Poststart.`
`770`		`-func (g Generator) ClearPostStartHook() {`
	`769`	`+// ClearPostStartHooks clear g.spec.Hooks.Poststart.`
	`770`	`+func (g Generator) ClearPostStartHooks() {`
`771`	`771`	`g.spec.Hooks.Poststart = []rspec.Hook{}`
`772`	`772`	`}`
`773`	`773`
`@@ -932,8 +932,8 @@ func mapStrToNamespace(ns string, path string) (rspec.Namespace, error) {`
`932`	`932`	`}`
`933`	`933`	`}`
`934`	`934`
`935`		`-// ClearLinuxNamespace clears g.spec.Linux.Namespaces.`
`936`		`-func (g Generator) ClearLinuxNamespace() {`
	`935`	`+// ClearLinuxNamespaces clear g.spec.Linux.Namespaces.`
	`936`	`+func (g Generator) ClearLinuxNamespaces() {`
`937`	`937`	`g.spec.Linux.Namespaces = []rspec.Namespace{}`
`938`	`938`	`}`
`939`	`939`