From eec7a8f61a2178b274b6fbf644f77162bcb9e2fe Mon Sep 17 00:00:00 2001 From: afeiszli Date: Mon, 26 Jul 2021 15:08:25 +0000 Subject: [PATCH] making sure all changes are in --- controllers/.nodeGrpcController.go.swp | Bin 0 -> 16384 bytes controllers/nodeGrpcController.go | 3 ++- netclient/functions/checkin.go | 2 +- test/nodecreate.sh | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 controllers/.nodeGrpcController.go.swp diff --git a/controllers/.nodeGrpcController.go.swp b/controllers/.nodeGrpcController.go.swp new file mode 100644 index 0000000000000000000000000000000000000000..41326d0a789ca5490307f7ded31b98957f564480 GIT binary patch literal 16384 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 Tr16B`p6JqU-g|;N_Tm2qXaTg- literal 0 HcmV?d00001 diff --git a/controllers/nodeGrpcController.go b/controllers/nodeGrpcController.go index 6c6661e0..e4809257 100644 --- a/controllers/nodeGrpcController.go +++ b/controllers/nodeGrpcController.go @@ -157,6 +157,7 @@ func (s *NodeServiceServer) CheckIn(ctx context.Context, req *nodepb.CheckInReq) data := req.GetNode() //postchanges := req.GetPostchanges() // Now we have to convert this into a NodeItem type to convert into BSON + log.Println("checkin data:",data) node := models.Node{ // ID: primitive.NilObjectID, MacAddress: data.GetMacaddress(), @@ -244,7 +245,7 @@ func (s *NodeServiceServer) UpdateNode(ctx context.Context, req *nodepb.UpdateNo if err != nil { return nil, status.Errorf( codes.NotFound, - fmt.Sprintf("Could not find node with supplied Mac Address: %v", err), + fmt.Sprintf("Could not update node: %v", err), ) } return &nodepb.UpdateNodeRes{ diff --git a/netclient/functions/checkin.go b/netclient/functions/checkin.go index cae5b741..41044afd 100644 --- a/netclient/functions/checkin.go +++ b/netclient/functions/checkin.go @@ -237,7 +237,7 @@ func CheckIn(cliconf config.ClientConfig) error { fmt.Println("Node has requested to update remote config.") fmt.Println("Posting local config to remote server.") postnode := server.GetNode(network) - + fmt.Println("POSTING NODE: ",postnode.Macaddress,postnode.Saveconfig) req := &nodepb.UpdateNodeReq{ Node: &postnode, } diff --git a/test/nodecreate.sh b/test/nodecreate.sh index 7ab6921c..67f04e76 100755 --- a/test/nodecreate.sh +++ b/test/nodecreate.sh @@ -3,7 +3,7 @@ PUBKEY="DM5qhLAE20PG9BbfBCger+Ac9D2NDOwCtY1rbYDLf34=" IPADDR="69.173.21.202" MACADDRESS="59:2a:9c:d4:e2:49" -ACCESSKEY="q5VHqUmamqsfgnpy" +ACCESSKEY="6Cc1m3x0B0LQhHWF" PASSWORD="ppppppp" generate_post_json () @@ -15,12 +15,12 @@ generate_post_json () "macaddress": "$MACADDRESS", "password": "$PASSWORD", "localaddress": "172.123.123.3", - "accesskey": "HskQMAoHVplC3l7E" + "accesskey": "PieOi5nsjA0RITf0" } EOF } POST_JSON=$(generate_post_json) -curl --max-time 5.0 -d "$POST_JSON" -H 'Content-Type: application/json' -H "authorization: Bearer secretkey" localhost:8081/api/nodes/network +curl --max-time 5.0 -d "$POST_JSON" -H 'Content-Type: application/json' -H "authorization: Bearer secretkey" localhost:8081/api/nodes/skynet