Implement container network mode #13886

ptrivedi · 2025-12-12T17:22:43Z

Add container network type to container options
Create containers with the specified network mode option

Currently supported network modes:
- Host
- None

Bridge network mode will be added when the VHD is ready
Custom network mode will be added at a later time

Co-authored-by: Copilot <[email protected]>

Based on discussions, preferring easier code readability, maintenance, debugging until we do perf testing. Also consistency with existing codebase for similar scenarios

…t/WSL into user/ptrivedi/stop-cont

Copilot

Pull request overview

This PR implements container network mode support for WSLA containers, enabling users to specify network configurations when creating containers. The implementation adds network type options to the container API, updates the nerdctl command generation to pass appropriate network flags, and includes the Stop() method implementation for container lifecycle management. The changes also include a mutex type upgrade from std::mutex to std::recursive_mutex to support nested locking patterns.

Key changes:

Added WSLA_CONTAINER_NETWORK_TYPE enum and WSLA_CONTAINER_NETWORK struct to container options
Implemented network mode handling for Host and None modes (Bridge mode pending VHD updates)
Implemented the previously stubbed Stop() method for container lifecycle management

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/windows/wslaservice/inc/wslaservice.idl	Added WSLA_CONTAINER_NETWORK_TYPE enum and WSLA_CONTAINER_NETWORK struct to define container network configuration options
src/windows/wslaservice/exe/WSLAContainer.h	Changed m_lock from std::mutex to std::recursive_mutex to support nested locking when State() is called from locked methods
src/windows/wslaservice/exe/WSLAContainer.cpp	Implemented network mode handling in PrepareNerdctlCreateCommand() and implemented Stop() method for container lifecycle management
src/windows/common/WSLAProcessLauncher.h	Added FormatResult(int) overload declaration for formatting exit codes without full process output
src/windows/common/WSLAProcessLauncher.cpp	Implemented FormatResult(int) overload for Stop() method error messages
src/windows/common/WSLAContainerLauncher.h	Added containerNetworkType parameter to constructor and m_containerNetworkType member variable
src/windows/common/WSLAContainerLauncher.cpp	Updated constructor and LaunchNoThrow() to pass network type to container options
test/windows/WSLATests.cpp	Updated all container test cases with network type parameter and added ContainerNetwork test method to validate network mode functionality

test/windows/WSLATests.cpp

Copilot · 2025-12-12T17:29:20Z

src/windows/common/WSLAContainerLauncher.cpp

    const std::string& EntryPoint,
    const std::vector<std::string>& Arguments,
    const std::vector<std::string>& Environment,
+    int containerNetworkType,


The parameter name 'containerNetworkType' uses camelCase which is inconsistent with other parameter names in this constructor that use PascalCase (Image, Name, EntryPoint, Arguments, Environment, Flags). It should be renamed to 'ContainerNetworkType' for consistency.

@copilot open a new pull request to apply changes based on this feedback

Copilot · 2025-12-12T17:29:20Z

src/windows/common/WSLAContainerLauncher.h

        const std::string& EntryPoint = "",
        const std::vector<std::string>& Arguments = {},
        const std::vector<std::string>& Environment = {},
+        int containerNetworkType = 1,


The parameter name 'containerNetworkType' uses camelCase which is inconsistent with other parameter names in this function declaration that use PascalCase (Image, Name, EntryPoint, Arguments, Environment, Flags). It should be renamed to 'ContainerNetworkType' for consistency.

Suggested change

int containerNetworkType = 1,

int ContainerNetworkType = 1,

src/windows/common/WSLAContainerLauncher.h

Copilot · 2025-12-12T17:29:21Z

src/windows/common/WSLAContainerLauncher.h

 private:
    std::string m_image;
    std::string m_name;
+    int m_containerNetworkType;


The member variable type should be 'WSLA_CONTAINER_NETWORK_TYPE' instead of 'int' for type safety and consistency with the struct field it's assigned to.

@copilot open a new pull request to apply changes based on this feedback

* Add container network type to container options * Create containers with the specified network mode option * Currently supported network modes: - Host - None Bridge network mode will be added when the VHD is ready Custom network mode will be added at a later time

src/windows/wslaservice/exe/WSLAContainer.cpp

test/windows/WSLATests.cpp

Copilot · 2025-12-15T15:32:23Z

@ptrivedi I've opened a new pull request, #13911, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2025-12-15T15:32:53Z

@ptrivedi I've opened a new pull request, #13912, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2025-12-15T15:33:00Z

@ptrivedi I've opened a new pull request, #13913, to work on those changes. Once the pull request is ready, I'll request review from you.

…microsoft/WSL into user/ptrivedi/cont-network-mode

constructor

Copilot · 2025-12-15T17:35:03Z

@ptrivedi I've opened a new pull request, #13915, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2025-12-15T17:36:32Z

@ptrivedi I've opened a new pull request, #13916, to work on those changes. Once the pull request is ready, I'll request review from you.

src/windows/wslaservice/exe/WSLAContainer.cpp

network type being passed in

Pooja Trivedi and others added 12 commits December 8, 2025 19:46

Implement Stop Container

901ec06

Add TODO for testing Stop() on a container in 'Created' state

