Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix initialisms #11

Merged
merged 1 commit into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/api/connection/mechanisms/common/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const (
// DstIP - key for DstIP parameters
DstIP = "dst_ip"

// NetNsInodeKey - netns inode mechanism property key
NetNsInodeKey = "netnsInode"
// NetNSInodeKey - netns inode mechanism property key
NetNSInodeKey = "netnsInode"
// Workspace - NSM workspace location mechanism property key
Workspace = "workspace"
// InterfaceNameKey - interface name mechanism property key
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/connection/mechanisms/kernel/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ const (
WorkspaceNSEName = "workspaceNseName"
// MemifSocket - memif socket filename
MemifSocket = "memif.sock"
// NsmBaseDirEnv - NSM location directory
NsmBaseDirEnv = "NSM_BASE_DIR"
// NSMBaseDirEnv - NSM location directory
NSMBaseDirEnv = "NSM_BASE_DIR"
)
8 changes: 4 additions & 4 deletions pkg/api/connection/mechanisms/kernel/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

// Mechanism - kernel mechanism helper
type Mechanism interface {
// GetNetNsInode - return net ns inode
GetNetNsInode() string
// GetNetNSInode - return net ns inode
GetNetNSInode() string
GetParameters() map[string]string
}

Expand All @@ -51,9 +51,9 @@ func (m *mechanism) GetParameters() map[string]string {
return m.Parameters
}

func (m *mechanism) GetNetNsInode() string {
func (m *mechanism) GetNetNSInode() string {
if m == nil || m.GetParameters() == nil {
return ""
}
return m.GetParameters()[common.NetNsInodeKey]
return m.GetParameters()[common.NetNSInodeKey]
}
6 changes: 3 additions & 3 deletions pkg/api/connection/mechanisms/memif/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
type Mechanism interface {
GetSocketFilename() string
GetWorkspace() string
GetNetNsInode() string
GetNetNSInode() string
}

type mechanism struct {
Expand Down Expand Up @@ -61,9 +61,9 @@ func (m *mechanism) GetSocketFilename() string {
}

// GetNetNsInode get the name of the Netns Inode
func (m *mechanism) GetNetNsInode() string {
func (m *mechanism) GetNetNSInode() string {
if m == nil || m.GetParameters() == nil {
return ""
}
return m.GetParameters()[common.NetNsInodeKey]
return m.GetParameters()[common.NetNSInodeKey]
}