Skip to content

add support for security groups and some evolutions #1

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

Open
valinformatique wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add support for security groups and some evolutions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27d7625
add support for security groups and some evolutions
Jun 24, 2014
1d9aae7
correction for createImage
Jun 24, 2014
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
700 changes: 327 additions & 373 deletions nova-client/src/main/java/com/woorea/openstack/nova/api/ServersResource.java
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions quantum-client/src/main/java/com/woorea/openstack/quantum/Quantum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
package com.woorea.openstack.quantum;


import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackClientConnector;
import com.woorea.openstack.quantum.api.NetworksResource;
import com.woorea.openstack.quantum.api.PortsResource;
import com.woorea.openstack.quantum.api.RoutersResource;
import com.woorea.openstack.quantum.api.SecurityGroupsResource;
import com.woorea.openstack.quantum.api.SubnetsResource;


public class Quantum extends OpenStackClient {

private final NetworksResource NETWORKS;

private final PortsResource PORTS;

private final SubnetsResource SUBNETS;
private final RoutersResource ROUTERS;

public Quantum(String endpoint, OpenStackClientConnector connector) {
super(endpoint, connector);
NETWORKS = new NetworksResource(this);
PORTS = new PortsResource(this);
SUBNETS = new SubnetsResource(this);
ROUTERS=new RoutersResource(this);

}

public Quantum(String endpoint) {
this(endpoint, null);
}

public NetworksResource networks() {
return NETWORKS;
}

public PortsResource ports() {
return PORTS;
}

public SubnetsResource subnets() {
return SUBNETS;
}
public RoutersResource routers()
{
return ROUTERS;
}


private final NetworksResource NETWORKS;
private final PortsResource PORTS;
private final SubnetsResource SUBNETS;
private final RoutersResource ROUTERS;
private final SecurityGroupsResource SECURITYGROUPS;

public Quantum(String endpoint, OpenStackClientConnector connector) {
super(endpoint, connector);
NETWORKS = new NetworksResource(this);
PORTS = new PortsResource(this);
SUBNETS = new SubnetsResource(this);
ROUTERS = new RoutersResource(this);
SECURITYGROUPS = new SecurityGroupsResource(this);
}

public Quantum(String endpoint) {
this(endpoint, null);
}

public NetworksResource networks() {
return NETWORKS;
}

public PortsResource ports() {
return PORTS;
}

public SubnetsResource subnets() {
return SUBNETS;
}

public RoutersResource routers() {
return ROUTERS;
}
public SecurityGroupsResource securitygroups() {
return SECURITYGROUPS;
}

}
85 changes: 42 additions & 43 deletions quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@
package com.woorea.openstack.quantum.api;


import com.woorea.openstack.base.client.Entity;
import com.woorea.openstack.base.client.HttpMethod;
import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackRequest;
import com.woorea.openstack.quantum.model.Network;
import com.woorea.openstack.quantum.model.NetworkForCreate;
import com.woorea.openstack.quantum.model.Networks;

public class NetworksResource {

private final OpenStackClient CLIENT;
private final OpenStackClient CLIENT;

public NetworksResource(OpenStackClient client) {
CLIENT = client;
}
public NetworksResource(OpenStackClient client) {
CLIENT = client;
}

public List list() {
return new List();
}
public List list() {
return new List();
}

public Create create(Network net) {
return new Create(net);
}
public Create create(NetworkForCreate net) {
return new Create(net);
}

public Update update(Network net) {
return new Update(net);
}

public Delete delete(String netId){
return new Delete(netId);
}
public Delete delete(String netId) {
return new Delete(netId);
}

public Show show(String netId){
return new Show(netId);
}
public Show show(String netId) {
return new Show(netId);
}

public class List extends OpenStackRequest<Networks> {
public class List extends OpenStackRequest<Networks> {

public List() {
super(CLIENT, HttpMethod.GET, "networks", null, Networks.class);
}
}
public List() {
super(CLIENT, HttpMethod.GET, "networks", null, Networks.class);
}
}

public class Query extends OpenStackRequest<Networks> {
public class Query extends OpenStackRequest<Networks> {

public Query(Network network) {
//super(network);
public Query(Network network) {
//super(network);
// target = target.path("v2.0").path("networks");
// target = queryParam(target);
// return target.request(MediaType.APPLICATION_JSON).get(Networks.class);
}
}

}
}

public class Create extends OpenStackRequest<Network> {
public class Create extends OpenStackRequest<Network> {

public Create(Network net) {
super(CLIENT, HttpMethod.POST, "networks", Entity.json(net), Network.class);
}
}
public Create(NetworkForCreate net) {
super(CLIENT, HttpMethod.POST, "networks", Entity.json(net), Network.class);
}
}

public class Update extends OpenStackRequest<Network> {

Expand All @@ -68,17 +67,17 @@ public Update(Network net) {
}
}

public class Show extends OpenStackRequest<Network> {
public class Show extends OpenStackRequest<Network> {

public Show(String id) {
super(CLIENT, HttpMethod.GET, buildPath("networks/", id), null, Network.class);
}
}
public Show(String id) {
super(CLIENT, HttpMethod.GET, buildPath("networks/", id), null, Network.class);
}
}

public class Delete extends OpenStackRequest<Void> {
public class Delete extends OpenStackRequest<Void> {

public Delete(String id){
super(CLIENT, HttpMethod.DELETE, buildPath("networks/", id), null, Void.class);
}
}
public Delete(String id) {
super(CLIENT, HttpMethod.DELETE, buildPath("networks/", id), null, Void.class);
}
}
}
137 changes: 74 additions & 63 deletions quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,110 @@
import com.woorea.openstack.base.client.HttpMethod;
import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackRequest;
import com.woorea.openstack.quantum.model.ExternalGatewayForCreate;
import com.woorea.openstack.quantum.model.Router;
import com.woorea.openstack.quantum.model.RouterExternalGateway;
import com.woorea.openstack.quantum.model.RouterForAddInterface;
import com.woorea.openstack.quantum.model.RouterForCreate;
import com.woorea.openstack.quantum.model.RouterInterface;
import com.woorea.openstack.quantum.model.Routers;

