update docker service related model by fengxx · Pull Request #917 · docker-java/docker-java

fengxx · 2017-09-20T17:04:07Z

change command from String to List, see also spec
add labels and forceUpdate

This change is

KostyaSha · 2017-09-21T21:24:42Z

+        labels.put("com.docker.java.usage","test");
        dockerClient.createServiceCmd(new ServiceSpec()
-                .withName(SERVICE_NAME)
+                .withName(SERVICE_NAME).withLabels(labels)


please call fluent from new line

KostyaSha · 2017-09-21T21:25:33Z

could i postpone it until i resolve tests refactoring (atm fixing parallel execution issues)?

KostyaSha · 2017-09-21T21:25:51Z

Btw, are you testing master code?

fengxx · 2017-09-24T13:42:24Z

yes, I am testing on master code, please take your time for refactoring

KostyaSha · 2017-09-29T01:08:23Z

please rebase

fengxx · 2017-09-29T13:19:55Z

got java.lang.Exception: Method beforeTest() should be static when running in IDE, but failsafe:integration-test is fine
I am not sure whether it is ok to set a default value, e.g. null EndpointSpec.mode will be created as VIP, set default value to VIP can help writing tests using IsEqual to compare inspect results

KostyaSha · 2017-09-29T13:22:48Z

m... i didn't look at swarm tests after migration. What IDE do you use?

fengxx · 2017-09-29T13:32:43Z

IntelliJ IDEA

java.lang.Exception: Method beforeTest() should be static

	at org.junit.runners.model.FrameworkMethod.validatePublicVoid(FrameworkMethod.java:93)
	at org.junit.runners.model.FrameworkMethod.validatePublicVoidNoArg(FrameworkMethod.java:74)
	at org.junit.runners.ParentRunner.validatePublicVoidNoArgMethods(ParentRunner.java:155)
	at org.junit.runners.ParentRunner.collectInitializationErrors(ParentRunner.java:125)
	at org.junit.runners.ParentRunner.validate(ParentRunner.java:416)
	at org.junit.runners.ParentRunner.<init>(ParentRunner.java:84)
	at org.junit.runners.Suite.<init>(Suite.java:112)
	at org.junit.runners.Parameterized.<init>(Parameterized.java:243)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)

KostyaSha · 2017-09-29T13:36:12Z

+     * a counter that triggers an update even if no relevant parameters have been changed
+     * a random value will work if it is incrementing.
+     */
+    @JsonProperty("ForceUpdate")


usually we don't define default values and using includeNonNull

Ok, I will update test case to set the value explicitly instead of relying default value

KostyaSha · 2017-09-29T13:37:13Z

@fengxx feel free to change it, i only converted tests from testng, but they were failing even before. Not sure how to use them in travis.

KostyaSha · 2017-10-22T00:57:31Z

i thought bit more about swarm mode tests. Probably swarm init/etc should be done with DIND image and all other operations against just swarm endpoint, WDYT?

sebastianbinder · 2017-11-27T12:18:05Z

Any update on this?

add labels and forceUpdate add PortConfig.PublishMode change command from String to List<String>

fengxx · 2017-12-04T05:51:17Z

Rebase on master

codecov-io · 2017-12-04T07:27:24Z

Codecov Report

Merging #917 into master will decrease coverage by 1.6%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #917      +/-   ##
==========================================
- Coverage   61.87%   60.26%   -1.61%     
==========================================
  Files         410      421      +11     
  Lines        8159     8383     +224     
  Branches      521      538      +17     
==========================================
+ Hits         5048     5052       +4     
- Misses       2815     3035     +220     
  Partials      296      296

