1. docker
  2. Commit 5b3fc7aab25be908cab869dab5c0b2cb821d31dc
Browse code

Match case for variables in sysinfo pkg

I noticied an inconsistency when reviewing docker/pull/20692.

Changing Ip to IP and Nf to NF.

More info: The golang folks recommend that you keep the initials consistent:
https://github.com/golang/go/wiki/CodeReviewComments#initialisms.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>

Christy Perez authored on 2016/02/27 03:47:43
Showing 4 changed files
daemon/info.go
History View file @ 5b3fc7a
... ... 
@@ -75,8 +75,8 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
75 75 
 		DriverStatus:       daemon.layerStore.DriverStatus(),
76 76 
 		Plugins:            daemon.showPluginsInfo(),
77 77 
 		IPv4Forwarding:     !sysInfo.IPv4ForwardingDisabled,
78 
-		BridgeNfIptables:   !sysInfo.BridgeNfCallIptablesDisabled,
79 
-		BridgeNfIP6tables:  !sysInfo.BridgeNfCallIP6tablesDisabled,
78 
+		BridgeNfIptables:   !sysInfo.BridgeNFCallIPTablesDisabled,
79 
+		BridgeNfIP6tables:  !sysInfo.BridgeNFCallIP6TablesDisabled,
80 80 
 		Debug:              utils.IsDebugEnabled(),
81 81 
 		NFd:                fileutils.GetTotalUsedFds(),
82 82 
 		NGoroutines:        runtime.NumGoroutine(),
integration-cli/requirements_unix.go
History View file @ 5b3fc7a
... ... 
@@ -83,13 +83,13 @@ var (
83 83 
 	}
84 84 
 	bridgeNfIptables = testRequirement{
85 85 
 		func() bool {
86 
-			return !SysInfo.BridgeNfCallIptablesDisabled
86 
+			return !SysInfo.BridgeNFCallIPTablesDisabled
87 87 
 		},
88 88 
 		"Test requires that bridge-nf-call-iptables support be enabled in the daemon.",
89 89 
 	}
90 90 
 	bridgeNfIP6tables = testRequirement{
91 91 
 		func() bool {
92 
-			return !SysInfo.BridgeNfCallIP6tablesDisabled
92 
+			return !SysInfo.BridgeNFCallIP6TablesDisabled
93 93 
 		},
94 94 
 		"Test requires that bridge-nf-call-ip6tables support be enabled in the daemon.",
95 95 
 	}
pkg/sysinfo/sysinfo.go
History View file @ 5b3fc7a
... ... 
@@ -19,10 +19,10 @@ type SysInfo struct {
19 19 
 	IPv4ForwardingDisabled bool
20 20
21 21 
 	// Whether bridge-nf-call-iptables is supported or not
22 
-	BridgeNfCallIptablesDisabled bool
22 
+	BridgeNFCallIPTablesDisabled bool
23 23
24 24 
 	// Whether bridge-nf-call-ip6tables is supported or not
25 
-	BridgeNfCallIP6tablesDisabled bool
25 
+	BridgeNFCallIP6TablesDisabled bool
26 26
27 27 
 	// Whether the cgroup has the mountpoint of "devices" or not
28 28 
 	CgroupDevicesEnabled bool
pkg/sysinfo/sysinfo_linux.go
History View file @ 5b3fc7a
... ... 
@@ -50,8 +50,8 @@ func New(quiet bool) *SysInfo {
50 50 
 	sysInfo.CgroupDevicesEnabled = ok
51 51
52 52 
 	sysInfo.IPv4ForwardingDisabled = !readProcBool("/proc/sys/net/ipv4/ip_forward")
53 
-	sysInfo.BridgeNfCallIptablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables")
54 
-	sysInfo.BridgeNfCallIP6tablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables")
53 
+	sysInfo.BridgeNFCallIPTablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables")
54 
+	sysInfo.BridgeNFCallIP6TablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables")
55 55
56 56 
 	// Check if AppArmor is supported.
57 57 
 	if _, err := os.Stat("/sys/kernel/security/apparmor"); !os.IsNotExist(err) {