Skip to content

Commit a424136

Browse files
committed
Merge pull request woorea#131 from mkolesni/v3.0.x
Unify neutron entities & add tests
2 parents f8e5245 + 35909c8 commit a424136

File tree

11 files changed

+1001
-647
lines changed

11 files changed

+1001
-647
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.codehaus.jackson</groupId>
8686
<artifactId>jackson-mapper-asl</artifactId>
87-
<version>1.9.4</version>
87+
<version>1.9.13</version>
8888
</dependency>
8989
</dependencies>
9090

quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.woorea.openstack.base.client.OpenStackClient;
77
import com.woorea.openstack.base.client.OpenStackRequest;
88
import com.woorea.openstack.quantum.model.Network;
9-
import com.woorea.openstack.quantum.model.NetworkForCreate;
109
import com.woorea.openstack.quantum.model.Networks;
1110

1211
public class NetworksResource {
@@ -21,10 +20,14 @@ public List list() {
2120
return new List();
2221
}
2322

24-
public Create create(NetworkForCreate net){
23+
public Create create(Network net) {
2524
return new Create(net);
2625
}
2726

27+
public Update update(Network net) {
28+
return new Update(net);
29+
}
30+
2831
public Delete delete(String netId){
2932
return new Delete(netId);
3033
}
@@ -53,11 +56,18 @@ public Query(Network network) {
5356

5457
public class Create extends OpenStackRequest<Network> {
5558

56-
public Create(NetworkForCreate net){
59+
public Create(Network net) {
5760
super(CLIENT, HttpMethod.POST, "networks", Entity.json(net), Network.class);
5861
}
5962
}
6063

64+
public class Update extends OpenStackRequest<Network> {
65+
66+
public Update(Network net) {
67+
super(CLIENT, HttpMethod.PUT, buildPath("networks/", net.getId()), Entity.json(net), Network.class);
68+
}
69+
}
70+
6171
public class Show extends OpenStackRequest<Network> {
6272

6373
public Show(String id) {

quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.woorea.openstack.base.client.OpenStackClient;
77
import com.woorea.openstack.base.client.OpenStackRequest;
88
import com.woorea.openstack.quantum.model.Subnet;
9-
import com.woorea.openstack.quantum.model.SubnetForCreate;
109
import com.woorea.openstack.quantum.model.Subnets;
1110

1211
public class SubnetsResource {
@@ -21,10 +20,14 @@ public List list() {
2120
return new List();
2221
}
2322

24-
public Create create(SubnetForCreate net){
23+
public Create create(Subnet net) {
2524
return new Create(net);
2625
}
2726

27+
public Update update(Subnet net) {
28+
return new Update(net);
29+
}
30+
2831
public Delete delete(String netId){
2932
return new Delete(netId);
3033
}
@@ -53,11 +56,18 @@ public Query(Subnet subnet) {
5356

5457
public class Create extends OpenStackRequest<Subnet> {
5558

56-
public Create(SubnetForCreate subnet){
59+
public Create(Subnet subnet) {
5760
super(CLIENT, HttpMethod.POST, "subnets", Entity.json(subnet), Subnet.class);
5861
}
5962
}
6063

64+
public class Update extends OpenStackRequest<Subnet> {
65+
66+
public Update(Subnet subnet) {
67+
super(CLIENT, HttpMethod.PUT, buildPath("subnets/", subnet.getId()), Entity.json(subnet), Subnet.class);
68+
}
69+
}
70+
6171
public class Show extends OpenStackRequest<Subnet> {
6272

6373
public Show(String id) {

quantum-model/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,12 @@
88
<artifactId>quantum-model</artifactId>
99
<name>OpenStack Quantum Model</name>
1010
<description>OpenStack Quantum Model</description>
11+
<dependencies>
12+
<dependency>
13+
<groupId>junit</groupId>
14+
<artifactId>junit</artifactId>
15+
<version>4.10</version>
16+
<scope>test</scope>
17+
</dependency>
18+
</dependencies>
1119
</project>

0 commit comments

Comments
 (0)