aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-19 15:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

virtcontainers: Network API cleanups and simplifications

Browse Source 
Remove unused parameters.
Reduce the number of parameters by deriving some of them (e.g. a
networking config) from their outer structure (e.g. a Sandbox
reference).

Signed-off-by: Samuel Ortiz <s.ortiz@apple.com>
This commit is contained in:
Samuel Ortiz
2021-11-06 06:56:50 +01:00
committed by Samuel Ortiz
parent 2edea88369
commit d7b67a7d1a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/virtcontainers/sandbox.go
View File

@@ -825,7 +825,7 @@ func (s *Sandbox) createNetwork(ctx context.Context) error {
// after vm is started.
if s.factory == nil {
// Add the network
endpoints, err := s.network.Add(ctx, &s.config.NetworkConfig, s, false)
endpoints, err := s.network.Add(ctx, s, false)
if err != nil {
return err
}
@@ -836,14 +836,14 @@ func (s *Sandbox) createNetwork(ctx context.Context) error {
}
func (s *Sandbox) postCreatedNetwork(ctx context.Context) error {
return s.network.PostAdd(ctx, &s.networkNS, s.factory != nil)
return s.network.PostAdd(ctx, s.factory != nil)
}
func (s *Sandbox) removeNetwork(ctx context.Context) error {
span, ctx := katatrace.Trace(ctx, s.Logger(), "removeNetwork", sandboxTracingTags, map[string]string{"sandbox_id": s.id})
defer span.End()
return s.network.Remove(ctx, &s.networkNS, s.hypervisor)
return s.network.Remove(ctx)
}
func (s *Sandbox) generateNetInfo(inf *pbTypes.Interface) (NetworkInfo, error) {
@@ -1173,7 +1173,7 @@ func (s *Sandbox) startVM(ctx context.Context) (err error) {
}
}()
if err := s.network.Run(ctx, s.networkNS.NetNsPath, func() error {
if err := s.network.Run(ctx, func() error {
if s.factory != nil {
vm, err := s.factory.GetVM(ctx, VMConfig{
HypervisorType: s.config.HypervisorType,
@@ -1195,7 +1195,7 @@ func (s *Sandbox) startVM(ctx context.Context) (err error) {
// In case of vm factory, network interfaces are hotplugged
// after vm is started.
if s.factory != nil {
endpoints, err := s.network.Add(ctx, &s.config.NetworkConfig, s, true)
endpoints, err := s.network.Add(ctx, s, true)
if err != nil {
return err
}