Skip to content

Commit

Permalink
move opi api from crypto to EncryptedVolume
Browse files Browse the repository at this point in the history 
Signed-off-by: Vipin Jain <jainvipin@gmail.com>
  • Loading branch information
@jainvipin
jainvipin committed Nov 21, 2022
1 parent 35c77a6 commit a93a35d
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 90 deletions.
2 changes: 1 addition & 1 deletion client/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module opi.storage.v1
go 1.19

require (
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a
google.golang.org/grpc v1.51.0
)

Expand Down
32 changes: 2 additions & 30 deletions client/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/opiproject/opi-api v0.0.0-20221108132726-72b6da21c09a h1:VeVARKHUwoVMvIevAOI30Jmjkyy1xQHsa+yNOi97mIU=
github.com/opiproject/opi-api v0.0.0-20221108132726-72b6da21c09a/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221108151912-50dd35e8bdf9 h1:Se6voYPH0tFU4hPjMzzm/qi+fQ9bX7jUZxMvGooJcxQ=
github.com/opiproject/opi-api v0.0.0-20221108151912-50dd35e8bdf9/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221108172248-8bc7b1116f8a h1:ZRG10EkYPLVZoh0Rj+frQlcoUr0ExtwucoGu09Ff5LU=
github.com/opiproject/opi-api v0.0.0-20221108172248-8bc7b1116f8a/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221109154022-1fdb13d9f4f2 h1:yLjAQ8sQxLwP9Bg4C4ODlJcQzSZxbGeZ6o1N74lX7UI=
github.com/opiproject/opi-api v0.0.0-20221109154022-1fdb13d9f4f2/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221109190423-124cf8307f41 h1:0xrGbSSxi6f90e67A1v8DY40teN3Lt8tv6hJBLkdusw=
github.com/opiproject/opi-api v0.0.0-20221109190423-124cf8307f41/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221109211833-28e180c2b861 h1:nemJXB02Fba6ABy5jLwONhzNhVZZXKQjCp36dzS2vFs=
github.com/opiproject/opi-api v0.0.0-20221109211833-28e180c2b861/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221110142707-ff3fb4ac5d06 h1:TTXcS3FrNS48InPw/f2R/NY6lhSNDqwoYZAzFOvTtEw=
github.com/opiproject/opi-api v0.0.0-20221110142707-ff3fb4ac5d06/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221110181853-70e9b94f0639 h1:mScRVOSk125hN0ml4eUZ1CvDTYn2pBOc5c9l38Bn9DA=
github.com/opiproject/opi-api v0.0.0-20221110181853-70e9b94f0639/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221111162909-12de4dd988a0 h1:mvnXHTF24rE3HYUrKjh6eAyrYbvi2augehpCFKwvaFU=
github.com/opiproject/opi-api v0.0.0-20221111162909-12de4dd988a0/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221111230258-34e208409ec2 h1:AAgyJQOtuN5+PFajjhLZIVDfaTWZQ8t5u3tqTnK3nzE=
github.com/opiproject/opi-api v0.0.0-20221111230258-34e208409ec2/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221114164938-b94e8f880124 h1:VYflLsXLNtMcNE4gpZJoME3Gu2bgWo9O6BbCtOhMajQ=
github.com/opiproject/opi-api v0.0.0-20221114164938-b94e8f880124/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221115122823-23fcac6de230 h1:tGhXrmh8v8hoOHsUxy0fnryFNHN2GTNuO44k+xQsFHI=
github.com/opiproject/opi-api v0.0.0-20221115122823-23fcac6de230/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221115234013-ffe4aadd66ca h1:vRYng2TL09Q/QAe3xn9gQS9KMdhSCLTzpTCenyRO/SY=
github.com/opiproject/opi-api v0.0.0-20221115234013-ffe4aadd66ca/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3 h1:5NztGQz+dkljZD1737jOmmsUA3Hcl+7mZpdcmR5Kn8s=
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a h1:dFFDDQez4aCsKEkvEnQ+yFnMu5/yZ/VWBxbIRmAvgd4=
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
Expand All @@ -41,8 +15,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY=
google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
Expand Down
26 changes: 13 additions & 13 deletions client/middleend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
func doMiddleend(ctx context.Context, conn grpc.ClientConnInterface) {
log.Printf("Test middleend")

// Crypto
// EncryptedVolume
c1 := pb.NewMiddleendServiceClient(conn)
log.Printf("Testing NewCryptoServiceClient")
rs1, err := c1.CreateCrypto(ctx, &pb.CreateCryptoRequest{
Volume: &pb.Crypto{
CryptoId: &pc.ObjectKey{Value: "OpiCrypto3"},
log.Printf("Testing NewEncryptedVolumeServiceClient")
rs1, err := c1.CreateEncryptedVolume(ctx, &pb.CreateEncryptedVolumeRequest{
Volume: &pb.EncryptedVolume{
EncryptedVolumeId: &pc.ObjectKey{Value: "OpiEncryptedVolume3"},
VolumeId: &pc.ObjectKey{Value: "Malloc1"},
Key: []byte("0123456789abcdef0123456789abcdef"),
},
Expand All @@ -26,9 +26,9 @@ func doMiddleend(ctx context.Context, conn grpc.ClientConnInterface) {
log.Fatalf("could not create CRYPTO device: %v", err)
}
log.Printf("Added: %v", rs1)
rs3, err := c1.UpdateCrypto(ctx, &pb.UpdateCryptoRequest{
Volume: &pb.Crypto{
CryptoId: &pc.ObjectKey{Value: "OpiCrypto3"},
rs3, err := c1.UpdateEncryptedVolume(ctx, &pb.UpdateEncryptedVolumeRequest{
Volume: &pb.EncryptedVolume{
EncryptedVolumeId: &pc.ObjectKey{Value: "OpiEncryptedVolume3"},
VolumeId: &pc.ObjectKey{Value: "Malloc1"},
Key: []byte("0123456789abcdef0123456789abcdef"),
},
Expand All @@ -37,22 +37,22 @@ func doMiddleend(ctx context.Context, conn grpc.ClientConnInterface) {
log.Fatalf("could not update CRYPTO device: %v", err)
}
log.Printf("Updated: %v", rs3)
rs4, err := c1.ListCrypto(ctx, &pb.ListCryptoRequest{})
rs4, err := c1.ListEncryptedVolume(ctx, &pb.ListEncryptedVolumeRequest{})
if err != nil {
log.Fatalf("could not list CRYPTO device: %v", err)
}
log.Printf("Listed: %v", rs4)
rs5, err := c1.GetCrypto(ctx, &pb.GetCryptoRequest{CryptoId: &pc.ObjectKey{Value: "OpiCrypto3"}})
rs5, err := c1.GetEncryptedVolume(ctx, &pb.GetEncryptedVolumeRequest{EncryptedVolumeId: &pc.ObjectKey{Value: "OpiEncryptedVolume3"}})
if err != nil {
log.Fatalf("could not get CRYPTO device: %v", err)
}
log.Printf("Got: %s", rs5.CryptoId.Value)
rs6, err := c1.CryptoStats(ctx, &pb.CryptoStatsRequest{CryptoId: &pc.ObjectKey{Value: "OpiCrypto3"}})
log.Printf("Got: %s", rs5.EncryptedVolumeId.Value)
rs6, err := c1.EncryptedVolumeStats(ctx, &pb.EncryptedVolumeStatsRequest{EncryptedVolumeId: &pc.ObjectKey{Value: "OpiEncryptedVolume3"}})
if err != nil {
log.Fatalf("could not stats CRYPTO device: %v", err)
}
log.Printf("Stats: %s", rs6.Stats)
rs2, err := c1.DeleteCrypto(ctx, &pb.DeleteCryptoRequest{CryptoId: &pc.ObjectKey{Value: "OpiCrypto3"}})
rs2, err := c1.DeleteEncryptedVolume(ctx, &pb.DeleteEncryptedVolumeRequest{EncryptedVolumeId: &pc.ObjectKey{Value: "OpiEncryptedVolume3"}})
if err != nil {
log.Fatalf("could not delete CRYPTO device: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module opi.storage.v1
go 1.19

require (
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
Expand Down
22 changes: 2 additions & 20 deletions server/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/opiproject/opi-api v0.0.0-20221109211833-28e180c2b861 h1:nemJXB02Fba6ABy5jLwONhzNhVZZXKQjCp36dzS2vFs=
github.com/opiproject/opi-api v0.0.0-20221109211833-28e180c2b861/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221110142707-ff3fb4ac5d06 h1:TTXcS3FrNS48InPw/f2R/NY6lhSNDqwoYZAzFOvTtEw=
github.com/opiproject/opi-api v0.0.0-20221110142707-ff3fb4ac5d06/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221110181853-70e9b94f0639 h1:mScRVOSk125hN0ml4eUZ1CvDTYn2pBOc5c9l38Bn9DA=
github.com/opiproject/opi-api v0.0.0-20221110181853-70e9b94f0639/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221111162909-12de4dd988a0 h1:mvnXHTF24rE3HYUrKjh6eAyrYbvi2augehpCFKwvaFU=
github.com/opiproject/opi-api v0.0.0-20221111162909-12de4dd988a0/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221111230258-34e208409ec2 h1:AAgyJQOtuN5+PFajjhLZIVDfaTWZQ8t5u3tqTnK3nzE=
github.com/opiproject/opi-api v0.0.0-20221111230258-34e208409ec2/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221114164938-b94e8f880124 h1:VYflLsXLNtMcNE4gpZJoME3Gu2bgWo9O6BbCtOhMajQ=
github.com/opiproject/opi-api v0.0.0-20221114164938-b94e8f880124/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221115122823-23fcac6de230 h1:tGhXrmh8v8hoOHsUxy0fnryFNHN2GTNuO44k+xQsFHI=
github.com/opiproject/opi-api v0.0.0-20221115122823-23fcac6de230/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221115234013-ffe4aadd66ca h1:vRYng2TL09Q/QAe3xn9gQS9KMdhSCLTzpTCenyRO/SY=
github.com/opiproject/opi-api v0.0.0-20221115234013-ffe4aadd66ca/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3 h1:5NztGQz+dkljZD1737jOmmsUA3Hcl+7mZpdcmR5Kn8s=
github.com/opiproject/opi-api v0.0.0-20221117170559-ca2c25b808b3/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a h1:dFFDDQez4aCsKEkvEnQ+yFnMu5/yZ/VWBxbIRmAvgd4=
github.com/opiproject/opi-api v0.0.0-20221121200811-5d2289de810a/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 h1:TtyC78WMafNW8QFfv3TeP3yWNDG+uxNkk9vOrnDu6JA=
github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6/go.mod h1:h8272+G2omSmi30fBXiZDMkmHuOgonplfKIKjQWzlfs=
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
Expand All @@ -33,8 +17,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY=
google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
Expand Down
50 changes: 25 additions & 25 deletions server/middleend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

//////////////////////////////////////////////////////////

func (s *server) CreateCrypto(ctx context.Context, in *pb.CreateCryptoRequest) (*pb.Crypto, error) {
log.Printf("CreateCrypto: Received from client: %v", in)
func (s *server) CreateEncryptedVolume(ctx context.Context, in *pb.CreateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) {
log.Printf("CreateEncryptedVolume: Received from client: %v", in)
params := BdevCryptoCreateParams{
Name: in.Volume.CryptoId.Value,
Name: in.Volume.EncryptedVolumeId.Value,
BaseBdevName: in.Volume.VolumeId.Value,
CryptoPmd: "crypto_aesni_mb",
Key: string(in.Volume.Key),
Expand All @@ -36,7 +36,7 @@ func (s *server) CreateCrypto(ctx context.Context, in *pb.CreateCryptoRequest) (
return nil, err
}
log.Printf("Received from SPDK: %v", result)
response := &pb.Crypto{}
response := &pb.EncryptedVolume{}
err = deepcopier.Copy(in.Volume).To(response)
if err != nil {
log.Printf("error: %v", err)
Expand All @@ -45,10 +45,10 @@ func (s *server) CreateCrypto(ctx context.Context, in *pb.CreateCryptoRequest) (
return response, nil
}

func (s *server) DeleteCrypto(ctx context.Context, in *pb.DeleteCryptoRequest) (*emptypb.Empty, error) {
log.Printf("DeleteCrypto: Received from client: %v", in)
func (s *server) DeleteEncryptedVolume(ctx context.Context, in *pb.DeleteEncryptedVolumeRequest) (*emptypb.Empty, error) {
log.Printf("DeleteEncryptedVolume: Received from client: %v", in)
params := BdevCryptoDeleteParams{
Name: in.CryptoId.Value,
Name: in.EncryptedVolumeId.Value,
}
var result BdevCryptoDeleteResult
err := call("bdev_crypto_delete", &params, &result)
Expand All @@ -63,10 +63,10 @@ func (s *server) DeleteCrypto(ctx context.Context, in *pb.DeleteCryptoRequest) (
return &emptypb.Empty{}, nil
}

func (s *server) UpdateCrypto(ctx context.Context, in *pb.UpdateCryptoRequest) (*pb.Crypto, error) {
log.Printf("UpdateCrypto: Received from client: %v", in)
func (s *server) UpdateEncryptedVolume(ctx context.Context, in *pb.UpdateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) {
log.Printf("UpdateEncryptedVolume: Received from client: %v", in)
params1 := BdevCryptoDeleteParams{
Name: in.Volume.CryptoId.Value,
Name: in.Volume.EncryptedVolumeId.Value,
}
var result1 BdevCryptoDeleteResult
err1 := call("bdev_crypto_delete", &params1, &result1)
Expand All @@ -79,7 +79,7 @@ func (s *server) UpdateCrypto(ctx context.Context, in *pb.UpdateCryptoRequest) (
log.Printf("Could not delete: %v", in)
}
params2 := BdevCryptoCreateParams{
Name: in.Volume.CryptoId.Value,
Name: in.Volume.EncryptedVolumeId.Value,
BaseBdevName: in.Volume.VolumeId.Value,
CryptoPmd: "crypto_aesni_mb",
Key: string(in.Volume.Key),
Expand All @@ -93,7 +93,7 @@ func (s *server) UpdateCrypto(ctx context.Context, in *pb.UpdateCryptoRequest) (
return nil, err2
}
log.Printf("Received from SPDK: %v", result2)
response := &pb.Crypto{}
response := &pb.EncryptedVolume{}
err3 := deepcopier.Copy(in.Volume).To(response)
if err3 != nil {
log.Printf("error: %v", err3)
Expand All @@ -102,27 +102,27 @@ func (s *server) UpdateCrypto(ctx context.Context, in *pb.UpdateCryptoRequest) (
return response, nil
}

func (s *server) ListCrypto(ctx context.Context, in *pb.ListCryptoRequest) (*pb.ListCryptoResponse, error) {
log.Printf("ListCrypto: Received from client: %v", in)
func (s *server) ListEncryptedVolume(ctx context.Context, in *pb.ListEncryptedVolumeRequest) (*pb.ListEncryptedVolumeResponse, error) {
log.Printf("ListEncryptedVolume: Received from client: %v", in)
var result []BdevGetBdevsResult
err := call("bdev_get_bdevs", nil, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
Blobarray := make([]*pb.Crypto, len(result))
Blobarray := make([]*pb.EncryptedVolume, len(result))
for i := range result {
r := &result[i]
Blobarray[i] = &pb.Crypto{CryptoId: &pc.ObjectKey{Value: r.Name}}
Blobarray[i] = &pb.EncryptedVolume{EncryptedVolumeId: &pc.ObjectKey{Value: r.Name}}
}
return &pb.ListCryptoResponse{Volumes: Blobarray}, nil
return &pb.ListEncryptedVolumeResponse{Volumes: Blobarray}, nil
}

func (s *server) GetCrypto(ctx context.Context, in *pb.GetCryptoRequest) (*pb.Crypto, error) {
log.Printf("GetCrypto: Received from client: %v", in)
func (s *server) GetEncryptedVolume(ctx context.Context, in *pb.GetEncryptedVolumeRequest) (*pb.EncryptedVolume, error) {
log.Printf("GetEncryptedVolume: Received from client: %v", in)
params := BdevGetBdevsParams{
Name: in.CryptoId.Value,
Name: in.EncryptedVolumeId.Value,
}
var result []BdevGetBdevsResult
err := call("bdev_get_bdevs", &params, &result)
Expand All @@ -136,13 +136,13 @@ func (s *server) GetCrypto(ctx context.Context, in *pb.GetCryptoRequest) (*pb.Cr
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
return &pb.Crypto{CryptoId: &pc.ObjectKey{Value: result[0].Name}}, nil
return &pb.EncryptedVolume{EncryptedVolumeId: &pc.ObjectKey{Value: result[0].Name}}, nil
}

func (s *server) CryptoStats(ctx context.Context, in *pb.CryptoStatsRequest) (*pb.CryptoStatsResponse, error) {
log.Printf("CryptoStats: Received from client: %v", in)
func (s *server) EncryptedVolumeStats(ctx context.Context, in *pb.EncryptedVolumeStatsRequest) (*pb.EncryptedVolumeStatsResponse, error) {
log.Printf("EncryptedVolumeStats: Received from client: %v", in)
params := BdevGetIostatParams{
Name: in.CryptoId.Value,
Name: in.EncryptedVolumeId.Value,
}
// See https://mholt.github.io/json-to-go/
var result BdevGetIostatResult
Expand All @@ -157,7 +157,7 @@ func (s *server) CryptoStats(ctx context.Context, in *pb.CryptoStatsRequest) (*p
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
return &pb.CryptoStatsResponse{Stats: fmt.Sprint(result.Bdevs[0])}, nil
return &pb.EncryptedVolumeStatsResponse{Stats: fmt.Sprint(result.Bdevs[0])}, nil
}

//////////////////////////////////////////////////////////

0 comments on commit a93a35d

Please # to comment.