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.

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

Modify Network structures json tags #17536

Merged
merged 1 commit into from
Oct 30, 2015
Merged

Modify Network structures json tags #17536

merged 1 commit into from
Oct 30, 2015

Conversation

aboch
Copy link
Contributor

@aboch aboch commented Oct 30, 2015

  • So that they comply with docker inspect convention
    Which is allowing camel case for json field names

Fixes #17519

Signed-off-by: Alessandro Boch aboch@docker.com

@tiborvass
Copy link
Contributor

@tiborvass
Copy link
Contributor

@aboch please use IPAM instead of Ipam. The reasoning is because we always write IP and IPAM is an acronym. For ID, we already use Id everywhere, so even though I would have preferred ID, we have to keep it Id for consistency.

@aboch
Copy link
Contributor Author

aboch commented Oct 30, 2015

@tibor ok

- So that they comply with docker inspect convention
  Which is allowing camel case for json field names

Signed-off-by: Alessandro Boch <aboch@docker.com>
@aboch
Copy link
Contributor Author

aboch commented Oct 30, 2015

@tiborvass Addressed your comment. PTAL. Thanks.

@tiborvass
Copy link
Contributor

LGTM

@vdemeester
Copy link
Member

LGTM 😉

@abronan
Copy link
Contributor

abronan commented Oct 30, 2015

LGTM

@dnephin
Copy link
Member

dnephin commented Oct 30, 2015

Tested this patch with compose. We need to make some small changes to the test suite, but no changes to the application code.

LGTM

dnephin added a commit to dnephin/compose that referenced this pull request Oct 30, 2015
)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
@tiborvass tiborvass self-assigned this Oct 30, 2015
tiborvass added a commit that referenced this pull request Oct 30, 2015
Modify Network structures json tags
@tiborvass tiborvass merged commit a154b95 into moby:master Oct 30, 2015
@abronan
Copy link
Contributor

abronan commented Oct 30, 2015

After testing the change with Swarm, properties below IPAM are apparently still lowercase. @aboch is working on that.

/cc @dnephin @tiborvass

@tiborvass
Copy link
Contributor

@abronan thanks, that's weird :S

@tiborvass
Copy link
Contributor

Ping @moxiegirl for out-of-band docs check

@moxiegirl
Copy link
Contributor

@tiborvass I'll check this and add any changes to #17340

@tiborvass tiborvass removed their assignment Oct 31, 2015
dnephin added a commit to dnephin/compose that referenced this pull request Nov 2, 2015
)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 3, 2015
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
moby#17538

Update network endpoint responses, with updated response
introduced in;
moby#17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

moby#17085
moby#17127
moby#13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
dnephin added a commit to dnephin/compose that referenced this pull request Nov 3, 2015
)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
tiborvass pushed a commit to tiborvass/docker that referenced this pull request Nov 3, 2015
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
moby#17538

Update network endpoint responses, with updated response
introduced in;
moby#17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

moby#17085
moby#17127
moby#13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 286fe69)

Conflicts:
	docs/reference/api/docker_remote_api_v1.22.md
mdaue pushed a commit to mdaue/compose that referenced this pull request Nov 29, 2015
)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
mdaue pushed a commit to mdaue/compose that referenced this pull request Dec 20, 2015
)

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants