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.

Sign up for GitHub

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

Jump to bottom

session: Support new format of object session context #416

Merged
merged 1 commit into from
Oct 4, 2022
Merged

session: Support new format of object session context #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions netmap/grpc/types.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 48 additions & 48 deletions object/grpc/service_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions session/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ func (c *ObjectSessionContext) ToGRPCMessage() grpc.Message {
m = new(session.ObjectSessionContext)

m.SetVerb(ObjectSessionVerbToGRPCField(c.verb))
m.SetAddress(c.addr.ToGRPCMessage().(*refsGRPC.Address))
m.SetTarget(c.cnr.ToGRPCMessage().(*refsGRPC.ContainerID), refs.ObjectIDListToGRPCMessage(c.objs))
}

return m
Expand All @@ -688,20 +688,25 @@ func (c *ObjectSessionContext) FromGRPCMessage(m grpc.Message) error {

var err error

addr := v.GetAddress()
if addr == nil {
c.addr = nil
cnr := v.GetTarget().GetContainer()
if cnr == nil {
c.cnr = nil
} else {
if c.addr == nil {
c.addr = new(refs.Address)
if c.cnr == nil {
c.cnr = new(refs.ContainerID)
}

err = c.addr.FromGRPCMessage(addr)
err = c.cnr.FromGRPCMessage(cnr)
if err != nil {
return err
}
}

c.objs, err = refs.ObjectIDListFromGRPCMessage(v.GetTarget().GetObjects())
if err != nil {
return err
}

c.verb = ObjectSessionVerbFromGRPCField(v.GetVerb())

return nil
Expand Down
9 changes: 6 additions & 3 deletions session/grpc/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ func (m *SessionToken_Body) SetContainerSessionContext(v *ContainerSessionContex
}
}

// SetAddress sets address of the object related to the session.
func (m *ObjectSessionContext) SetAddress(v *refs.Address) {
m.Address = v
// SetTarget specifies objects involved in the object session.
func (m *ObjectSessionContext) SetTarget(cnr *refs.ContainerID, objs []*refs.ObjectID) {
m.Target = &ObjectSessionContext_Target{
Container: cnr,
Objects: objs,
}
}

// SetVerb sets type of request for which the token is issued.
Expand Down
Loading