add neutron

int32bit · int32bit · commit bcddcddb1859 · 2014-12-30T19:22:28.000+08:00
diff --git a/src/bupt/openstack/cinder/Cinder.java b/src/bupt/openstack/cinder/Cinder.java
@@ -11,14 +11,16 @@
 import bupt.openstack.cinder.api.v1.Types;
 import bupt.openstack.cinder.api.v1.Volumes;
 import bupt.openstack.cinder.model.Snapshots;
+import bupt.openstack.common.Client;
 
-public class Cinder {
+public class Cinder extends Client {
 	public final VolumeManager volumes;
 	public final VolumeTypeManager types;
 	public final ServiceManager services;
 	public final SnapshotManager snapshots;
 	public final LimitManager limits;
 	public Cinder(Authenticated credentical) {
+		super(credentical);
 		volumes = new Volumes(credentical);
 		types = new Types(credentical);
 		services = new Services(credentical);
diff --git a/src/bupt/openstack/common/Client.java b/src/bupt/openstack/common/Client.java
@@ -0,0 +1,16 @@
+package bupt.openstack.common;
+
+import bupt.openstack.authentication.Authenticated;
+
+public abstract class Client {
+	protected Authenticated credentical;
+	public Client(Authenticated credentical) {
+		this.credentical = credentical;
+	}
+	public void setRegion(String region) {
+		credentical.setWorkRegion(region);
+	}
+	public Authenticated getCredentical () {
+		return credentical;
+	}
+}
diff --git a/src/bupt/openstack/common/OpenstackSession.java b/src/bupt/openstack/common/OpenstackSession.java
@@ -10,6 +10,7 @@
 import bupt.openstack.glance.Glance;
 import bupt.openstack.keystone.Keystone;
 import bupt.openstack.keystone.model.Secret;
+import bupt.openstack.neutron.Neutron;
 import bupt.openstack.nova.Nova;
 
 public class OpenstackSession {
@@ -22,6 +23,7 @@ public class OpenstackSession {
 	private final Glance glance;
 	private final Keystone keystone;
 	private final Cinder cinder;
+	private final Neutron neutron;
 	@SuppressWarnings("unused")
 	private final Configure configure;
 	/**
@@ -35,6 +37,7 @@ public OpenstackSession(Authenticated credentical) {
 		this.glance = new Glance(credentical);
 		this.keystone = new Keystone(credentical);
 		this.cinder = new Cinder(credentical);
+		this.neutron = new Neutron(credentical);
 		this.availableTenants = DataBaseAccessor.getTenants(credentical.getUser().getName());
 	}
 	/**
@@ -53,6 +56,9 @@ public Keystone getKeystoneClient() {
 	public Cinder getCinderClient() {
 		return cinder;
 	}
+	public Neutron getNeutronClient() {
+		return neutron;
+	}
 	/**
 	 * 切换region
 	 * @param region 需要切换代region，region必须存在，否则失败
diff --git a/src/bupt/openstack/common/model/AbstractEntity.java b/src/bupt/openstack/common/model/AbstractEntity.java
@@ -103,9 +103,8 @@ public JSONObject toIntervalJSONObject() {
 	public String toIntervalString(int indent) {
 		return toIntervalJSONObject().toString(4);
 	}*/
-	@Override
-	public JSONObject toJSONObject() {
-		JSONObject meta = JSONConverter.EntityToJSON(this);
+	public JSONObject toJSONObject(boolean colonSeparate) {
+		JSONObject meta = JSONConverter.EntityToJSON(this,colonSeparate);
 		if (getClass().isMemberClass()) {
 			return meta;
 		}
@@ -117,7 +116,10 @@ public JSONObject toJSONObject() {
 		entity.put(name, meta);
 		return entity;
 	}
-
+	@Override
+	public JSONObject toJSONObject() {
+		return toJSONObject(true);
+	}
 	@Override
 	public String toString() {
 		return toJSONObject().toString();
diff --git a/src/bupt/openstack/common/tools/JSONConverter.java b/src/bupt/openstack/common/tools/JSONConverter.java
@@ -20,9 +20,10 @@ public class JSONConverter {
 	/**
 	 * 把一个AbstractEntity（它的之类）实例转化成JSONObject表示形式
 	 * @param entity 需要转化的对象
+	 * @param colon 属性名包含冒号时，是否分隔，true为分隔，false不分隔
 	 * @return 该对象的JSONObject表示
 	 */
-	public static JSONObject EntityToJSON(AbstractEntity entity) {
+	public static JSONObject EntityToJSON(AbstractEntity entity, boolean colon) {
 		JSONObject json = new JSONObject();
 		/* 获取该对象的所有属性 */
 		Set<Field> fields = Reflector.getFields(entity);
@@ -34,7 +35,7 @@ public static JSONObject EntityToJSON(AbstractEntity entity) {
 			if (name == null)
 				continue;
 			/* 处理属性名为 DDD:ddd的情况 */
-			if (name.indexOf(':') > 0) {
+			if (name.indexOf(':') > 0 && colon) {
 				name = name.split(":")[1];
 			}
 			Object value = null;
diff --git a/src/bupt/openstack/glance/Glance.java b/src/bupt/openstack/glance/Glance.java
@@ -1,12 +1,14 @@
 package bupt.openstack.glance;
 
 import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.Client;
 import bupt.openstack.glance.api.ImageManager;
 import bupt.openstack.glance.api.v2.Images;
 
-public class Glance {
+public class Glance extends Client {
 	public final ImageManager images;
 	public Glance(Authenticated credentical) {
+		super(credentical);
 		this.images = new Images(credentical);
 	}
 }
diff --git a/src/bupt/openstack/keystone/Keystone.java b/src/bupt/openstack/keystone/Keystone.java
@@ -1,6 +1,7 @@
 package bupt.openstack.keystone;
 
 import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.Client;
 import bupt.openstack.common.OperationException;
 import bupt.openstack.keystone.api.EndpointManager;
 import bupt.openstack.keystone.api.RoleManager;
@@ -16,14 +17,15 @@
 import bupt.openstack.keystone.api.v2.Users;
 import bupt.openstack.keystone.model.Secret;
 
-public class Keystone {
+public class Keystone extends Client {
 	public final UserManager users;
 	public final RoleManager roles;
 	public final TokenManager tokens;
 	public final ServiceManager services;
 	public final TenantManager tenants;
 	public final EndpointManager endpoints;
 	public Keystone(Authenticated credentical) {
+		super(credentical);
 		this.users = new Users(credentical);
 		this.roles = new Roles(credentical);
 		this.tokens = new Tokens(credentical);
diff --git a/src/bupt/openstack/keystone/model/CatalogType.java b/src/bupt/openstack/keystone/model/CatalogType.java
@@ -1,7 +1,7 @@
 package bupt.openstack.keystone.model;
 
 public enum CatalogType {
-	compute,image,identity, cloudformation, volume, volumev2, orchestration;
+	compute,image,identity, cloudformation, volume, volumev2, orchestration,network;
 	public static CatalogType of(String type) {
 		return CatalogType.valueOf(type);
 	}
diff --git a/src/bupt/openstack/neutron/Neutron.java b/src/bupt/openstack/neutron/Neutron.java
@@ -0,0 +1,18 @@
+package bupt.openstack.neutron;
+
+import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.Client;
+import bupt.openstack.neutron.api.NetworkManager;
+import bupt.openstack.neutron.api.SubnetManager;
+import bupt.openstack.neutron.api.v2.Networks;
+import bupt.openstack.neutron.api.v2.Subnets;
+
+public class Neutron extends Client {
+	public final NetworkManager networks;
+	public final SubnetManager subnets;
+	public Neutron(Authenticated credentical) {
+		super(credentical);
+		this.networks = new Networks(credentical);
+		this.subnets = new Subnets(credentical);
+	}
+}
diff --git a/src/bupt/openstack/neutron/api/NetworkManager.java b/src/bupt/openstack/neutron/api/NetworkManager.java
@@ -0,0 +1,13 @@
+package bupt.openstack.neutron.api;
+
+import java.util.List;
+
+import bupt.openstack.common.OperationException;
+import bupt.openstack.neutron.model.Network;
+
+public interface NetworkManager {
+	List<Network> list() throws OperationException;
+	Network create(Network network) throws OperationException;
+	void delete(String id) throws OperationException;
+	Network get(String id) throws OperationException;
+}
diff --git a/src/bupt/openstack/neutron/api/SubnetManager.java b/src/bupt/openstack/neutron/api/SubnetManager.java
@@ -0,0 +1,11 @@
+package bupt.openstack.neutron.api;
+
+import java.util.List;
+
+import bupt.openstack.common.OperationException;
+import bupt.openstack.neutron.model.Subnet;
+
+public interface SubnetManager {
+	List<Subnet> list() throws OperationException;
+	Subnet get(String id) throws OperationException;
+}
diff --git a/src/bupt/openstack/neutron/api/v2/AbstractManager.java b/src/bupt/openstack/neutron/api/v2/AbstractManager.java
@@ -0,0 +1,16 @@
+package bupt.openstack.neutron.api.v2;
+
+import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.Manager;
+import bupt.openstack.common.model.AbstractEntity;
+import bupt.openstack.keystone.model.CatalogType;
+
+public abstract class AbstractManager<T extends AbstractEntity> extends Manager<T> {
+	public AbstractManager(Authenticated credentical, Class<T> objClass) {
+		super(credentical, objClass);
+	}
+	@Override
+	public String getEndpoint() {
+		return credentical.getEndpoint(CatalogType.network);
+	}
+}
diff --git a/src/bupt/openstack/neutron/api/v2/Networks.java b/src/bupt/openstack/neutron/api/v2/Networks.java
@@ -0,0 +1,29 @@
+package bupt.openstack.neutron.api.v2;
+import java.util.List;
+
+import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.OperationException;
+import bupt.openstack.neutron.api.NetworkManager;
+import bupt.openstack.neutron.model.*;
+public class Networks extends AbstractManager<Network> implements NetworkManager{
+	private static final String PREFIX = "/v2.0";
+	public Networks(Authenticated credentical) {
+		super(credentical, Network.class);
+	}
+	@Override
+	public List<Network> list() throws OperationException {
+		return super._list(PREFIX + "/networks.json");
+	}
+	@Override
+	public Network create(Network network) throws OperationException {
+		return super._create(PREFIX + "/networks.json", network.toJSONObject(false));
+	}
+	@Override
+	public void delete(String id) throws OperationException {
+		super._delete(PREFIX + "/networks/" + id + ".json");
+	}
+	@Override
+	public Network get(String id) throws OperationException {
+		return super._get(PREFIX + "/networks/" + id + ".json");
+	}
+}
diff --git a/src/bupt/openstack/neutron/api/v2/Subnets.java b/src/bupt/openstack/neutron/api/v2/Subnets.java
@@ -0,0 +1,25 @@
+package bupt.openstack.neutron.api.v2;
+
+import java.util.List;
+
+import bupt.openstack.authentication.Authenticated;
+import bupt.openstack.common.OperationException;
+import bupt.openstack.neutron.api.SubnetManager;
+import bupt.openstack.neutron.model.Subnet;
+
+public class Subnets extends AbstractManager<Subnet> implements SubnetManager {
+	private static final String PREFIX = "/v2.0";
+	public Subnets(Authenticated credentical) {
+		super(credentical, Subnet.class);
+	}
+
+	@Override
+	public List<Subnet> list() throws OperationException {
+		return super._list(PREFIX + "/subnets.json");
+	}
+	@Override
+	public Subnet get(String id) throws OperationException {
+		return super._get(PREFIX + "/subnets/" + id + ".json");
+	}
+
+}
diff --git a/src/bupt/openstack/neutron/model/Network.java b/src/bupt/openstack/neutron/model/Network.java
@@ -0,0 +1,102 @@
+package bupt.openstack.neutron.model;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.json.JSONObject;
+
+import bupt.openstack.common.annotation.Entity;
+import bupt.openstack.common.annotation.Property;
+import bupt.openstack.common.model.AbstractEntity;
+@Entity("network")
+public class Network extends AbstractEntity {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Property("status")
+	private String status;
+	@Property("subnets")
+	private List<String> subnets;
+	@Property("provider:physical_network")
+	private String physicalNetwork;
+	@Property("admin_state_up")
+	private boolean isUp;
+	@Property("tenant_id")
+	private String tenantId;
+	@Property("provider:network_type")
+	private String networkType;
+	@Property("router:external")
+	private boolean isExternal;
+	@Property("shared")
+	private boolean isShared;
+	@Property("provider:segmentation_id")
+	private String segmentationId;
+	public Network() {
+		super();
+		this.isUp = true;
+	}
+	public Network(JSONObject json) {
+		super(json);
+	}
+	public Network(String s) {
+		this(new JSONObject(s));
+	}
+	public Network(Object o) {
+		this(new JSONObject(o.toString()));
+	}
+	@Override
+	public boolean isValid() {
+		return networkType != null && physicalNetwork != null;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public List<String> getSubnets() {
+		return Collections.unmodifiableList(this.subnets);
+	}
+	public String getPhysicalNetwork() {
+		return physicalNetwork;
+	}
+	public boolean isUp() {
+		return isUp;
+	}
+	public String getTenantId() {
+		return tenantId;
+	}
+	public String getNetworkType() {
+		return networkType;
+	}
+	public boolean isExternal() {
+		return isExternal;
+	}
+	public boolean isShared() {
+		return isShared;
+	}
+	public String getSegmentationId() {
+		return segmentationId;
+	}
+	public void setPhysicalNetwork(String physicalNetwork) {
+		this.physicalNetwork = physicalNetwork;
+	}
+	public void setUp(boolean isUp) {
+		this.isUp = isUp;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+	public void setNetworkType(String networkType) {
+		this.networkType = networkType;
+	}
+	public void setExternal(boolean isExternal) {
+		this.isExternal = isExternal;
+	}
+	public void setShared(boolean isShared) {
+		this.isShared = isShared;
+	}
+	public void setSegmentationId(String segmentationId) {
+		this.segmentationId = segmentationId;
+	}
+	
+}
diff --git a/src/bupt/openstack/neutron/model/Subnet.java b/src/bupt/openstack/neutron/model/Subnet.java
diff --git a/src/bupt/openstack/nova/Nova.java b/src/bupt/openstack/nova/Nova.java
diff --git a/src/bupt/openstack/test/SessionTest.java b/src/bupt/openstack/test/SessionTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`	`1`	`package bupt.openstack.glance;`
`2`	`2`
`3`	`3`	`import bupt.openstack.authentication.Authenticated;`
	`4`	`+import bupt.openstack.common.Client;`
`4`	`5`	`import bupt.openstack.glance.api.ImageManager;`
`5`	`6`	`import bupt.openstack.glance.api.v2.Images;`
`6`	`7`
`7`		`-public class Glance {`
	`8`	`+public class Glance extends Client {`
`8`	`9`	`public final ImageManager images;`
`9`	`10`	`public Glance(Authenticated credentical) {`
	`11`	`+ super(credentical);`
`10`	`12`	`this.images = new Images(credentical);`
`11`	`13`	`}`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package bupt.openstack.keystone.model;`
`2`	`2`
`3`	`3`	`public enum CatalogType {`
`4`		`- compute,image,identity, cloudformation, volume, volumev2, orchestration;`
	`4`	`+ compute,image,identity, cloudformation, volume, volumev2, orchestration,network;`
`5`	`5`	`public static CatalogType of(String type) {`
`6`	`6`	`return CatalogType.valueOf(type);`
`7`	`7`	`}`