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

runtime-config-linux: Convert classID from hex to uint32 #296

Merged
merged 1 commit into from
Jan 13, 2016
Merged

runtime-config-linux: Convert classID from hex to uint32 #296

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: 2 additions & 2 deletions runtime-config-linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ For more information, see [the net\_cls cgroup man page](https://www.kernel.org/

The following parameters can be specified to setup these cgroup controllers:

* **`classID`** *(string, optional)* - is the network class identifier the cgroup's network packets will be tagged with
* **`classID`** *(uint32, optional)* - is the network class identifier the cgroup's network packets will be tagged with

* **`priorities`** *(array, optional)* - specifies a list of objects of the priorities assigned to traffic originating from
processes in the group and egressing the system on various interfaces. The following parameters can be specified per-priority:
Expand All @@ -389,7 +389,7 @@ processes in the group and egressing the system on various interfaces. The follo

```json
"network": {
"classID": "0x100001",
"classID": 1048577,
"priorities": [
{
"name": "eth0",
Expand Down
4 changes: 1 addition & 3 deletions runtime_config_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,7 @@ type Pids struct {
// Network identification and priority configuration
type Network struct {
// Set class identifier for container's network packets
// this is actually a string instead of a uint64 to overcome the json
// limitation of specifying hex numbers
ClassID string `json:"classID"`
ClassID *uint32 `json:"classID"`
// Set priority of network traffic for container
Priorities []InterfacePriority `json:"priorities"`
}
Expand Down