Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Enhance network functions #597

Merged
merged 11 commits into from
Sep 27, 2017
Merged

Enhance network functions #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c00e6b
Add runv `interface` command
WeiZhang555 Sep 5, 2017
7ff8dfb
Support setting mtu for network interface
WeiZhang555 Sep 5, 2017
373c4d6
Support modify network interface name
WeiZhang555 Sep 5, 2017
3779921
bugfix & enhancement: add more nic with new name
WeiZhang555 Sep 6, 2017
50bd8ed
Add `interface ls` command
WeiZhang555 Sep 8, 2017
13f308a
Using existing tap device in host instead of creating new one
WeiZhang555 Sep 8, 2017
84e1f86
Add "interface rm" command
WeiZhang555 Sep 11, 2017
a87b6c4
Support update interface
WeiZhang555 Sep 12, 2017
1d6db33
Merge branch 'cni-network-support-up' into up-master
WeiZhang555 Sep 21, 2017
d40bd49
Fix errors during merge
WeiZhang555 Sep 23, 2017
01239f9
Fix some review comments
WeiZhang555 Sep 27, 2017
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
164 changes: 90 additions & 74 deletions api/descriptions.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 api/descriptions.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ syntax = "proto3";

package api;

// To generate description.pb.go, run:
// $ protoc --go_out=plugins=grpc:. descriptions.proto

message SandboxConfig {
string hostname = 1;
repeated string dns = 2;
Expand Down Expand Up @@ -52,13 +55,15 @@ message VolumeDescription {

message InterfaceDescription {
string id = 1;
bool lo = 2;
string bridge = 3;
string ip = 4;
string mac = 5;
string gw = 6;
string tapName = 7;
string options = 8;
string name = 2;
bool lo = 3;
string bridge = 4;
string ip = 5;
string mac = 6;
uint64 mtu = 7;
string gw = 8;
string tapName = 9;
string options = 10;
}

message PortDescription {
Expand Down
2 changes: 1 addition & 1 deletion cli/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func createContainer(options runvOptions, vm *hypervisor.Vm, container, bundle,
}

// If runv is launched via docker/containerd, we start netlistener to watch/collect network changes.
// TODO: if runv is launched by cni compatible tools, the cni script can use `runv cni` cmdline to update the network.
// TODO: if runv is launched by cni compatible tools, the cni script can use `runv interface` cmdline to update the network.
// Create the listener process which will enters into the netns of the shim
options.withContainer = state
if err = startNsListener(options, vm); err != nil {
Expand Down
Loading