From: Michael Cambria Date: Tue, 23 Apr 2019 15:54:01 +0000 (-0400) Subject: remove cniOp message and code X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=6895243410d38c19643359e6183c88ec765fd573;p=demo-grpc.git remove cniOp message and code --- diff --git a/api/api.proto b/api/api.proto index 1d5ecaa..028c06b 100644 --- a/api/api.proto +++ b/api/api.proto @@ -7,13 +7,6 @@ service CNIserver { // Process CNI message rpc CNIconfig (ConfPath) returns (CNIerror) {} - rpc CNIop (CNImsg) returns (CNIresult) { - option (google.api.http) = { - post: "/1/cni" - body: "*" - }; - } - rpc CNIadd (CNIaddMsg) returns (ADDresult) { option (google.api.http) = { post: "/1/add" @@ -40,13 +33,6 @@ message CNIerror { string error = 1; } -enum CmdType { - VERSION = 0; - ADD = 1; - CHECK = 2; - DEL = 3; -} - // "portMappings": [ // { "hostPort": 9090, "containerPort": 90, "protocol": "sctp" }, // { "hostPort": 9090, "containerPort": 90, "protocol": "tcp" } @@ -75,24 +61,6 @@ message ConfPath { string netConf = 2; } -message CNImsg { - ConfPath configPath = 1; - string binPath = 2; - CmdType cmd = 3; - string containerID = 4; - string netNS = 5; - string ifName = 6; - string cniArgs = 7; - string stdIn = 8; - CNIcapArgs capArgs = 9; -} - -message CNIresult { - CmdType cmd = 1; - string error = 2; - string stdOut = 3; -} - message CNIaddMsg { string conf = 1; string containerID = 2; diff --git a/api/handler.go b/api/handler.go index c0e0834..a155eb9 100644 --- a/api/handler.go +++ b/api/handler.go @@ -47,35 +47,6 @@ func (s *CNIServer) CNIconfig(ctx context.Context, confPath *ConfPath) (*CNIerro return &cniError, nil } -// CNIop generates result to a CNImsg -func (s *CNIServer) CNIop(ctx context.Context, in *CNImsg) (*CNIresult, error) { - - confPath := in.ConfigPath - - if confPath != nil { - if confPath.NetDir != "" { - log.Printf("Receive message NetDir: %s", confPath.NetDir) - } - if confPath.NetConf != "" { - log.Printf("Receive message NetConf: %s", confPath.NetConf) - } - } - - log.Printf("Receive message ContainerID: %s", in.ContainerID) - log.Printf("Receive message NetNS: %s", in.NetNS) - log.Printf("Receive message IfName: %s", in.IfName) - log.Printf("Receive message StdIn: %s", in.StdIn) - log.Printf("Receive message CniArgs: %s", in.CniArgs) - - cniResult := CNIresult{ - Cmd: in.Cmd, - StdOut: "stdOutStringHere", - } - - log.Printf("Response from server: %s", cniResult.StdOut) - return &cniResult, nil -} - // CNIadd generates result to a CNIaddMsg func (s *CNIServer) CNIadd(ctx context.Context, in *CNIaddMsg) (*ADDresult, error) { @@ -248,26 +219,3 @@ _, _ = f.Write([]byte(sout)) return &netconf, rt, cninet, nil } - -/* -{ - - - switch os.Args[1] { - case CmdAdd: - result, err := cninet.AddNetworkList(context.TODO(), netconf, rt) - if result != nil { - _ = result.Print() - } - return err - case CmdCheck: - err := cninet.CheckNetworkList(context.TODO(), netconf, rt) - return err - case CmdDel: - err := cninet.DelNetworkList(context.TODO(), netconf, rt) - return err - } - - return nil -} -*/ diff --git a/client/main.go b/client/main.go index cdb1ca6..3a679da 100644 --- a/client/main.go +++ b/client/main.go @@ -51,136 +51,6 @@ func (a *Authentication) RequireTransportSecurity() bool { return true } -func sendgRPCusingTcp() error { - var conn *grpc.ClientConn - - // Create the client TLS credentials - creds, err := credentials.NewClientTLSFromFile("cert/server.crt", "") - if err != nil { - log.Fatalf("could not load tls cert: %s", err) - return err - } - - // Setup the login/pass - auth := Authentication{ - Login: "john", - Password: "doe", - } - - // Initiate a connection with the server - conn, err = grpc.Dial("localhost:7777", grpc.WithTransportCredentials(creds), grpc.WithPerRPCCredentials(&auth)) - if err != nil { - log.Fatalf("did not connect: %s", err) - return err - } - defer conn.Close() - - // CNI Test - cni := api.NewCNIserverClient(conn) - - cniPath := api.ConfPath { - NetDir: "/home/mcambria/go/src/github.com/containernetworking", - NetConf: "firewall-mcc1-range-chain", - } - - cniMsg := api.CNImsg{ - //ConfigPath: { - //NetDir: "/home/mcambria/go/src/github.com/containernetworking", - //NetConf: "firewall-mcc1-range-chain", - //}, - ConfigPath: &cniPath, - Cmd: api.CmdType_ADD, - ContainerID: "containerOne", - NetNS: "/var/run/netns/mcc-test-0", - IfName: "ensX", - StdIn: "stdInStringHere", - CniArgs: "IgnoreUnknown=1;IP=10.1.0.20", - - } - result, err := cni.CNIop(context.Background(), &cniMsg) - if err != nil { - log.Fatalf("error when calling CNIop: %s", err) - return err - } - - log.Printf("Response from TCP server: %s", result.StdOut) - - return nil -} - -func sendgRPCusingUnix() error { - - var conn *grpc.ClientConn - - // Create the unix socket client TLS credentials - creds, err := credentials.NewClientTLSFromFile("cert/unixServer.crt", "") - if err != nil { - log.Fatalf("could not load tls cert: %s", err) - return err - } - - // Setup the login/pass - auth := Authentication{ - Login: "john", - Password: "doe", - } - - // Initiate a connection with the server - conn, err = grpc.Dial("unix:///tmp/grpc.sock", grpc.WithTransportCredentials(creds), grpc.WithPerRPCCredentials(&auth)) - if err != nil { - log.Fatalf("did not connect: %s", err) - return err - } - defer conn.Close() - - // CNI Test - cni := api.NewCNIserverClient(conn) - - cniPath := api.ConfPath { - NetDir: "/home/mcambria/go/src/github.com/containernetworking", - NetConf: "firewall-mcc1-range-chain", - } - - cniMsg := api.CNImsg{ - //ConfigPath: { - //NetDir: "/home/mcambria/go/src/github.com/containernetworking", - //NetConf: "firewall-mcc1-range-chain", - //}, - ConfigPath: &cniPath, - Cmd: api.CmdType_ADD, - ContainerID: "containerOne", - NetNS: "/var/run/netns/mcc-test-0", - IfName: "ensX", - StdIn: "stdInStringHere", - CniArgs: "IgnoreUnknown=1;IP=10.1.0.20", - - } - result, err := cni.CNIop(context.Background(), &cniMsg) - if err != nil { - log.Fatalf("error when calling CNIop: %s", err) - return err - } - log.Printf("Response from TCP server: %s", result.StdOut) - - // Now use add version of .proto - cniAddMsg := api.CNIaddMsg{ - Conf: cniPath.NetConf, - ContainerID: "containerOne", - NetNS: "/var/run/netns/mcc-test-0", - IfName: "ensX", - CniArgs: "IgnoreUnknown=1;IP=10.1.0.20", - - } - resultAdd, err := cni.CNIadd(context.Background(), &cniAddMsg) - if err != nil { - log.Fatalf("error when calling CNIadd: %s", err) - return err - } - log.Printf("Response from Unix Socket server: %s", resultAdd.StdOut) - - return nil -} - func main() { if len(os.Args) < 4 { usage()