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

update from src repo #2

Merged
merged 35 commits into from
Apr 10, 2018
Merged

update from src repo #2

Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
75f8590
Merge pull request #11 from ContainX/master
zizhongwei Oct 26, 2017
2eeea21
Fix JSON deserialize bug cause by 'sessionPersistence' is abstract type
Nov 30, 2017
54148f1
Fix JSON deserialize bug cause by 'sessionPersistence' is abstract type
Nov 30, 2017
8800a23
aodh gnocchi driver support
zhangjianweibj Dec 5, 2017
cf6d376
add vip_network_id for LoadBalancer post
Dec 8, 2017
81b651a
add vip_port_id builder
Dec 8, 2017
11a1465
Merge pull request #14 from ContainX/master
zizhongwei Dec 11, 2017
7681716
Add octavia error msg to ActionResponse
Jan 16, 2018
b42fea0
Added SFC Service, FlowClassifier and one trial call.
dmitryintel Jan 17, 2018
7a45d4a
Merge pull request #1133 from Grim-lock/bugfix
auhlig Jan 22, 2018
010d0d8
Merge pull request #1140 from Grim-lock/errmsg
auhlig Jan 22, 2018
b4873e7
Merge pull request #1127 from doufum/LbPoolV2-patch
auhlig Jan 22, 2018
aae20c8
Added create/delete for FlowClassifier. Refactor SFCService.
dmitryintel Jan 19, 2018
b9fee5c
add loadbalancer_id to LbPoolV2Builder
Jan 23, 2018
87ca4ea
Added builder() method, moved testjson objects. Added a test.
dmitryintel Jan 24, 2018
7f6bae4
Address the remaining review comments: Rename SFCService
dmitryintel Jan 25, 2018
744dba5
Added PortPairService, Impl, unit tests
dmitryintel Jan 24, 2018
f3d4466
Added PortPairService, Impl, unit tests
dmitryintel Jan 24, 2018
5a879e3
Added PortCchain and service apis and impls.
dmitryintel Jan 25, 2018
940ef7d
Rename ServiceFunctionChainTests
dmitryintel Jan 25, 2018
1d7afbb
Expand on unit tests. Correct FlowClassifiers
dmitryintel Jan 26, 2018
5b93ff2
Address some errors in the code and in OS API documentation.
dmitryintel Jan 26, 2018
6fbb570
Because docs do not mention int group_id, removing it
dmitryintel Jan 29, 2018
5c75dcd
Fix a builder and add unit tests
dmitryintel Jan 30, 2018
b0fca5d
Merge pull request #1141 from dmitryintel/master
vinodborole Feb 1, 2018
f8efaeb
Useless catch statements
olivergondza Feb 9, 2018
8333796
Add snapshots repository for betamax
olivergondza Feb 9, 2018
8fb9920
Merge pull request #1143 from Grim-lock/pool_lb_id
auhlig Feb 22, 2018
dc97e67
Avoid long running threads to collect okhttp connections we discard e…
olivergondza Feb 21, 2018
9d817b6
Consider the Config's SSLContext in the Resteasy connector
ThomasBri Mar 2, 2018
0b9ef09
Fix issue #1165.
Mar 13, 2018
7fb33df
Merge pull request #1151 from olivergondza/okhttp-socket-leak
auhlig Mar 22, 2018
7635570
Merge pull request #1166 from gdankov/httpclient-connection-deadlock-fix
auhlig Mar 22, 2018
0f5f1e5
Merge pull request #1162 from ThomasBri/issue-1161
auhlig Mar 22, 2018
a355840
Merge pull request #1134 from inspur-iop/aodh_gnocchi_support
auhlig Mar 22, 2018
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
2 changes: 2 additions & 0 deletions core/src/main/java/org/openstack4j/openstack/networking/domain/ext/NeutronLbPoolV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.common.base.MoreObjects;
import org.openstack4j.model.network.ext.LbMethod;
import org.openstack4j.model.network.ext.LbPoolV2;
Expand Down Expand Up @@ -36,6 +37,7 @@ public class NeutronLbPoolV2 implements LbPoolV2 {
private LbMethod lbMethod;

@JsonProperty("session_persistence")
@JsonDeserialize(as = NeutronSessionPersistence.class)
private SessionPersistence sessionPersistence;

@JsonProperty("admin_state_up")
Expand Down