be9cdce

Update src/windows/wslaservice/exe/WSLAContainer.cpp

d1aab64

Co-authored-by: Copilot <[email protected]>

Update src/windows/wslaservice/exe/WSLAContainer.cpp

63ec07c

Co-authored-by: Copilot <[email protected]>

Update src/windows/wslaservice/exe/WSLAContainer.cpp

38d53f6

Co-authored-by: Copilot <[email protected]>

Fix timeout, state, etc.

c614d36

Change to using a recursive_mutex for now

d7f3e27

Based on discussions, preferring easier code readability, maintenance, debugging until we do perf testing. Also consistency with existing codebase for similar scenarios

Merge branch 'feature/wsl-for-apps' into user/ptrivedi/stop-cont

ae4c079

Merge branch 'feature/wsl-for-apps' into user/ptrivedi/stop-cont

938f482

Merge branch 'wsl-for-apps' into user/ptrivedi/stop-cont

bcbd3b0

Fix merge issues and change to recursive_mutex after merge

0643572

Merge branch 'user/ptrivedi/stop-cont' of https://github.com/microsof…

9fcb838

…t/WSL into user/ptrivedi/stop-cont

ptrivedi requested a review from a team as a code owner December 12, 2025 17:22

ptrivedi requested review from Brian-Perkins, OneBlue, benhillis, Copilot and justus-camp-microsoft December 12, 2025 17:22

ptrivedi changed the base branch from master to feature/wsl-for-apps December 12, 2025 17:23

ptrivedi requested a review from a team as a code owner December 12, 2025 17:23

Copilot started reviewing on behalf of ptrivedi December 12, 2025 17:23 View session

Copilot AI reviewed Dec 12, 2025

View reviewed changes

ptrivedi force-pushed the user/ptrivedi/cont-network-mode branch from 1a7785b to 7286ff9 Compare December 12, 2025 17:30

Pooja Trivedi added 2 commits December 12, 2025 12:33

Change container network type to enum

e0153c3

Merge branch 'wsl-for-apps' into user/ptrivedi/cont-network-mode

f2dd958

benhillis reviewed Dec 12, 2025

View reviewed changes

src/windows/wslaservice/exe/WSLAContainer.cpp Show resolved Hide resolved

OneBlue reviewed Dec 13, 2025

View reviewed changes

src/windows/wslaservice/exe/WSLAContainer.cpp Outdated Show resolved Hide resolved

test/windows/WSLATests.cpp Show resolved Hide resolved

Copilot AI mentioned this pull request Dec 15, 2025

Fix parameter naming inconsistencies in WSLAContainerLauncher #13911

Merged

6 tasks

Copilot AI mentioned this pull request Dec 15, 2025

Remove redundant static_cast in container network type assignment #13912

Closed

6 tasks

Copilot AI mentioned this pull request Dec 15, 2025

Confirm type safety improvement for container network mode #13913

Closed

6 tasks

ptrivedi and others added 4 commits December 15, 2025 10:41

Merge branch 'feature/wsl-for-apps' into user/ptrivedi/cont-network-mode

d2b4155

Implement code review feedback

40007d7

Merge branch 'user/ptrivedi/cont-network-mode' of https://github.com/…

c19e851

…microsoft/WSL into user/ptrivedi/cont-network-mode

Fix merge issue: Pass container network type to WSLAContainerLauncher

592439c

constructor

Copilot AI mentioned this pull request Dec 15, 2025

Verify network mode test assertions are correct #13915

Closed

6 tasks

Copilot AI mentioned this pull request Dec 15, 2025

Address reviewer feedback on container network mode test #13916

Closed

6 tasks

Incorporate copilot code review suggestion

4cf5c11

OneBlue reviewed Dec 15, 2025

View reviewed changes

src/windows/wslaservice/exe/WSLAContainer.cpp Outdated Show resolved Hide resolved

OneBlue reviewed Dec 15, 2025

View reviewed changes

src/windows/wslaservice/exe/WSLAContainer.cpp Outdated Show resolved Hide resolved

ptrivedi force-pushed the user/ptrivedi/cont-network-mode branch from 9691a2a to 41776f6 Compare December 15, 2025 19:50

OneBlue approved these changes Dec 15, 2025

View reviewed changes

ptrivedi force-pushed the user/ptrivedi/cont-network-mode branch 2 times, most recently from dc8946a to 87b7671 Compare December 15, 2025 20:01

Fix formatting and change hresult return to E_INVALIDARG for invalid

606dc8d

network type being passed in

ptrivedi force-pushed the user/ptrivedi/cont-network-mode branch from 87b7671 to 606dc8d Compare December 15, 2025 20:08

OneBlue merged commit fbe4450 into feature/wsl-for-apps Dec 15, 2025
6 checks passed

Implement container network mode #13886

Implement container network mode #13886

Uh oh!

Conversation

ptrivedi commented Dec 12, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

ptrivedi Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

ptrivedi Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Dec 15, 2025

Uh oh!

Copilot AI commented Dec 15, 2025

Uh oh!

Copilot AI commented Dec 15, 2025

Uh oh!

Copilot AI commented Dec 15, 2025

Uh oh!

Copilot AI commented Dec 15, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants