[WIP] Service APIs for Docker 1.12 #673

Yogu · 2016-08-17T13:32:22Z

Implement APIs for the new service APIs APIs introduced in Docker 1.12

This is a work in progress. Feel free to comment.

This change is

Depends on #686

KostyaSha · 2016-08-17T13:36:58Z

src/main/java/com/github/dockerjava/api/DockerClient.java

@@ -251,6 +252,12 @@

    DisconnectFromNetworkCmd disconnectFromNetworkCmd();

+    /**
+     * * SERVICE API *


imho useless comment

KostyaSha · 2016-08-17T13:46:46Z

cleanup javadocs
models should have fluent setters, toString, equals, hashCode
don't remove any existing fields until you will prove that they could be removed and unused.
read devel doc (TODO for me: create CONTRIBUTING.adoc)
Tests should pass on docker > 1.10 version (those that added in travis matrix). If field appeared in newer API version, then make checks conditional.
intends - checkstyle should warn about
all newer fields must be marked with @since. Also check -1 API version that field didn't exist before. Either it would be difficult later understand what and when was added.

KostyaSha · 2016-08-17T13:48:43Z

As example see https://github.com/docker-java/docker-java/pull/669/files

KostyaSha · 2016-08-17T13:53:08Z

When you are unsure what types are you can look at https://github.com/docker/engine-api/ and https://github.com/docker/docker/ code (and their test cases also)

KostyaSha · 2016-08-17T14:01:17Z

Will merge #667 firstly, it will also help test serialization on your models.

If you would need different local dockers, feel free to use https://hub.docker.com/r/kostyasha/dind/tags/ that is https://github.com/jpetazzo/dind fork or https://hub.docker.com/_/docker/

KostyaSha · 2016-08-17T14:02:10Z

Note: some sucking tests failing 🏧 feel free to ignore their errors.

KostyaSha · 2016-08-17T14:04:33Z

src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java

@@ -573,6 +575,10 @@ public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
    }

+    @Override public ListServicesCmd.Exec createListServicesCmdExec() {


don't oneline annotation

KostyaSha · 2016-08-18T21:58:31Z

Please rebase. If you will have backward compatibility breaking changes, then it would be possible to switch to 3.1.X

Yogu · 2016-08-18T22:12:34Z

There's this Node class introduced in PR #257 for the node property Docker Swarm adds to Event. Now, with Swarm Mode, the class name Node would be better spent on the real Node type with Swarm Mode. But it's probably not worth introducing backwards incompatibility for that, what do you think?

KostyaSha · 2016-08-18T22:19:02Z

If you can prove that Node doesn't exist since i.e. 1.9.x - then ok. If not, then just create secondary field/getters/setters for new field.

KostyaSha · 2016-08-18T22:20:02Z

I would also suggest split your changes into different small PRs (if all services/nodes are splittable).

KostyaSha · 2016-08-21T22:44:47Z

src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java

+
+    // CHECKSTYLE:OFF
+    @Override
+    public boolean equals(Object o) {


Use EqualsBuilder

KostyaSha · 2016-08-21T22:45:03Z

Please let me know if you will need any help

Yogu · 2016-08-22T12:01:57Z

We split this into one PR per resource - so this one will be for services. Thanks for the link to the developer guide, I'll make sure to follow the guidelines.

KostyaSha · 2016-08-22T13:03:42Z

src/main/java/com/github/dockerjava/api/model/BindOptions.java

+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}


Discarding my initial idea to link class. To be faster you can skip this RAV class linking. and just place 1.24.

Now I've used the link everywhere already, and it's not slower because I copy-paste anyway.

The idea was to click javadoc to RAV, and then have fast click to docker API page. But now i feel it too heavy.

KostyaSha · 2016-08-22T16:31:59Z

src/test/java/com/github/dockerjava/netty/exec/ListServicesCmdExecTest.java

+    }
+
+    @Test
+    public void testListContainers() throws Exception {


testListServices?

Don't forget to add check for dockerClient API version and throw new SkipException

KostyaSha · 2016-09-29T00:39:01Z

Could you rebase?
Placing 3.1.0 as i think both swarms would make sense to merge and release as 3.1.0 soon.

KostyaSha · 2016-09-29T20:17:49Z

src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java

+                        .withTaskHistoryRententionLimit(100)
+                ).withCaConfig(new SwarmCAConfig()
+                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
+                .withRaft(new SwarmRaftConfig()


so would ask not to place ) on new line as it seems simple fluent code that used everywhere with dot on new line.

MichaelRoeder · 2016-11-15T11:24:51Z

@Yogu @KostyaSha any updates here? Any way we could help to speed this up?

Yogu · 2016-11-15T16:18:54Z

Hey @MichaelRoeder Sorry, I was busy with a different project and then on vacation, but I'm now working on this again. This PR in particular is waiting on #686.

brunovale91 · 2017-01-24T14:37:31Z

I've implemented some service API's that I needed (InspectNodeCmd, InspectTaskCmd, ListServicesCmd, ListTasksCmd). If you want and if it helps I can do a pull request.

KostyaSha · 2017-01-24T15:12:42Z

Retriggering build.

KostyaSha · 2017-05-05T02:30:35Z

in #717

KostyaSha reviewed Aug 17, 2016
View reviewed changes

KostyaSha added the API/1.24 label Aug 17, 2016

KostyaSha reviewed Aug 17, 2016
View reviewed changes

Yogu force-pushed the docker-1.12 branch 3 times, most recently from 05367a9 to cd934c7 Compare August 18, 2016 20:51

KostyaSha reviewed Aug 21, 2016
View reviewed changes

KostyaSha mentioned this pull request Aug 21, 2016

Support for swarm mode in 1.12? KostyaSha/yet-another-docker-plugin#54

Open

Yogu force-pushed the docker-1.12 branch from ee65d0b to 0eb59e6 Compare August 22, 2016 12:01

KostyaSha reviewed Aug 22, 2016
View reviewed changes

Yogu mentioned this pull request Aug 29, 2016

Swarm Mode: Swarm endpoints #686

Closed

Yogu force-pushed the docker-1.12 branch 3 times, most recently from a8d25dc to e1669fd Compare September 6, 2016 22:10

KostyaSha added this to the 3.1.0 milestone Sep 29, 2016

KostyaSha reviewed Sep 29, 2016

View reviewed changes

martin894 and others added 7 commits November 13, 2016 13:29

Add endpoints for Swarm in swarm mode

ee4a584

Add endpoints for Service in swarm mode

a436ce6

Fix service tests

1eab7cf

Add missing withDriver() method

8492138

Fix json name of Networks in ServiceSpec

9b24ce9

Add tests to add network to services

aaefe87

Do not fail on empty beans

96d1187

Yogu force-pushed the docker-1.12 branch from e1669fd to 96d1187 Compare November 13, 2016 05:29

KostyaSha added the area/swarm-mode label Feb 13, 2017

KostyaSha changed the base branch from master to swarm February 13, 2017 22:19

KostyaSha mentioned this pull request Feb 14, 2017

Swarm branch, picking other prs #796

Merged

3 tasks

KostyaSha force-pushed the swarm branch 2 times, most recently from 3052ba0 to 0c21e76 Compare May 5, 2017 02:07

KostyaSha closed this May 5, 2017

KostyaSha mentioned this pull request May 5, 2017

[WIP] swarm branch to future 3.1.0 master #717

Merged

8 tasks

KostyaSha reopened this May 5, 2017

KostyaSha closed this May 5, 2017

[WIP] Service APIs for Docker 1.12 #673

[WIP] Service APIs for Docker 1.12 #673

Uh oh!

Conversation

Yogu commented Aug 17, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Aug 17, 2016

Uh oh!

KostyaSha commented Aug 17, 2016

Uh oh!

KostyaSha commented Aug 17, 2016

Uh oh!

KostyaSha commented Aug 17, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KostyaSha commented Aug 17, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Aug 18, 2016

Uh oh!

Yogu commented Aug 18, 2016

Uh oh!

KostyaSha commented Aug 18, 2016

Uh oh!

KostyaSha commented Aug 18, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Aug 21, 2016

Uh oh!

Yogu commented Aug 22, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Sep 29, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MichaelRoeder commented Nov 15, 2016

Uh oh!

Yogu commented Nov 15, 2016

Uh oh!

brunovale91 commented Jan 24, 2017

Uh oh!

KostyaSha commented Jan 24, 2017

Uh oh!

KostyaSha commented May 5, 2017

Uh oh!

Uh oh!

Yogu commented Aug 17, 2016 •

edited

Loading

KostyaSha commented Aug 17, 2016 •

edited

Loading