[specific ci=Group1-Docker-Commands] Add support for network labels #4138
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@hmahmood @sflxn The code changes for label support are concentrated in these files: The other changes are just a refactor to improve readability by replacing 5+ function input args with one struct containing those fields. |
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
b4326c4
to
d3df9b9
Compare
hmahmood
suggested changes
Mar 3, 2017
lib/portlayer/network/context.go
Outdated
| @@ -133,7 +137,17 @@ func NewContext(config *Configuration, kv kvstore.KeyValueStore) (*Context, erro | |||
| } | |||
|
|
|||
| subnet := net.IPNet{IP: n.Gateway.IP.Mask(n.Gateway.Mask), Mask: n.Gateway.Mask} | |||
| s, err := ctx.newScope(n.Type, nn, &subnet, n.Gateway.IP, n.Nameservers, pools) | |||
|
|
|||
| scopeData = ScopeData{ | |||
There was a problem hiding this comment.
Fixed all occurrences. Thanks!
lib/portlayer/network/context.go
Outdated
| @@ -310,44 +324,48 @@ func (c *Context) addScope(s *Scope) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (c *Context) newScopeCommon(id uid.UID, name, scopeType string, subnet *net.IPNet, gateway net.IP, dns []net.IP, pools []string, network object.NetworkReference) (*Scope, error) { | |||
| func (c *Context) newScopeCommon(id uid.UID, scopeType string, network object.NetworkReference, scopeData ScopeData) (*Scope, error) { | |||
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
d3df9b9
to
8dcef49
Compare
hmahmood
approved these changes
Mar 3, 2017
rajanashok
approved these changes
Mar 3, 2017
anchal-agrawal
changed the title
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
8dcef49
to
2d2bede
Compare
anchal-agrawal
changed the title
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
2d2bede
to
c1fe817
Compare
mhagen-vmware
approved these changes
Mar 7, 2017
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
c1fe817
to
3b59821
Compare
jzt
approved these changes
Mar 7, 2017
* Adds the 'annotations' field in the portlayer's Scope struct
to store user-specified labels for networks. The labels map
is base64-encoded on the persona for the portlayer and decoded
on the persona while populating network info for network list
calls.
* Refactors scope creation logic in the portlayer to improve
readability. Replaces several func input args with one struct
containing all needed fields.
* Adds integration tests for creating, filtering and inspecting
a network with labels.
anchal-agrawal
force-pushed
the
3738-network-labels
branch
from
3b59821
to
3051ee0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for labels in
network createandnetwork inspect. With this change,network ls -f label=...also works as expected.Fixes #3738