public class RoutersResource {

private final OpenStackClient CLIENT;
private final OpenStackClient CLIENT;

public RoutersResource(OpenStackClient client) {
CLIENT = client;
}
public RoutersResource(OpenStackClient client) {
CLIENT = client;
}

public List list() {
return new List();
}
public List list() {
return new List();
}

public Create create(RouterForCreate router){
return new Create(router);
}
public Create create(RouterForCreate router) {
return new Create(router);
}

public Delete delete(String netId){
return new Delete(netId);
}
public Delete delete(String netId) {
return new Delete(netId);
}

public Show show(String netId){
return new Show(netId);
}
public Show show(String netId) {
return new Show(netId);
}

public class List extends OpenStackRequest<Routers> {
public class List extends OpenStackRequest<Routers> {

public List() {
super(CLIENT, HttpMethod.GET, "routers", null, Routers.class);
}
}
public List() {
super(CLIENT, HttpMethod.GET, "routers", null, Routers.class);
}
}

public class Query extends OpenStackRequest<Routers> {
public class Query extends OpenStackRequest<Routers> {

public Query(Router router) {
//super(network);
public Query(Router router) {
//super(network);
// target = target.path("v2.0").path("networks");
// target = queryParam(target);
// return target.request(MediaType.APPLICATION_JSON).get(Networks.class);
}
}
public class Create extends OpenStackRequest<Router> {
}
}

public Create(RouterForCreate router){
super(CLIENT, HttpMethod.POST, "routers", Entity.json(router), Router.class);
}
}
public class Create extends OpenStackRequest<Router> {


public Create(RouterForCreate router) {
super(CLIENT, HttpMethod.POST, "routers", Entity.json(router), Router.class);
}
}

public class Show extends OpenStackRequest<Router> {
public class Show extends OpenStackRequest<Router> {

public Show(String id) {
super(CLIENT, HttpMethod.GET, buildPath("routers/", id), null, Router.class);
}
}
public Show(String id) {
super(CLIENT, HttpMethod.GET, buildPath("routers/", id), null, Router.class);
}
}

public class Delete extends OpenStackRequest<Void> {
public class Delete extends OpenStackRequest<Void> {

public Delete(String id){
super(CLIENT, HttpMethod.DELETE, buildPath("routers/", id), null, Void.class);
}
}
public Attach addInterface(RouterForAddInterface interfaceToAdd){
return new Attach(interfaceToAdd);
}
public class Attach extends OpenStackRequest<RouterInterface> {
public Delete(String id) {
super(CLIENT, HttpMethod.DELETE, buildPath("routers/", id), null, Void.class);
}
}

public Attach(RouterForAddInterface interfaceToAdd){
super(CLIENT, HttpMethod.PUT, buildPath("routers/",interfaceToAdd.getRouterId(),"/add_router_interface"), Entity.json(interfaceToAdd),RouterInterface.class);
}

}
public Detach deleteInterface(RouterForAddInterface interfaceRouter) {
return new Detach(interfaceRouter);
}
public Attach addInterface(RouterForAddInterface interfaceToAdd) {
return new Attach(interfaceToAdd);
}

public class Detach extends OpenStackRequest<RouterInterface> {
public class Attach extends OpenStackRequest<RouterInterface> {

public Detach(RouterForAddInterface interfaceToAdd) {
super(CLIENT, HttpMethod.PUT, buildPath("routers/",
interfaceToAdd.getRouterId(), "/remove_router_interface"),
Entity.json(interfaceToAdd), RouterInterface.class);
}
public Attach(RouterForAddInterface interfaceToAdd) {
super(CLIENT, HttpMethod.PUT, buildPath("routers/", interfaceToAdd.getRouterId(), "/add_router_interface"), Entity.json(interfaceToAdd), RouterInterface.class);
}
}

}
public Detach deleteInterface(RouterForAddInterface interfaceRouter) {
return new Detach(interfaceRouter);
}



public class Detach extends OpenStackRequest<RouterInterface> {

public Detach(RouterForAddInterface interfaceToAdd) {
super(CLIENT, HttpMethod.PUT, buildPath("routers/",
interfaceToAdd.getRouterId(), "/remove_router_interface"),
Entity.json(interfaceToAdd), RouterInterface.class);
}
}

public SetExternalGateway setExternalGateway(ExternalGatewayForCreate externalGatewayForCreate) {
return new SetExternalGateway(externalGatewayForCreate);
}

public class SetExternalGateway extends OpenStackRequest<RouterExternalGateway> {

public SetExternalGateway(ExternalGatewayForCreate externalGatewayForCreate) {
super(CLIENT, HttpMethod.PUT, buildPath("routers/",
externalGatewayForCreate.getRouterId()),
Entity.json(externalGatewayForCreate), RouterExternalGateway.class);
}
}
}
Loading