Create server handler include findNetworkNamespacePath and connectBridge #13
Conversation
Codecov Report
@@ Coverage Diff @@
## master #13 +/- ##
=======================================
Coverage 75.21% 75.21%
=======================================
Files 4 4
Lines 117 117
=======================================
Hits 88 88
Misses 20 20
Partials 9 9Continue to review full report at Codecov.
|
server/netlink-handler.go
Outdated
| md := hash.Sum(nil) | ||
| mdStr := hex.EncodeToString(md) | ||
| hostVethName := "veth" + mdStr[0:8] | ||
|
|
There was a problem hiding this comment.
move out to independent function in utils package
server/netlink-handler.go
Outdated
| } | ||
|
|
||
| func (s *server) ConnectBridge(ctx context.Context, req *pb.ConnectBridgeRequest) (*pb.ConnectBridgeResponse, error) { | ||
|
|
server/netlink-handler.go
Outdated
| ) | ||
|
|
||
| func (s *server) FindNetworkNamespacePath(ctx context.Context, req *pb.FindNetworkNamespacePathRequest) (*pb.FindNetworkNamespacePathResponse, error) { | ||
|
|
server/netlink-handler.go
Outdated
| } | ||
|
|
||
| func (s *server) ConnectBridge(ctx context.Context, req *pb.ConnectBridgeRequest) (*pb.ConnectBridgeResponse, error) { | ||
|
|
There was a problem hiding this comment.
runtime.LockOSThread() https://github.com/containernetworking/plugins/tree/master/pkg/ns
server/utils/utils.go
Outdated
| hash.Write([]byte(UUID)) | ||
| md := hash.Sum(nil) | ||
| mdStr := hex.EncodeToString(md) | ||
| return mdStr |
There was a problem hiding this comment.
How about
func sha256(str string) string {
hash := sha256.New()
hash.Write([]byte(str))
md := hash.Sum(nil)
return fmt.Sprintf("%s", hex.EncodeToString(md))
}
func GenerateVethName(uuid string) string {
str := sha256(uuid)
return fmt.Sprintf("veth%s", str[0:8])
}
There was a problem hiding this comment.
It should be fmt.Sprintf("%x", hex.EncodeToString(md)) I think, not %s.
There was a problem hiding this comment.
BTW, refactor is needed because the sha256 function is defined and used in more than one packages.
We can move it to github.com/linkernetworks/utils and in other packages, just import it.
server/netlink-handler.go
Outdated
| }, err | ||
| } | ||
|
|
||
| hostVethName := fmt.Sprintf("veth%s", utils.HashUUID(req.PodUUID)[0:8]) |
There was a problem hiding this comment.
If we use hostVethName := GenerateVethName(req.PodUUID) would be more clear and we even can reduce fmt dependency by moving fmt.Sprintf("veth%s", utils.HashUUID(req.PodUUID)[0:8]) to utils package.
findNetworkNamespacePath: UsePod Name,K8sNamespace,PodUUIDto get Network Namespace
connectBridge: Connect bridge[veth]<--->[veth]container