Impacted Files	Coverage Δ
...com/github/dockerjava/api/model/ContainerSpec.java	`2.63% <ø> (ø)`	⬆️
...ithub/dockerjava/api/model/PortConfigProtocol.java	`0% <ø> (ø)`	⬆️
.../github/dockerjava/api/model/ServicePlacement.java	`9.09% <0%> (-3.41%)`	⬇️
...github/dockerjava/netty/exec/ListTasksCmdExec.java	`0% <0%> (ø)`
...va/com/github/dockerjava/api/model/TaskStatus.java	`0% <0%> (ø)`
...va/com/github/dockerjava/api/model/PortConfig.java	`4.34% <0%> (-1.54%)`	⬇️
...thub/dockerjava/core/command/ListTasksCmdImpl.java	`0% <0%> (ø)`
...m/github/dockerjava/api/model/GenericResource.java	`0% <0%> (ø)`
...ava/com/github/dockerjava/api/model/TaskState.java	`0% <0%> (ø)`
...a/com/github/dockerjava/api/model/ServiceSpec.java	`3.84% <0%> (-0.51%)`	⬇️
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6941ba...fe8dbb6. Read the comment docs.

sebastianbinder · 2017-12-05T08:58:44Z

Thanks for your work @fengxx and @KostyaSha! Really appreciate it being able to use services now. I just opened #958 regarding some services issues. Maybe one of you guys has an idea.

orzeh mentioned this pull request Sep 21, 2017

Unrecognized field "Labels" (class com.github.dockerjava.api.model.ServiceSpec) #918

Closed

KostyaSha reviewed Sep 21, 2017

View reviewed changes

fengxx force-pushed the service_spec_json_props branch from bec651c to 145d9e5 Compare September 24, 2017 13:40

fengxx force-pushed the service_spec_json_props branch from e16c24c to ffb12c9 Compare September 29, 2017 13:11

fengxx force-pushed the service_spec_json_props branch from ffb12c9 to 3d0b84d Compare September 29, 2017 13:25

KostyaSha reviewed Sep 29, 2017

View reviewed changes

fengxx force-pushed the service_spec_json_props branch 4 times, most recently from 5c2b9b0 to 37e4cef Compare September 30, 2017 13:29

fengxx force-pushed the service_spec_json_props branch from 37e4cef to 76fb8f1 Compare October 9, 2017 04:34

KostyaSha closed this Dec 1, 2017

KostyaSha reopened this Dec 1, 2017

fengxx added 3 commits December 4, 2017 13:42

add JsonIgnoreProperties(ignoreUnknown = true)

db245a4

add labels and forceUpdate add PortConfig.PublishMode change command from String to List<String>

use uppercase name for enum

7f91923

update test

ded8afa

fengxx force-pushed the service_spec_json_props branch from 76fb8f1 to 07c44cf Compare December 4, 2017 05:51

fengxx added 2 commits December 4, 2017 15:09

support ListTasksCmd

1e04860

add Platforms to ServicePlacement, supported in v1.30

fe8dbb6

fengxx force-pushed the service_spec_json_props branch from 07c44cf to fe8dbb6 Compare December 4, 2017 07:10

KostyaSha added this to the 3.1.0 milestone Dec 4, 2017

KostyaSha merged commit e80848b into docker-java:master Dec 4, 2017

KostyaSha added the area/swarm-mode label Dec 4, 2017

Conversation

fengxx commented Sep 20, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KostyaSha Sep 21, 2017

Choose a reason for hiding this comment

Uh oh!

fengxx Sep 24, 2017

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Sep 21, 2017

Uh oh!

KostyaSha commented Sep 21, 2017

Uh oh!

fengxx commented Sep 24, 2017

Uh oh!

KostyaSha commented Sep 29, 2017

Uh oh!

fengxx commented Sep 29, 2017

Uh oh!

KostyaSha commented Sep 29, 2017

Uh oh!

fengxx commented Sep 29, 2017

Uh oh!

KostyaSha Sep 29, 2017

Choose a reason for hiding this comment

Uh oh!

fengxx Sep 29, 2017

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Sep 29, 2017

Uh oh!

KostyaSha commented Oct 22, 2017

Uh oh!

sebastianbinder commented Nov 27, 2017

Uh oh!

fengxx commented Dec 4, 2017

Uh oh!

codecov-io commented Dec 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sebastianbinder commented Dec 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fengxx commented Sep 20, 2017 •

edited

Loading

codecov-io commented Dec 4, 2017 •

edited

Loading

sebastianbinder commented Dec 5, 2017 •

edited

Loading