You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/10 01:48:36 UTC
[23/52] [partial] Summary: Fixes for api_refactoring
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/deploy/DeploymentPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index e5dcff1..537dd31 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -37,7 +37,7 @@ import com.cloud.vm.VirtualMachineProfile;
public interface DeploymentPlanner extends Adapter {
/**
* plan is called to determine where a virtual machine should be running.
- *
+ *
* @param vm
* virtual machine.
* @param plan
@@ -51,7 +51,7 @@ public interface DeploymentPlanner extends Adapter {
/**
* check() is called right before the virtual machine starts to make sure
* the host has enough capacity.
- *
+ *
* @param vm
* virtual machine in question.
* @param plan
@@ -69,7 +69,7 @@ public interface DeploymentPlanner extends Adapter {
* canHandle is called before plan to determine if the plan can do the allocation. Planers should be exclusive so
* planner writer must
* make sure only one planer->canHandle return true in the planner list
- *
+ *
* @param vm
* virtual machine.
* @param plan
@@ -187,7 +187,7 @@ public interface DeploymentPlanner extends Adapter {
}
_clusterIds.addAll(clusterList);
}
-
+
public void addHost(long hostId) {
if (_hostIds == null) {
_hostIds = new HashSet<Long>();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/domain/Domain.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/com/cloud/domain/Domain.java
index a7b4031..cfed519 100644
--- a/api/src/com/cloud/domain/Domain.java
+++ b/api/src/com/cloud/domain/Domain.java
@@ -19,19 +19,20 @@ package com.cloud.domain;
import java.util.Date;
import com.cloud.user.OwnedBy;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
/**
* Domain defines the Domain object.
*/
-public interface Domain extends OwnedBy {
+
+public interface Domain extends OwnedBy, Identity, InternalIdentity {
public static final long ROOT_DOMAIN = 1L;
enum State {
Active, Inactive
};
- long getId();
-
Long getParent();
void setParent(Long parent);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/event/Event.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/Event.java b/api/src/com/cloud/event/Event.java
index 6a30537..1a61636 100644
--- a/api/src/com/cloud/event/Event.java
+++ b/api/src/com/cloud/event/Event.java
@@ -18,26 +18,24 @@ package com.cloud.event;
import java.util.Date;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface Event extends ControlledEntity{
+public interface Event extends ControlledEntity, Identity, InternalIdentity {
public enum State {
Created,
Scheduled,
Started,
Completed;
}
-
- long getId();
String getType();
State getState();
String getDescription();
Date getCreateDate();
long getUserId();
- long getAccountId();
- long getDomainId();
int getTotalSize();
String getLevel();
long getStartId();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index e7873e3..87eddca 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -268,26 +268,26 @@ public class EventTypes {
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_ADD = "PHYSICAL.FIREWALL.ADD";
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_DELETE = "PHYSICAL.FIREWALL.DELETE";
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_CONFIGURE = "PHYSICAL.FIREWALL.CONFIGURE";
-
+
// VPC
public static final String EVENT_VPC_CREATE = "VPC.CREATE";
public static final String EVENT_VPC_UPDATE = "VPC.UPDATE";
public static final String EVENT_VPC_DELETE = "VPC.DELETE";
public static final String EVENT_VPC_RESTART = "VPC.RESTART";
-
+
// VPC offerings
public static final String EVENT_VPC_OFFERING_CREATE = "VPC.OFFERING.CREATE";
public static final String EVENT_VPC_OFFERING_UPDATE = "VPC.OFFERING.UPDATE";
public static final String EVENT_VPC_OFFERING_DELETE = "VPC.OFFERING.DELETE";
-
+
// Private gateway
public static final String EVENT_PRIVATE_GATEWAY_CREATE = "PRIVATE.GATEWAY.CREATE";
public static final String EVENT_PRIVATE_GATEWAY_DELETE = "PRIVATE.GATEWAY.DELETE";
-
+
// Static routes
public static final String EVENT_STATIC_ROUTE_CREATE = "STATIC.ROUTE.CREATE";
public static final String EVENT_STATIC_ROUTE_DELETE = "STATIC.ROUTE.DELETE";
-
+
// tag related events
public static final String EVENT_TAGS_CREATE = "CREATE_TAGS";
public static final String EVENT_TAGS_DELETE = "DELETE_TAGS";
@@ -296,7 +296,7 @@ public class EventTypes {
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_ADD = "PHYSICAL.NVPCONTROLLER.ADD";
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_DELETE = "PHYSICAL.NVPCONTROLLER.DELETE";
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_CONFIGURE = "PHYSICAL.NVPCONTROLLER.CONFIGURE";
-
+
// AutoScale
public static final String EVENT_COUNTER_CREATE = "COUNTER.CREATE";
public static final String EVENT_COUNTER_DELETE = "COUNTER.DELETE";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/AgentUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/AgentUnavailableException.java b/api/src/com/cloud/exception/AgentUnavailableException.java
index a2d052b..8919324 100644
--- a/api/src/com/cloud/exception/AgentUnavailableException.java
+++ b/api/src/com/cloud/exception/AgentUnavailableException.java
@@ -24,17 +24,17 @@ import com.cloud.utils.SerialVersionUID;
*
*/
public class AgentUnavailableException extends ResourceUnavailableException {
-
+
private static final long serialVersionUID = SerialVersionUID.AgentUnavailableException;
-
+
public AgentUnavailableException(String msg, long agentId) {
this(msg, agentId, null);
}
-
+
public AgentUnavailableException(long agentId) {
this("Unable to reach host.", agentId);
}
-
+
public AgentUnavailableException(String msg, long agentId, Throwable cause) {
super("Host " + agentId + ": " + msg, Host.class, agentId, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/CloudException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/CloudException.java b/api/src/com/cloud/exception/CloudException.java
index 9ebeaad..2ec6142 100644
--- a/api/src/com/cloud/exception/CloudException.java
+++ b/api/src/com/cloud/exception/CloudException.java
@@ -24,16 +24,16 @@ import com.cloud.utils.AnnotationHelper;
/**
* by the API response serializer. Any exceptions that are thrown by
* class, which extends RuntimeException instead of Exception like this
- * class does.
+ * class does.
*/
public class CloudException extends Exception {
-
+
// This holds a list of uuids and their names. Add uuid:fieldname pairs
- protected ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
-
- protected Integer csErrorCode;
-
+ protected ArrayList<String> idList = new ArrayList<String>();
+
+ protected Integer csErrorCode;
+
public CloudException(String message) {
super(message);
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
@@ -43,34 +43,36 @@ public class CloudException extends Exception {
super(message, cause);
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
}
-
- public void addProxyObject(Object voObj, Long id, String idFieldName) {
- // Get the VO object's table name.
- String tablename = AnnotationHelper.getTableName(voObj);
- if (tablename != null) {
- addProxyObject(tablename, id, idFieldName);
- }
- return;
- }
-
+
+
+
public CloudException() {
super();
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
}
-
- public void addProxyObject(String tableName, Long id, String idFieldName) {
- idList.add(new IdentityProxy(tableName, id, idFieldName));
+
+ public void addProxyObject(String uuid) {
+ idList.add(uuid);
return;
}
-
- public ArrayList<IdentityProxy> getIdProxyList() {
+
+ public void addProxyObject(Object voObj, Long id, String idFieldName) {
+ // Get the VO object's table name.
+ String tablename = AnnotationHelper.getTableName(voObj);
+ if (tablename != null) {
+ addProxyObject(tablename, id, idFieldName);
+ }
+ return;
+ }
+
+ public ArrayList<String> getIdProxyList() {
return idList;
}
-
+
public void setCSErrorCode(int cserrcode) {
this.csErrorCode = cserrcode;
}
-
+
public int getCSErrorCode() {
return this.csErrorCode;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/CloudExecutionException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/CloudExecutionException.java b/api/src/com/cloud/exception/CloudExecutionException.java
index 74b116a..d8d70f8 100755
--- a/api/src/com/cloud/exception/CloudExecutionException.java
+++ b/api/src/com/cloud/exception/CloudExecutionException.java
@@ -22,11 +22,11 @@ import com.cloud.utils.exception.RuntimeCloudException;
import com.cloud.utils.SerialVersionUID;
/**
- *
+ *
*/
public class CloudExecutionException extends RuntimeCloudException {
private final static long serialVersionUID = SerialVersionUID.CloudExecutionException;
-
+
private final ErrorCode code;
private final HashMap<String, Object> details;
@@ -35,15 +35,15 @@ public class CloudExecutionException extends RuntimeCloudException {
this.code = code;
details = new HashMap<String, Object>();
}
-
+
public ErrorCode getErrorCode() {
return code;
}
-
+
public String getErrorMessage() {
return new StringBuilder("Error Code=").append(code).append("; Error Message=").append(super.toString()).toString();
}
-
+
@Override
public String toString() {
StringBuilder buff = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/ConcurrentOperationException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConcurrentOperationException.java b/api/src/com/cloud/exception/ConcurrentOperationException.java
index 54826d6..cfe6ba3 100644
--- a/api/src/com/cloud/exception/ConcurrentOperationException.java
+++ b/api/src/com/cloud/exception/ConcurrentOperationException.java
@@ -19,9 +19,9 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class ConcurrentOperationException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.ConcurrentOperationException;
-
+
public ConcurrentOperationException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java b/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
index 7afcfe6..a777afa 100644
--- a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
+++ b/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
@@ -21,7 +21,7 @@ import com.cloud.utils.SerialVersionUID;
public class ConflictingNetworkSettingsException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ConflictingNetworkSettingException;
-
+
public ConflictingNetworkSettingsException() {
super();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/ConnectionException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConnectionException.java b/api/src/com/cloud/exception/ConnectionException.java
index 966e39b..b3f0726 100644
--- a/api/src/com/cloud/exception/ConnectionException.java
+++ b/api/src/com/cloud/exception/ConnectionException.java
@@ -25,26 +25,26 @@ import com.cloud.utils.SerialVersionUID;
* processing. Upon receiving this exception, the AgentManager will
* immediately place the agent under alert. When the function to enable
* to disable the agent, the agent is disabled.
- * should be disconnected and reconnected to "refresh" all resource
+ * should be disconnected and reconnected to "refresh" all resource
* information. This is useful when the Listener needed to perform setup
* on the agent and decided it is best to flush connection and reconnect.
* situation where it keeps throwing ConnectionException.
*/
public class ConnectionException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.ConnectionException;
boolean _error;
public ConnectionException(boolean setupError, String msg) {
this(setupError, msg, null);
}
-
+
public ConnectionException(boolean setupError, String msg, Throwable cause) {
super(msg, cause);
_error = setupError;
-
+
}
-
+
public boolean isSetupError() {
return _error;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/DiscoveredWithErrorException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/DiscoveredWithErrorException.java b/api/src/com/cloud/exception/DiscoveredWithErrorException.java
index f59066f..ee59baf 100644
--- a/api/src/com/cloud/exception/DiscoveredWithErrorException.java
+++ b/api/src/com/cloud/exception/DiscoveredWithErrorException.java
@@ -19,13 +19,13 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class DiscoveredWithErrorException extends DiscoveryException {
-
+
private static final long serialVersionUID = SerialVersionUID.DiscoveredWithErrorException;
public DiscoveredWithErrorException(String msg) {
this(msg, null);
}
-
+
public DiscoveredWithErrorException(String msg, Throwable cause) {
super(msg, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/DiscoveryException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/DiscoveryException.java b/api/src/com/cloud/exception/DiscoveryException.java
index 10a7c5b..62ae272 100644
--- a/api/src/com/cloud/exception/DiscoveryException.java
+++ b/api/src/com/cloud/exception/DiscoveryException.java
@@ -19,13 +19,13 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class DiscoveryException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.DiscoveryException;
public DiscoveryException(String msg) {
this(msg, null);
}
-
+
public DiscoveryException(String msg, Throwable cause) {
super(msg, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/ErrorCode.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ErrorCode.java b/api/src/com/cloud/exception/ErrorCode.java
index 15d9b7e..8f048b8 100755
--- a/api/src/com/cloud/exception/ErrorCode.java
+++ b/api/src/com/cloud/exception/ErrorCode.java
@@ -23,30 +23,30 @@ import java.util.HashSet;
public class ErrorCode {
String code;
private static HashSet<ErrorCode> s_codes = new HashSet<ErrorCode>();
-
+
public ErrorCode(String code) {
this.code = code;
assert !s_codes.contains(this) : "There is already an error code registered for this code: " + code;
s_codes.add(this);
}
-
+
public String getCode() {
return code;
}
-
+
@Override
public int hashCode() {
return code.hashCode();
}
-
+
@Override
public boolean equals(Object that) {
if (!(that instanceof ErrorCode)) {
return false;
}
-
+
return this.code.equals(((ErrorCode)that).code);
}
-
+
public final static ErrorCode UnableToReachResource = new ErrorCode("resource.unavailable");
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/HAStateException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/HAStateException.java b/api/src/com/cloud/exception/HAStateException.java
index aaa5e75..cb25174 100644
--- a/api/src/com/cloud/exception/HAStateException.java
+++ b/api/src/com/cloud/exception/HAStateException.java
@@ -23,9 +23,9 @@ import com.cloud.utils.SerialVersionUID;
* done with it. Hence this special state.
*/
public class HAStateException extends ManagementServerException {
-
+
private static final long serialVersionUID = SerialVersionUID.HAStateException;
-
+
public HAStateException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/InsufficientCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientCapacityException.java b/api/src/com/cloud/exception/InsufficientCapacityException.java
index 8a0557f..51a4e59 100755
--- a/api/src/com/cloud/exception/InsufficientCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientCapacityException.java
@@ -49,7 +49,7 @@ public abstract class InsufficientCapacityException extends CloudException {
/**
* @return the id of the object that it is insufficient in. Note that this method is
* marked such that if the id is not set, then it will throw NullPointerException.
- * This is intended as you should check to see if the Scope is present before
+ * This is intended as you should check to see if the Scope is present before
* accessing this method.
*/
public long getId() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java b/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
index 09a077b..71ec16d 100644
--- a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
@@ -20,11 +20,11 @@ import com.cloud.utils.SerialVersionUID;
public class InsufficientNetworkCapacityException extends InsufficientCapacityException {
private static final long serialVersionUID = SerialVersionUID.InsufficientAddressCapacityException;
-
+
protected InsufficientNetworkCapacityException() {
super();
}
-
+
public InsufficientNetworkCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/InsufficientServerCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientServerCapacityException.java b/api/src/com/cloud/exception/InsufficientServerCapacityException.java
index 4a30595..af34e57 100755
--- a/api/src/com/cloud/exception/InsufficientServerCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientServerCapacityException.java
@@ -24,13 +24,13 @@ import com.cloud.utils.SerialVersionUID;
* trying to start.
*/
public class InsufficientServerCapacityException extends InsufficientCapacityException {
-
+
private static final long serialVersionUID = SerialVersionUID.InsufficientServerCapacityException;
-
+
public InsufficientServerCapacityException(String msg, Long clusterId) {
this(msg, Cluster.class, clusterId);
}
-
+
public InsufficientServerCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java b/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
index f8ec106..c70bfc3 100755
--- a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
@@ -24,13 +24,13 @@ import com.cloud.utils.SerialVersionUID;
* storage space to create the VM.
*/
public class InsufficientStorageCapacityException extends InsufficientCapacityException {
-
+
private static final long serialVersionUID = SerialVersionUID.InsufficientStorageCapacityException;
-
+
public InsufficientStorageCapacityException(String msg, long id) {
this(msg, StoragePool.class, id);
}
-
+
public InsufficientStorageCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java b/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
index 10d9ffc..4741baa 100644
--- a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
+++ b/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
@@ -21,11 +21,11 @@ import com.cloud.utils.SerialVersionUID;
public class InsufficientVirtualNetworkCapcityException extends InsufficientNetworkCapacityException {
private static final long serialVersionUID = SerialVersionUID.InsufficientVirtualNetworkCapacityException;
-
+
public InsufficientVirtualNetworkCapcityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
-
+
public InsufficientVirtualNetworkCapcityException(String msg, long podId) {
this(msg, Pod.class, podId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/PermissionDeniedException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/PermissionDeniedException.java b/api/src/com/cloud/exception/PermissionDeniedException.java
index 4900afc..638b762 100644
--- a/api/src/com/cloud/exception/PermissionDeniedException.java
+++ b/api/src/com/cloud/exception/PermissionDeniedException.java
@@ -18,7 +18,7 @@ package com.cloud.exception;
import java.util.List;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.user.Account;
import com.cloud.utils.SerialVersionUID;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/ResourceUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ResourceUnavailableException.java b/api/src/com/cloud/exception/ResourceUnavailableException.java
index 484659a..30daf56 100644
--- a/api/src/com/cloud/exception/ResourceUnavailableException.java
+++ b/api/src/com/cloud/exception/ResourceUnavailableException.java
@@ -23,21 +23,21 @@ public class ResourceUnavailableException extends CloudException {
Class<?> _scope;
long _id;
-
+
public ResourceUnavailableException(String msg, Class<?> scope, long resourceId) {
this(msg, scope, resourceId, null);
}
-
+
public ResourceUnavailableException(String msg, Class<?> scope, long resourceId, Throwable cause) {
super(new StringBuilder("Resource [").append(scope.getSimpleName()).append(":").append(resourceId).append("] is unreachable: ").append(msg).toString(), cause);
_scope = scope;
_id = resourceId;
}
-
+
public Class<?> getScope() {
return _scope;
}
-
+
public long getResourceId() {
return _id;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/exception/StorageUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/StorageUnavailableException.java b/api/src/com/cloud/exception/StorageUnavailableException.java
index 7b443a9..6db1629 100644
--- a/api/src/com/cloud/exception/StorageUnavailableException.java
+++ b/api/src/com/cloud/exception/StorageUnavailableException.java
@@ -20,9 +20,9 @@ import com.cloud.storage.StoragePool;
import com.cloud.utils.SerialVersionUID;
/**
- * If the cause is due to storage pool unavailable, calling
+ * If the cause is due to storage pool unavailable, calling
* problem with.
- *
+ *
*/
public class StorageUnavailableException extends ResourceUnavailableException {
private static final long serialVersionUID = SerialVersionUID.StorageUnavailableException;
@@ -33,11 +33,11 @@ public class StorageUnavailableException extends ResourceUnavailableException {
public StorageUnavailableException(String msg, long poolId, Throwable cause) {
this(msg, StoragePool.class, poolId, cause);
}
-
+
public StorageUnavailableException(String msg, Class<?> scope, long resourceId) {
this(msg, scope, resourceId, null);
}
-
+
public StorageUnavailableException(String msg, Class<?> scope, long resourceId, Throwable th) {
super(msg, scope, resourceId, th);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/host/Host.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java
index 1bac0d2..bd26f81 100755
--- a/api/src/com/cloud/host/Host.java
+++ b/api/src/com/cloud/host/Host.java
@@ -21,12 +21,14 @@ import java.util.Date;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import com.cloud.utils.fsm.StateObject;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
/**
* Host represents one particular host server.
*/
-public interface Host extends StateObject<Status> {
+public interface Host extends StateObject<Status>, Identity, InternalIdentity {
public enum Type {
Storage(false),
Routing(false),
@@ -62,11 +64,6 @@ public interface Host extends StateObject<Status> {
}
/**
- * @return id of the host.
- */
- long getId();
-
- /**
* @return name of the machine.
*/
String getName();
@@ -198,6 +195,6 @@ public interface Host extends StateObject<Status> {
String getHypervisorVersion();
boolean isInMaintenanceStates();
-
- ResourceState getResourceState();
+
+ ResourceState getResourceState();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/host/HostEnvironment.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/HostEnvironment.java b/api/src/com/cloud/host/HostEnvironment.java
index 3184974..89077b5 100644
--- a/api/src/com/cloud/host/HostEnvironment.java
+++ b/api/src/com/cloud/host/HostEnvironment.java
@@ -22,29 +22,29 @@ package com.cloud.host;
* the environment.
*/
public class HostEnvironment {
-
+
public String managementIpAddress;
public String managementNetmask;
public String managementGateway;
public String managementVlan;
-
+
public String[] neighborHosts;
-
+
public String storageIpAddress;
public String storageNetwork;
public String storageGateway;
public String storageVlan;
public String secondaryStroageIpAddress;
-
+
public String storage2IpAddress;
public String storage2Network;
public String storage2Gateway;
public String storage2Vlan;
public String secondaryStorageIpAddress2;
-
+
public String[] neighborStorages;
public String[] neighborStorages2;
-
+
public String publicIpAddress;
public String publicNetmask;
public String publicGateway;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/host/HostStats.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/HostStats.java b/api/src/com/cloud/host/HostStats.java
index e8fa19e..803b148 100755
--- a/api/src/com/cloud/host/HostStats.java
+++ b/api/src/com/cloud/host/HostStats.java
@@ -17,7 +17,7 @@
package com.cloud.host;
public interface HostStats {
-
+
// host related stats
public double getCpuUtilization();
public double getNetworkWriteKBs();
@@ -27,7 +27,7 @@ public interface HostStats {
public String getEntityType();
public double getUsedMemory();
public HostStats getHostStats();
-
+
// public double getAverageLoad();
- // public double getXapiMemoryUsageKBs();
+ // public double getXapiMemoryUsageKBs();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/host/Status.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java
index aed35cb..97b151d 100755
--- a/api/src/com/cloud/host/Status.java
+++ b/api/src/com/cloud/host/Status.java
@@ -32,25 +32,25 @@ public enum Status {
Removed(true, false, true),
Error(true, false, true),
Rebalancing(true, false, true);
-
+
private final boolean updateManagementServer;
private final boolean checkManagementServer;
private final boolean lostConnection;
-
+
private Status(boolean updateConnection, boolean checkManagementServer, boolean lostConnection) {
this.updateManagementServer = updateConnection;
this.checkManagementServer = checkManagementServer;
this.lostConnection = lostConnection;
}
-
+
public boolean updateManagementServer() {
return updateManagementServer;
}
-
+
public boolean checkManagementServer() {
return checkManagementServer;
}
-
+
public boolean lostConnection() {
return lostConnection;
}
@@ -82,16 +82,16 @@ public enum Status {
public String getDescription() {
return comment;
}
-
+
public boolean isUserRequest() {
return isUserRequest;
}
}
-
+
public static StateMachine2<Status, Event, Host> getStateMachine() {
return s_fsm;
}
-
+
public Status getNextStatus(Event e) throws NoTransitionException {
return s_fsm.getNextState(this, e);
}
@@ -100,7 +100,7 @@ public enum Status {
List<Status> from = s_fsm.getFromStates(this, e);
return from.toArray(new Status[from.size()]);
}
-
+
public Set<Event> getPossibleEvents() {
return s_fsm.getPossibleEvents(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/hypervisor/Hypervisor.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/com/cloud/hypervisor/Hypervisor.java
index 25dd8b1..2e0012d 100644
--- a/api/src/com/cloud/hypervisor/Hypervisor.java
+++ b/api/src/com/cloud/hypervisor/Hypervisor.java
@@ -23,7 +23,7 @@ public class Hypervisor {
XenServer,
KVM,
VMware,
- Hyperv,
+ Hyperv,
VirtualBox,
Parralels,
BareMetal,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/hypervisor/HypervisorCapabilities.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java b/api/src/com/cloud/hypervisor/HypervisorCapabilities.java
index f91da35..efb8a6a 100644
--- a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java
+++ b/api/src/com/cloud/hypervisor/HypervisorCapabilities.java
@@ -17,16 +17,14 @@
package com.cloud.hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
/**
* HypervisorCapability represents one particular hypervisor version's capabilities.
*/
-public interface HypervisorCapabilities {
- /**
- * @return id of the host.
- */
- long getId();
+public interface HypervisorCapabilities extends Identity, InternalIdentity{
/**
* @return type of hypervisor
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/hypervisor/HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java
index d3608dc..b4a0b06 100644
--- a/api/src/com/cloud/hypervisor/HypervisorGuru.java
+++ b/api/src/com/cloud/hypervisor/HypervisorGuru.java
@@ -27,28 +27,28 @@ import com.cloud.vm.VirtualMachineProfile;
public interface HypervisorGuru extends Adapter {
HypervisorType getHypervisorType();
-
+
/**
* Convert from a virtual machine to the
- * virtual machine that the hypervisor expects.
- * @param vm
+ * virtual machine that the hypervisor expects.
+ * @param vm
* @return
*/
<T extends VirtualMachine> VirtualMachineTO implement(VirtualMachineProfile<T> vm);
-
+
/**
* Give hypervisor guru opportunity to decide if certain command needs to be delegated to other host, mainly to secondary storage VM host
* @param hostId original hypervisor host
* @param cmd command that is going to be sent, hypervisor guru usually needs to register various context objects into the command object
- *
+ *
* @return delegated host id if the command will be delegated
*/
long getCommandHostDelegation(long hostId, Command cmd);
-
+
/**
* @return true if VM can be migrated independently with CloudStack, and therefore CloudStack needs to track and reflect host change
* into CloudStack database, false if CloudStack enforces VM sync logic
- *
+ *
*/
boolean trackVmHostChange();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/IpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index f67a1fa..0ac7f50 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -18,28 +18,30 @@ package com.cloud.network;
import java.util.Date;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.utils.net.Ip;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
/**
- *
+ *
* - Allocated = null
* - AccountId = null
* - DomainId = null
- *
+ *
* - State = Allocated
* - AccountId = account owner.
* - DomainId = domain of the account owner.
* - Allocated = time it was allocated.
*/
-public interface IpAddress extends ControlledEntity {
+public interface IpAddress extends ControlledEntity, Identity, InternalIdentity {
enum State {
Allocating, // The IP Address is being propagated to other network elements and is not ready for use yet.
Allocated, // The IP address is in used.
Releasing, // The IP address is being released for other network elements and is not ready for allocation.
Free // The IP address is ready to be allocated.
}
-
+
enum Purpose {
StaticNat,
Lb
@@ -67,11 +69,6 @@ public interface IpAddress extends ControlledEntity {
public Long getPhysicalNetworkId();
- /**
- * @return database id.
- */
- long getId();
-
void setState(IpAddress.State state);
Long getAllocatedToAccountId();
@@ -89,5 +86,4 @@ public interface IpAddress extends ControlledEntity {
* @param vpcId
*/
void setVpcId(Long vpcId);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index a6cbdd8..39a0b26 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -16,12 +16,14 @@
// under the License.
package com.cloud.network;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.fsm.FiniteState;
import com.cloud.utils.fsm.StateMachine;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
import java.net.URI;
import java.util.ArrayList;
@@ -31,7 +33,7 @@ import java.util.Set;
/**
* owned by an account.
*/
-public interface Network extends ControlledEntity {
+public interface Network extends ControlledEntity, InternalIdentity, Identity {
public enum GuestType {
Shared,
@@ -45,10 +47,10 @@ public interface Network extends ControlledEntity {
public static final Service Dhcp = new Service("Dhcp");
public static final Service Dns = new Service("Dns", Capability.AllowDnsSuffixModification);
public static final Service Gateway = new Service("Gateway");
- public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols,
+ public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols,
Capability.MultipleIps, Capability.TrafficStatistics);
public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedLBIsolation,
- Capability.SupportedProtocols, Capability.TrafficStatistics, Capability.LoadBalancingSupportedIps,
+ Capability.SupportedProtocols, Capability.TrafficStatistics, Capability.LoadBalancingSupportedIps,
Capability.SupportedStickinessMethods, Capability.ElasticLb);
public static final Service UserData = new Service("UserData");
public static final Service SourceNat = new Service("SourceNat", Capability.SupportedSourceNatTypes, Capability.RedundantRouter);
@@ -252,11 +254,6 @@ public interface Network extends ControlledEntity {
}
}
- /**
- * @return id of the network profile. Null means the network profile is not from the database.
- */
- long getId();
-
String getName();
Mode getMode();
@@ -301,5 +298,5 @@ public interface Network extends ControlledEntity {
* @return
*/
Long getVpcId();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/NetworkProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkProfile.java b/api/src/com/cloud/network/NetworkProfile.java
index cd25d9f..b5c463d 100644
--- a/api/src/com/cloud/network/NetworkProfile.java
+++ b/api/src/com/cloud/network/NetworkProfile.java
@@ -21,9 +21,11 @@ import java.net.URI;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.api.InternalIdentity;
public class NetworkProfile implements Network {
private long id;
+ private String uuid;
private long dataCenterId;
private long ownerId;
private long domainId;
@@ -51,6 +53,7 @@ public class NetworkProfile implements Network {
public NetworkProfile(Network network) {
this.id = network.getId();
+ this.uuid = network.getUuid();
this.broadcastUri = network.getBroadcastUri();
this.dataCenterId = network.getDataCenterId();
this.ownerId = network.getAccountId();
@@ -105,6 +108,12 @@ public class NetworkProfile implements Network {
return id;
}
+
+ @Override
+ public String getUuid() {
+ return uuid;
+ }
+
@Override
public long getDataCenterId() {
return dataCenterId;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index e7b6def..d5841a4 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -20,10 +20,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.cloud.api.commands.CreateNetworkCmd;
-import com.cloud.api.commands.ListNetworksCmd;
-import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
-import com.cloud.api.commands.RestartNetworkCmd;
+import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
+import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
+import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
@@ -41,7 +41,6 @@ public interface NetworkService {
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
-
IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException,
InsufficientAddressCapacityException, ConcurrentOperationException;
@@ -80,13 +79,13 @@ public interface NetworkService {
Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long networkOfferingId);
- PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed,
+ PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed,
List<String> isolationMethods, String broadcastDomainRange, Long domainId, List<String> tags, String name);
- Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Long id, Long zoneId, String keyword,
+ Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Long id, Long zoneId, String keyword,
Long startIndex, Long pageSize, String name);
- PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags,
+ PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags,
String newVnetRangeString, String state);
boolean deletePhysicalNetwork(Long id);
@@ -115,7 +114,7 @@ public interface NetworkService {
long findPhysicalNetworkId(long zoneId, String tag, TrafficType trafficType);
- PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType,
+ PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType,
String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, String vlan);
PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id);
@@ -133,19 +132,19 @@ public interface NetworkService {
List<Pair<TrafficType, String>> listTrafficTypeImplementor(ListTrafficTypeImplementorsCmd cmd);
List<? extends Network> getIsolatedNetworksWithSourceNATOwnedByAccountInZone(long zoneId, Account owner);
-
+
List<? extends Network> listNetworksByVpc(long vpcId);
-
+
boolean isVmPartOfNetwork(long vmId, long ntwkId);
/**
* @param networkId
* @param entityId
* @return
- * @throws ConcurrentOperationException
- * @throws ResourceUnavailableException
- * @throws ResourceAllocationException
- * @throws InsufficientAddressCapacityException
+ * @throws ConcurrentOperationException
+ * @throws ResourceUnavailableException
+ * @throws ResourceAllocationException
+ * @throws InsufficientAddressCapacityException
*/
IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException,
ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException;
@@ -162,12 +161,12 @@ public interface NetworkService {
* @param networkOwnerId
* @param vpcId TODO
* @return
- * @throws InsufficientCapacityException
- * @throws ConcurrentOperationException
- * @throws ResourceAllocationException
+ * @throws InsufficientCapacityException
+ * @throws ConcurrentOperationException
+ * @throws ResourceAllocationException
*/
Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan,
- String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId)
+ String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId)
throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
/**
* @param network
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/Networks.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java
index b96eaa2..b156619 100755
--- a/api/src/com/cloud/network/Networks.java
+++ b/api/src/com/cloud/network/Networks.java
@@ -23,7 +23,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
/**
* Network includes all of the enums used within networking.
- *
+ *
*/
public class Networks {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/PhysicalNetwork.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java
index be4b1d0..a495092 100644
--- a/api/src/com/cloud/network/PhysicalNetwork.java
+++ b/api/src/com/cloud/network/PhysicalNetwork.java
@@ -16,12 +16,15 @@
// under the License.
package com.cloud.network;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
import java.util.List;
/**
- *
+ *
*/
-public interface PhysicalNetwork {
+public interface PhysicalNetwork extends Identity, InternalIdentity {
public enum State {
Disabled,
@@ -40,8 +43,6 @@ public interface PhysicalNetwork {
ZONE;
}
- long getId();
-
BroadcastDomainRange getBroadcastDomainRange();
// TrafficType getTrafficType();
@@ -60,8 +61,6 @@ public interface PhysicalNetwork {
String getSpeed();
- String getUuid();
-
String getName();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
index 1b91311..0a433dc 100644
--- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
+++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
@@ -19,11 +19,12 @@ package com.cloud.network;
import java.util.List;
import com.cloud.network.Network.Service;
+import org.apache.cloudstack.api.InternalIdentity;
/**
- *
+ *
*/
-public interface PhysicalNetworkServiceProvider {
+public interface PhysicalNetworkServiceProvider extends InternalIdentity {
public enum State {
Disabled,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
index 0c0bfa1..62400e8 100644
--- a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
+++ b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
@@ -17,13 +17,13 @@
package com.cloud.network;
import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
/**
- *
+ *
*/
-public interface PhysicalNetworkTrafficType {
-
- long getId();
+public interface PhysicalNetworkTrafficType extends InternalIdentity, Identity {
long getPhysicalNetworkId();
@@ -36,6 +36,4 @@ public interface PhysicalNetworkTrafficType {
String getVmwareNetworkLabel();
String getSimulatorNetworkLabel();
-
- String getUuid();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/PublicIpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java
index 5d117b8..21dae54 100644
--- a/api/src/com/cloud/network/PublicIpAddress.java
+++ b/api/src/com/cloud/network/PublicIpAddress.java
@@ -16,19 +16,20 @@
// under the License.
package com.cloud.network;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.dc.Vlan;
+import org.apache.cloudstack.api.InternalIdentity;
/**
*/
-public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan {
-
+public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, InternalIdentity {
+
String getMacAddress();
-
+
public String getNetmask();
-
+
public String getGateway();
-
+
@Override
public String getVlanTag();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/RemoteAccessVpn.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/RemoteAccessVpn.java b/api/src/com/cloud/network/RemoteAccessVpn.java
index 162e0fc..1b46330 100644
--- a/api/src/com/cloud/network/RemoteAccessVpn.java
+++ b/api/src/com/cloud/network/RemoteAccessVpn.java
@@ -16,7 +16,7 @@
// under the License.
package com.cloud.network;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
public interface RemoteAccessVpn extends ControlledEntity {
enum State {
@@ -24,7 +24,7 @@ public interface RemoteAccessVpn extends ControlledEntity {
Running,
Removed
}
-
+
long getServerAddressId();
String getIpRange();
String getIpsecPresharedKey();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/Site2SiteCustomerGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
index 8950c77..3a54385 100644
--- a/api/src/com/cloud/network/Site2SiteCustomerGateway.java
+++ b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -18,10 +18,11 @@ package com.cloud.network;
import java.util.Date;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface Site2SiteCustomerGateway extends ControlledEntity {
- public long getId();
+public interface Site2SiteCustomerGateway extends ControlledEntity, Identity, InternalIdentity {
public String getGatewayIp();
public String getGuestCidrList();
public String getIpsecPsk();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/Site2SiteVpnConnection.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java
index 6cf52a9..810f999 100644
--- a/api/src/com/cloud/network/Site2SiteVpnConnection.java
+++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -18,9 +18,10 @@ package com.cloud.network;
import java.util.Date;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface Site2SiteVpnConnection extends ControlledEntity {
+public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity {
enum State {
Pending,
Connected,
@@ -28,6 +29,7 @@ public interface Site2SiteVpnConnection extends ControlledEntity {
Error,
}
public long getId();
+ public String getUuid();
public long getVpnGatewayId();
public long getCustomerGatewayId();
public State getState();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/Site2SiteVpnGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/com/cloud/network/Site2SiteVpnGateway.java
index 52ec597..8137913 100644
--- a/api/src/com/cloud/network/Site2SiteVpnGateway.java
+++ b/api/src/com/cloud/network/Site2SiteVpnGateway.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -18,10 +18,11 @@ package com.cloud.network;
import java.util.Date;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface Site2SiteVpnGateway extends ControlledEntity {
- public long getId();
+public interface Site2SiteVpnGateway extends ControlledEntity, Identity, InternalIdentity {
public long getAddrId();
public long getVpcId();
public Date getRemoved();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/StorageNetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/com/cloud/network/StorageNetworkService.java
index 86a8352..1bda247 100755
--- a/api/src/com/cloud/network/StorageNetworkService.java
+++ b/api/src/com/cloud/network/StorageNetworkService.java
@@ -19,18 +19,18 @@ package com.cloud.network;
import java.sql.SQLException;
import java.util.List;
-import com.cloud.api.commands.CreateStorageNetworkIpRangeCmd;
-import com.cloud.api.commands.DeleteStorageNetworkIpRangeCmd;
-import com.cloud.api.commands.UpdateStorageNetworkIpRangeCmd;
-import com.cloud.api.commands.listStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.*;
+import org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd;
import com.cloud.dc.StorageNetworkIpRange;
+import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;
public interface StorageNetworkService {
StorageNetworkIpRange createIpRange(CreateStorageNetworkIpRangeCmd cmd) throws SQLException;
void deleteIpRange(DeleteStorageNetworkIpRangeCmd cmd);
- List<StorageNetworkIpRange> listIpRange(listStorageNetworkIpRangeCmd cmd);
+ List<StorageNetworkIpRange> listIpRange(ListStorageNetworkIpRangeCmd cmd);
StorageNetworkIpRange updateIpRange(UpdateStorageNetworkIpRangeCmd cmd);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/VirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index 300c993..7b553b2 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -16,7 +16,7 @@
// under the License.
package com.cloud.network;
-import com.cloud.api.commands.UpgradeRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
@@ -26,29 +26,29 @@ import com.cloud.user.Account;
public interface VirtualNetworkApplianceService {
/**
* Starts domain router
- *
+ *
* @param cmd
* the command specifying router's id
* @return DomainRouter object
*/
- VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
+ VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
/**
* Reboots domain router
- *
+ *
* @param cmd
* the command specifying router's id
* @return router if successful
*/
- VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
+ VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
VirtualRouter upgradeRouter(UpgradeRouterCmd cmd);
/**
* Stops domain router
- *
+ *
* @param id
* of the router
* @param forced
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/VirtualRouterProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualRouterProvider.java b/api/src/com/cloud/network/VirtualRouterProvider.java
index f0837d6..ed6a274 100644
--- a/api/src/com/cloud/network/VirtualRouterProvider.java
+++ b/api/src/com/cloud/network/VirtualRouterProvider.java
@@ -16,7 +16,10 @@
// under the License.
package com.cloud.network;
-public interface VirtualRouterProvider {
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface VirtualRouterProvider extends InternalIdentity, Identity {
public enum VirtualRouterProviderType {
VirtualRouter,
ElasticLoadBalancerVm,
@@ -25,8 +28,6 @@ public interface VirtualRouterProvider {
public VirtualRouterProviderType getType();
- public long getId();
-
public boolean isEnabled();
public long getNspId();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
index 03eb576..6e8fd38 100644
--- a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
@@ -32,7 +32,7 @@ public interface VpcVirtualNetworkApplianceService extends VirtualNetworkApplian
* @throws ResourceUnavailableException
* @throws InsufficientCapacityException
*/
- boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
+ boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
@@ -43,7 +43,7 @@ public interface VpcVirtualNetworkApplianceService extends VirtualNetworkApplian
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
+ boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
throws ConcurrentOperationException, ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/VpnUser.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VpnUser.java b/api/src/com/cloud/network/VpnUser.java
index 07a3ee3..ad84e91 100644
--- a/api/src/com/cloud/network/VpnUser.java
+++ b/api/src/com/cloud/network/VpnUser.java
@@ -16,17 +16,17 @@
// under the License.
package com.cloud.network;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface VpnUser extends ControlledEntity {
+public interface VpnUser extends ControlledEntity, InternalIdentity, Identity {
enum State {
Add,
Revoke,
Active
}
- long getId();
-
String getUsername();
String getPassword();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/AutoScalePolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java
index cef198f..7f94f35 100644
--- a/api/src/com/cloud/network/as/AutoScalePolicy.java
+++ b/api/src/com/cloud/network/as/AutoScalePolicy.java
@@ -17,12 +17,15 @@
package com.cloud.network.as;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface AutoScalePolicy extends ControlledEntity {
+public interface AutoScalePolicy extends ControlledEntity, InternalIdentity {
long getId();
+ String getUuid();
+
public int getDuration();
public int getQuietTime();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/AutoScaleService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/com/cloud/network/as/AutoScaleService.java
index c1ca804..daa8d19 100644
--- a/api/src/com/cloud/network/as/AutoScaleService.java
+++ b/api/src/com/cloud/network/as/AutoScaleService.java
@@ -1,43 +1,31 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
package com.cloud.network.as;
import java.util.List;
-import com.cloud.api.commands.CreateAutoScalePolicyCmd;
-import com.cloud.api.commands.CreateAutoScaleVmGroupCmd;
-import com.cloud.api.commands.CreateAutoScaleVmProfileCmd;
-import com.cloud.api.commands.CreateConditionCmd;
-import com.cloud.api.commands.CreateCounterCmd;
-import com.cloud.api.commands.ListAutoScalePoliciesCmd;
-import com.cloud.api.commands.ListAutoScaleVmGroupsCmd;
-import com.cloud.api.commands.ListAutoScaleVmProfilesCmd;
-import com.cloud.api.commands.ListConditionsCmd;
-import com.cloud.api.commands.ListCountersCmd;
-import com.cloud.api.commands.UpdateAutoScalePolicyCmd;
-import com.cloud.api.commands.UpdateAutoScaleVmGroupCmd;
-import com.cloud.api.commands.UpdateAutoScaleVmProfileCmd;
+import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
+import org.apache.cloudstack.api.command.user.autoscale.*;
+import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
+import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
+import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.as.AutoScalePolicy;
-import com.cloud.network.as.AutoScaleVmGroup;
-import com.cloud.network.as.AutoScaleVmProfile;
-import com.cloud.network.as.Condition;
-import com.cloud.network.as.Counter;
public interface AutoScaleService {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/AutoScaleVmGroup.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
index 6d41ae3..faa166d 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
@@ -17,10 +17,11 @@
package com.cloud.network.as;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface AutoScaleVmGroup extends ControlledEntity {
+public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity {
String State_New = "new";
String State_Revoke = "revoke";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/AutoScaleVmProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
index 77f5ce4..3be5a3e 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
@@ -1,34 +1,37 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package com.cloud.network.as;
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.as;
import java.util.List;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.utils.Pair;
+import org.apache.cloudstack.api.InternalIdentity;
/**
* AutoScaleVmProfile
*/
-public interface AutoScaleVmProfile extends ControlledEntity {
+public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity {
public long getId();
+ public String getUuid();
+
public Long getZoneId();
public Long getServiceOfferingId();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/Condition.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/Condition.java b/api/src/com/cloud/network/as/Condition.java
index b990731..b09dc2e 100644
--- a/api/src/com/cloud/network/as/Condition.java
+++ b/api/src/com/cloud/network/as/Condition.java
@@ -17,9 +17,11 @@
package com.cloud.network.as;
-import com.cloud.acl.ControlledEntity;
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
-public interface Condition extends ControlledEntity {
+public interface Condition extends ControlledEntity, Identity, InternalIdentity {
static enum Operator {
EQ, GT, LT, GE, LE
@@ -30,8 +32,4 @@ public interface Condition extends ControlledEntity {
long getThreshold();
Operator getRelationalOperator();
-
- String getUuid();
-
- long getId();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/as/Counter.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/Counter.java b/api/src/com/cloud/network/as/Counter.java
index d9e2e0a..207ec57 100644
--- a/api/src/com/cloud/network/as/Counter.java
+++ b/api/src/com/cloud/network/as/Counter.java
@@ -17,7 +17,10 @@
package com.cloud.network.as;
-public interface Counter {
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface Counter extends InternalIdentity, Identity {
public static enum Source {
netscaler,
@@ -29,8 +32,4 @@ public interface Counter {
String getValue();
Source getSource();
-
- String getUuid();
-
- long getId();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java b/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
index c577c26..879ea0e 100644
--- a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
+++ b/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
@@ -37,7 +37,7 @@ public interface LoadBalancingServiceProvider extends NetworkElement, IpDeployin
* @param network
* @param rule
* @return true/false. true should be return if there are no validations. false should be return if any oneof the validation fails.
- * @throws
+ * @throws
*/
boolean validateLBRule(Network network, LoadBalancingRule rule);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/NetworkElement.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java
index 10ea509..1ddd60b 100644
--- a/api/src/com/cloud/network/element/NetworkElement.java
+++ b/api/src/com/cloud/network/element/NetworkElement.java
@@ -41,25 +41,25 @@ import com.cloud.vm.VirtualMachineProfile;
* Represents one network element that exists in a network.
*/
public interface NetworkElement extends Adapter {
-
+
Map<Service, Map<Capability, String>> getCapabilities();
-
+
/**
- * NOTE:
+ * NOTE:
* NetworkElement -> Network.Provider is a one-to-one mapping. While adding a new NetworkElement, one must add a new Provider name to Network.Provider.
*/
Provider getProvider();
-
+
/**
- * Implement the network configuration as specified.
+ * Implement the network configuration as specified.
* @param config fully specified network configuration.
* @param offering network offering that originated the network configuration.
* @return true if network configuration is now usable; false if not; null if not handled by this element.
* @throws InsufficientNetworkCapacityException TODO
*/
- boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context)
+ boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
-
+
/**
* Prepare for a nic to be added into this network.
* @param network
@@ -72,10 +72,10 @@ public interface NetworkElement extends Adapter {
* @throws ResourceUnavailableException
* @throws InsufficientNetworkCapacityException
*/
- boolean prepare(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm,
- DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
+ boolean prepare(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm,
+ DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
-
+
/**
* A nic is released from this network.
* @param network
@@ -86,9 +86,9 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean release(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm,
+ boolean release(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm,
ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
/**
* The network is being shutdown.
* @param network
@@ -98,9 +98,9 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean shutdown(Network network, ReservationContext context, boolean cleanup)
+ boolean shutdown(Network network, ReservationContext context, boolean cleanup)
throws ConcurrentOperationException, ResourceUnavailableException;
-
+
/**
* The network is being destroyed.
* @param network
@@ -109,14 +109,14 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
*/
boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
/**
* Check if the instances of this Element are configured to be used on the physical network referred by this provider.
* @param provider
* @return boolean true/false
*/
boolean isReady(PhysicalNetworkServiceProvider provider);
-
+
/**
* The network service provider is being shutdown. This should shutdown all instances of this element deployed for this provider.
* @param context
@@ -125,15 +125,15 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context)
+ boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException;
-
+
/**
- * This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false.
+ * This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false.
* @return true/false
*/
boolean canEnableIndividualServices();
-
+
/**
* Would return true if the service combination is supported by the provider
* @param services
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java b/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
index b4c54cb..4625d22 100644
--- a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
+++ b/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
@@ -27,6 +27,6 @@ public interface RemoteAccessVPNServiceProvider extends NetworkElement, IpDeploy
String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException;
boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
-
+
boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java b/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java
index 8063cbb..a61273a 100644
--- a/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java
+++ b/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -22,6 +22,6 @@ import com.cloud.network.Site2SiteVpnConnection;
public interface Site2SiteVpnServiceProvider extends NetworkElement {
boolean startSite2SiteVpn(Site2SiteVpnConnection conn) throws ResourceUnavailableException;
-
+
boolean stopSite2SiteVpn(Site2SiteVpnConnection conn) throws ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/VirtualRouterElementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/com/cloud/network/element/VirtualRouterElementService.java
index bf8cad2..3ba2045 100644
--- a/api/src/com/cloud/network/element/VirtualRouterElementService.java
+++ b/api/src/com/cloud/network/element/VirtualRouterElementService.java
@@ -18,8 +18,8 @@ package com.cloud.network.element;
import java.util.List;
-import com.cloud.api.commands.ConfigureVirtualRouterElementCmd;
-import com.cloud.api.commands.ListVirtualRouterElementsCmd;
+import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
+import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.utils.component.PluggableService;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/element/VpcProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/com/cloud/network/element/VpcProvider.java
index aa5d224..482fe62 100644
--- a/api/src/com/cloud/network/element/VpcProvider.java
+++ b/api/src/com/cloud/network/element/VpcProvider.java
@@ -36,7 +36,7 @@ public interface VpcProvider extends NetworkElement{
* @param vpc fully specified vpc configuration.
* @throws InsufficientNetworkCapacityException TODO
*/
- boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context)
+ boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
@@ -47,10 +47,10 @@ public interface VpcProvider extends NetworkElement{
* @throws ResourceUnavailableException
*/
boolean shutdownVpc(Vpc vpc, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
boolean createPrivateGateway(PrivateGateway gateway) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
boolean deletePrivateGateway(PrivateGateway privateGateway) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/firewall/FirewallService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/firewall/FirewallService.java b/api/src/com/cloud/network/firewall/FirewallService.java
index 07c2fb5..3858499 100644
--- a/api/src/com/cloud/network/firewall/FirewallService.java
+++ b/api/src/com/cloud/network/firewall/FirewallService.java
@@ -19,7 +19,7 @@ package com.cloud.network.firewall;
import java.util.List;
-import com.cloud.api.commands.ListFirewallRulesCmd;
+import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
@@ -33,7 +33,7 @@ public interface FirewallService {
/**
* Revokes a firewall rule
- *
+ *
* @param ruleId
* the id of the rule to revoke.
* @return
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/network/firewall/NetworkACLService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/firewall/NetworkACLService.java b/api/src/com/cloud/network/firewall/NetworkACLService.java
index 10896b6..a1fb02c 100644
--- a/api/src/com/cloud/network/firewall/NetworkACLService.java
+++ b/api/src/com/cloud/network/firewall/NetworkACLService.java
@@ -19,7 +19,7 @@ package com.cloud.network.firewall;
import java.util.List;
-import com.cloud.api.commands.ListNetworkACLsCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
@@ -29,7 +29,7 @@ import com.cloud.utils.Pair;
public interface NetworkACLService {
FirewallRule getNetworkACL(long ruleId);
boolean applyNetworkACLs(long networkId, Account caller) throws ResourceUnavailableException;
-
+
/**
* @param createNetworkACLCmd
* @return
@@ -46,5 +46,5 @@ public interface NetworkACLService {
* @return
*/
Pair<List<? extends FirewallRule>, Integer> listNetworkACLs(ListNetworkACLsCmd cmd);
-
+
}