You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/20 16:35:34 UTC
[47/51] [partial] Reformat all source code. Added checkstyle to check
the source code
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/rules/StaticNat.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/StaticNat.java b/api/src/com/cloud/network/rules/StaticNat.java
index 390a0db..977bc28 100644
--- a/api/src/com/cloud/network/rules/StaticNat.java
+++ b/api/src/com/cloud/network/rules/StaticNat.java
@@ -16,8 +16,7 @@
// under the License.
package com.cloud.network.rules;
-
-public interface StaticNat{
+public interface StaticNat {
long getAccountId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/security/SecurityGroupRules.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroupRules.java b/api/src/com/cloud/network/security/SecurityGroupRules.java
index 4dbafd6..f117bb1 100644
--- a/api/src/com/cloud/network/security/SecurityGroupRules.java
+++ b/api/src/com/cloud/network/security/SecurityGroupRules.java
@@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.
package com.cloud.network.security;
+
import org.apache.cloudstack.api.InternalIdentity;
import com.cloud.network.security.SecurityRule.SecurityRuleType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/security/SecurityGroupService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java
index 397de1c..746cba1 100644
--- a/api/src/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/com/cloud/network/security/SecurityGroupService.java
@@ -37,15 +37,16 @@ public interface SecurityGroupService {
* @return the created security group if successful, null otherwise
*/
public SecurityGroup createSecurityGroup(CreateSecurityGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
+
boolean revokeSecurityGroupIngress(RevokeSecurityGroupIngressCmd cmd);
+
boolean revokeSecurityGroupEgress(RevokeSecurityGroupEgressCmd cmd);
boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException;
-
public List<? extends SecurityRule> authorizeSecurityGroupIngress(AuthorizeSecurityGroupIngressCmd cmd);
public List<? extends SecurityRule> authorizeSecurityGroupEgress(AuthorizeSecurityGroupEgressCmd cmd);
- public boolean securityGroupRulesForVmSecIp(Long nicId, Long networkId,
- String secondaryIp, boolean ruleAction);
+
+ public boolean securityGroupRulesForVmSecIp(Long nicId, Long networkId, String secondaryIp, boolean ruleAction);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/security/SecurityRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityRule.java b/api/src/com/cloud/network/security/SecurityRule.java
index ff28a2a..2db6876 100644
--- a/api/src/com/cloud/network/security/SecurityRule.java
+++ b/api/src/com/cloud/network/security/SecurityRule.java
@@ -29,9 +29,10 @@ public interface SecurityRule extends Identity, InternalIdentity {
_type = type;
}
- public String getType(){
+ public String getType() {
return _type;
}
+
private final String _type;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/NetworkACL.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java
index 8bde7c2..bd73685 100644
--- a/api/src/com/cloud/network/vpc/NetworkACL.java
+++ b/api/src/com/cloud/network/vpc/NetworkACL.java
@@ -20,7 +20,7 @@ package com.cloud.network.vpc;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.InternalIdentity;
-public interface NetworkACL extends InternalIdentity{
+public interface NetworkACL extends InternalIdentity {
public static final long DEFAULT_DENY = 1;
public static final long DEFAULT_ALLOW = 2;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/NetworkACLItem.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/com/cloud/network/vpc/NetworkACLItem.java
index 312fa73..78d9957 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLItem.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLItem.java
@@ -38,13 +38,11 @@ public interface NetworkACLItem extends InternalIdentity {
}
enum TrafficType {
- Ingress,
- Egress
+ Ingress, Egress
}
enum Action {
- Allow,
- Deny
+ Allow, Deny
}
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/NetworkACLService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/com/cloud/network/vpc/NetworkACLService.java
index ec53c26..c9830af 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLService.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLService.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.vpc;
-
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.Pair;
import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;
@@ -49,7 +48,7 @@ public interface NetworkACLService {
* @param vpcId
* @return
*/
- Pair<List<? extends NetworkACL>,Integer> listNetworkACLs(Long id, String name, Long networkId, Long vpcId);
+ Pair<List<? extends NetworkACL>, Integer> listNetworkACLs(Long id, String name, Long networkId, Long vpcId);
/**
* Delete specified network ACL. Deletion fails if the list is not empty
@@ -119,9 +118,8 @@ public interface NetworkACLService {
* @return
* @throws ResourceUnavailableException
*/
- NetworkACLItem updateNetworkACLItem(Long id, String protocol, List<String> sourceCidrList, NetworkACLItem.TrafficType trafficType,
- String action, Integer number, Integer sourcePortStart, Integer sourcePortEnd,
- Integer icmpCode, Integer icmpType) throws ResourceUnavailableException;
+ NetworkACLItem updateNetworkACLItem(Long id, String protocol, List<String> sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number,
+ Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType) throws ResourceUnavailableException;
/**
* Associates ACL with specified Network
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/PrivateIp.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/PrivateIp.java b/api/src/com/cloud/network/vpc/PrivateIp.java
index 4d2cf61..8468822 100644
--- a/api/src/com/cloud/network/vpc/PrivateIp.java
+++ b/api/src/com/cloud/network/vpc/PrivateIp.java
@@ -44,6 +44,7 @@ public interface PrivateIp {
String getMacAddress();
long getNetworkId();
+
boolean getSourceNat();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/StaticRouteProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/com/cloud/network/vpc/StaticRouteProfile.java
index 301bb23..05cff49 100644
--- a/api/src/com/cloud/network/vpc/StaticRouteProfile.java
+++ b/api/src/com/cloud/network/vpc/StaticRouteProfile.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.vpc;
-
public class StaticRouteProfile implements StaticRoute {
private long id;
private String uuid;
@@ -31,7 +30,6 @@ public class StaticRouteProfile implements StaticRoute {
String netmask;
String ipAddress;
-
public StaticRouteProfile(StaticRoute staticRoute, VpcGateway gateway) {
this.id = staticRoute.getId();
this.uuid = staticRoute.getUuid();
@@ -74,7 +72,7 @@ public class StaticRouteProfile implements StaticRoute {
@Override
public Long getVpcId() {
- return vpcId;
+ return vpcId;
}
@Override
@@ -82,7 +80,6 @@ public class StaticRouteProfile implements StaticRoute {
return id;
}
-
@Override
public String getUuid() {
return uuid;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/Vpc.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/com/cloud/network/vpc/Vpc.java
index 249e80f..58a662f 100644
--- a/api/src/com/cloud/network/vpc/Vpc.java
+++ b/api/src/com/cloud/network/vpc/Vpc.java
@@ -21,62 +21,55 @@ import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
public interface Vpc extends ControlledEntity, Identity, InternalIdentity {
-
+
public enum State {
- Enabled,
- Inactive
+ Enabled, Inactive
}
/**
*
* @return VPC name
*/
- String getName();
+ String getName();
-
- /**
- * @return the id of the zone the VPC belongs to
- */
- long getZoneId();
+ /**
+ * @return the id of the zone the VPC belongs to
+ */
+ long getZoneId();
-
- /**
- * @return super CIDR of the VPC. All the networks participating in VPC, should have CIDRs that are the part of the super cidr
- */
- String getCidr();
+ /**
+ * @return super CIDR of the VPC. All the networks participating in VPC, should have CIDRs that are the part of the super cidr
+ */
+ String getCidr();
- /**
- *
- * @return VPC state
- */
- State getState();
+ /**
+ *
+ * @return VPC state
+ */
+ State getState();
-
- /**
- *
- * @return VPC offering id - the offering that VPC is created from
- */
- long getVpcOfferingId();
+ /**
+ *
+ * @return VPC offering id - the offering that VPC is created from
+ */
+ long getVpcOfferingId();
-
- /**
- *
- * @return VPC display text
- */
- String getDisplayText();
+ /**
+ *
+ * @return VPC display text
+ */
+ String getDisplayText();
-
- /**
- *
- * @return VPC network domain. All networks participating in the VPC, become the part of the same network domain
- */
- String getNetworkDomain();
+ /**
+ *
+ * @return VPC network domain. All networks participating in the VPC, become the part of the same network domain
+ */
+ String getNetworkDomain();
-
- /**
- *
- * @return true if restart is required for the VPC; false otherwise
- */
- boolean isRestartRequired();
+ /**
+ *
+ * @return true if restart is required for the VPC; false otherwise
+ */
+ boolean isRestartRequired();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/VpcGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/com/cloud/network/vpc/VpcGateway.java
index 4e2d966..f2076ef 100644
--- a/api/src/com/cloud/network/vpc/VpcGateway.java
+++ b/api/src/com/cloud/network/vpc/VpcGateway.java
@@ -22,15 +22,11 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface VpcGateway extends Identity, ControlledEntity, InternalIdentity {
public enum Type {
- Private,
- Public,
- Vpn
+ Private, Public, Vpn
}
public enum State {
- Creating,
- Ready,
- Deleting
+ Creating, Ready, Deleting
}
/**
@@ -77,6 +73,7 @@ public interface VpcGateway extends Identity, ControlledEntity, InternalIdentity
* @return
*/
State getState();
+
/**
* @return
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/VpcOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java
index 3ec81e6..320cf93 100644
--- a/api/src/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/com/cloud/network/vpc/VpcOffering.java
@@ -21,8 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface VpcOffering extends InternalIdentity, Identity {
public enum State {
- Disabled,
- Enabled
+ Disabled, Enabled
}
public static final String defaultVPCOfferingName = "Default VPC offering";
@@ -34,12 +33,10 @@ public interface VpcOffering extends InternalIdentity, Identity {
*/
String getName();
-
/**
* @return VPC offering display text
*/
String getDisplayText();
-
/**
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/VpcProvisioningService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
index e8094bc..8ab13cc 100644
--- a/api/src/com/cloud/network/vpc/VpcProvisioningService.java
+++ b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
@@ -23,11 +23,10 @@ public interface VpcProvisioningService {
public VpcOffering getVpcOffering(long vpcOfferingId);
- public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
- Map<String, List<String>> serviceProviders, Long serviceOfferingId);
+ public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices, Map<String, List<String>> serviceProviders, Long serviceOfferingId);
- List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr,
- Boolean isDefault, String keyword, String state, Long startIndex, Long pageSizeVal);
+ List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr, Boolean isDefault, String keyword, String state,
+ Long startIndex, Long pageSizeVal);
/**
* @param offId
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpc/VpcService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
index bd4ffe4..8f25424 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -48,7 +48,6 @@ public interface VpcService {
*/
public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) throws ResourceAllocationException;
-
/**
* Deletes a VPC
*
@@ -60,7 +59,6 @@ public interface VpcService {
*/
public boolean deleteVpc(long vpcId) throws ConcurrentOperationException, ResourceUnavailableException;
-
/**
* Updates VPC with new name/displayText
*
@@ -71,7 +69,6 @@ public interface VpcService {
*/
public Vpc updateVpc(long vpcId, String vpcName, String displayText);
-
/**
* Lists VPC(s) based on the parameters passed to the method call
*
@@ -121,7 +118,6 @@ public interface VpcService {
*/
boolean shutdownVpc(long vpcId) throws ConcurrentOperationException, ResourceUnavailableException;
-
/**
* Restarts the VPC. VPC gets shutdown and started as a part of it
*
@@ -158,8 +154,8 @@ public interface VpcService {
* @throws ConcurrentOperationException
* @throws ResourceAllocationException
*/
- public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress, String gateway, String netmask, long gatewayOwnerId, Long networkOfferingId,
- Boolean isSoruceNat, Long aclId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
+ public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress, String gateway, String netmask, long gatewayOwnerId,
+ Long networkOfferingId, Boolean isSoruceNat, Long aclId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
/**
* Applies VPC private gateway on the backend, so it becomes functional
@@ -172,7 +168,6 @@ public interface VpcService {
*/
public PrivateGateway applyVpcPrivateGateway(long gatewayId, boolean destroyOnFailure) throws ConcurrentOperationException, ResourceUnavailableException;
-
/**
* Deletes VPC private gateway
*
@@ -183,7 +178,6 @@ public interface VpcService {
*/
boolean deleteVpcPrivateGateway(long gatewayId) throws ConcurrentOperationException, ResourceUnavailableException;
-
/**
* Returns the list of Private gateways existing in the VPC
*
@@ -192,7 +186,6 @@ public interface VpcService {
*/
public Pair<List<PrivateGateway>, Integer> listPrivateGateway(ListPrivateGatewaysCmd listPrivateGatewaysCmd);
-
/**
* Returns Static Route found by Id
*
@@ -201,7 +194,6 @@ public interface VpcService {
*/
StaticRoute getStaticRoute(long routeId);
-
/**
* Applies existing Static Routes to the VPC elements
*
@@ -211,7 +203,6 @@ public interface VpcService {
*/
public boolean applyStaticRoutes(long vpcId) throws ResourceUnavailableException;
-
/**
* Deletes static route from the backend and the database
*
@@ -221,7 +212,6 @@ public interface VpcService {
*/
public boolean revokeStaticRoute(long routeId) throws ResourceUnavailableException;
-
/**
* Persists static route entry in the Database
*
@@ -231,7 +221,6 @@ public interface VpcService {
*/
public StaticRoute createStaticRoute(long gatewayId, String cidr) throws NetworkRuleConflictException;
-
/**
* Lists static routes based on parameters passed to the call
*
@@ -240,7 +229,6 @@ public interface VpcService {
*/
public Pair<List<? extends StaticRoute>, Integer> listStaticRoutes(ListStaticRoutesCmd cmd);
-
/**
* Associates IP address from the Public network, to the VPC
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index de7692d..ac9649b 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -31,17 +31,22 @@ import com.cloud.utils.Pair;
public interface RemoteAccessVpnService {
static final String RemoteAccessVpnClientIpRangeCK = "remote.access.vpn.client.iprange";
- RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall)
- throws NetworkRuleConflictException;
+ RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall) throws NetworkRuleConflictException;
+
void destroyRemoteAccessVpnForIp(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
+
RemoteAccessVpn startRemoteAccessVpn(long vpnServerAddressId, boolean openFirewall) throws ResourceUnavailableException;
VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
+
boolean removeVpnUser(long vpnOwnerId, String userName, Account caller);
+
List<? extends VpnUser> listVpnUsers(long vpnOwnerId, String userName);
+
boolean applyVpnUsers(long vpnOwnerId, String userName);
Pair<List<? extends RemoteAccessVpn>, Integer> searchForRemoteAccessVpns(ListRemoteAccessVpnsCmd cmd);
+
Pair<List<? extends VpnUser>, Integer> searchForVpnUsers(ListVpnUsersCmd cmd);
List<? extends RemoteAccessVpn> listRemoteAccessVpns(long networkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
index d90e3a9..bfc5e25 100644
--- a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
+++ b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java
@@ -39,16 +39,28 @@ import com.cloud.utils.Pair;
public interface Site2SiteVpnService {
Site2SiteVpnGateway createVpnGateway(CreateVpnGatewayCmd cmd);
+
Site2SiteCustomerGateway createCustomerGateway(CreateVpnCustomerGatewayCmd cmd);
+
Site2SiteVpnConnection startVpnConnection(long id) throws ResourceUnavailableException;
+
Site2SiteVpnGateway getVpnGateway(Long vpnGatewayId);
+
Site2SiteVpnConnection createVpnConnection(CreateVpnConnectionCmd cmd) throws NetworkRuleConflictException;
+
boolean deleteCustomerGateway(DeleteVpnCustomerGatewayCmd deleteVpnCustomerGatewayCmd);
+
boolean deleteVpnGateway(DeleteVpnGatewayCmd deleteVpnGatewayCmd);
+
boolean deleteVpnConnection(DeleteVpnConnectionCmd deleteVpnConnectionCmd) throws ResourceUnavailableException;
+
Site2SiteVpnConnection resetVpnConnection(ResetVpnConnectionCmd resetVpnConnectionCmd) throws ResourceUnavailableException;
+
Pair<List<? extends Site2SiteCustomerGateway>, Integer> searchForCustomerGateways(ListVpnCustomerGatewaysCmd listVpnCustomerGatewaysCmd);
+
Pair<List<? extends Site2SiteVpnGateway>, Integer> searchForVpnGateways(ListVpnGatewaysCmd listVpnGatewaysCmd);
+
Pair<List<? extends Site2SiteVpnConnection>, Integer> searchForVpnConnections(ListVpnConnectionsCmd listVpnConnectionsCmd);
+
Site2SiteCustomerGateway updateCustomerGateway(UpdateVpnCustomerGatewayCmd updateVpnCustomerGatewayCmd);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/offering/DiskOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
index fa6d66b..c2c8aeb 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -29,8 +29,7 @@ import org.apache.cloudstack.api.InternalIdentity;
*/
public interface DiskOffering extends InfrastructureEntity, Identity, InternalIdentity {
enum State {
- Inactive,
- Active,
+ Inactive, Active,
}
State getState();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/offering/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/com/cloud/offering/NetworkOffering.java
index 749dae3..b4f3863 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -30,18 +30,15 @@ import com.cloud.network.Networks.TrafficType;
public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, Identity {
public enum Availability {
- Required,
- Optional
+ Required, Optional
}
public enum State {
- Disabled,
- Enabled
+ Disabled, Enabled
}
-
+
public enum Detail {
- InternalLbProvider,
- PublicLbProvider
+ InternalLbProvider, PublicLbProvider
}
public final static String SystemPublicNetwork = "System-Public-Network";
@@ -61,7 +58,6 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
public final static String DefaultIsolatedNetworkOfferingForVpcNetworksNoLB = "DefaultIsolatedNetworkOfferingForVpcNetworksNoLB";
public final static String DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB = "DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB";
-
/**
* @return name for the network offering.
*/
@@ -123,10 +119,11 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
boolean isInline();
boolean getIsPersistent();
-
+
boolean getInternalLb();
boolean getPublicLb();
+
boolean getEgressDefaultPolicy();
Integer getConcurrentConnections();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/offering/ServiceOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java
index e4c65cd..05ae237 100755
--- a/api/src/com/cloud/offering/ServiceOffering.java
+++ b/api/src/com/cloud/offering/ServiceOffering.java
@@ -33,8 +33,7 @@ public interface ServiceOffering extends DiskOffering, InfrastructureEntity, Int
public static final String internalLbVmDefaultOffUniqueName = "Cloud.Com-InternalLBVm";
public enum StorageType {
- local,
- shared
+ local, shared
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/org/Cluster.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/org/Cluster.java b/api/src/com/cloud/org/Cluster.java
index d14f86b..90fcb57 100644
--- a/api/src/com/cloud/org/Cluster.java
+++ b/api/src/com/cloud/org/Cluster.java
@@ -24,8 +24,7 @@ import com.cloud.org.Managed.ManagedState;
public interface Cluster extends Grouping, InternalIdentity, Identity {
public static enum ClusterType {
- CloudManaged,
- ExternalManaged;
+ CloudManaged, ExternalManaged;
};
String getName();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/org/Grouping.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/org/Grouping.java b/api/src/com/cloud/org/Grouping.java
index ed77868..54da948 100644
--- a/api/src/com/cloud/org/Grouping.java
+++ b/api/src/com/cloud/org/Grouping.java
@@ -18,8 +18,7 @@ package com.cloud.org;
public interface Grouping {
public enum AllocationState {
- Enabled,
- Disabled;
+ Enabled, Disabled;
};
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/org/Managed.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/org/Managed.java b/api/src/com/cloud/org/Managed.java
index bd87c97..92d2ee4 100644
--- a/api/src/com/cloud/org/Managed.java
+++ b/api/src/com/cloud/org/Managed.java
@@ -18,10 +18,7 @@ package com.cloud.org;
public interface Managed {
public enum ManagedState {
- Managed,
- PrepareUnmanaged,
- Unmanaged,
- PrepareUnmanagedError
+ Managed, PrepareUnmanaged, Unmanaged, PrepareUnmanagedError
};
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/org/RunningIn.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/org/RunningIn.java b/api/src/com/cloud/org/RunningIn.java
index 52ae043..26a9e6f 100644
--- a/api/src/com/cloud/org/RunningIn.java
+++ b/api/src/com/cloud/org/RunningIn.java
@@ -18,7 +18,10 @@ package com.cloud.org;
public interface RunningIn {
long getDataCenterId();
+
long getPodId();
+
Long getClusterId();
+
Long getHostId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/projects/ProjectService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/projects/ProjectService.java b/api/src/com/cloud/projects/ProjectService.java
index 0197518..dc882ef 100644
--- a/api/src/com/cloud/projects/ProjectService.java
+++ b/api/src/com/cloud/projects/ProjectService.java
@@ -73,8 +73,6 @@ public interface ProjectService {
boolean deleteAccountFromProject(long projectId, String accountName);
-
-
boolean updateInvitation(long projectId, String accountName, String token, boolean accept);
Project activateProject(long projectId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
index 597304f..5e7e8cd 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -27,24 +27,21 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity, Cont
enum Algorithm {
- RoundRobin,
- LeastConn,
- Proximity;
+ RoundRobin, LeastConn, Proximity;
public static boolean isValidAlgorithm(String algorithm) {
- if (RoundRobin.name().equalsIgnoreCase(algorithm) ||
- LeastConn.name().equalsIgnoreCase(algorithm) ||
- Proximity.name().equalsIgnoreCase(algorithm)) {
+ if (RoundRobin.name().equalsIgnoreCase(algorithm) || LeastConn.name().equalsIgnoreCase(algorithm) || Proximity.name().equalsIgnoreCase(algorithm)) {
return true;
}
return false;
}
}
+
enum Persistence {
sourceip;
- public static boolean isValidPersistence(String persistence) {
+ public static boolean isValidPersistence(String persistence) {
if (sourceip.name().equalsIgnoreCase(persistence)) {
return true;
}
@@ -53,20 +50,17 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity, Cont
}
enum ServiceType {
- tcp,
- udp;
- public static boolean isValidServiceType(String serviceType) {
+ tcp, udp;
+ public static boolean isValidServiceType(String serviceType) {
if (tcp.name().equalsIgnoreCase(serviceType) || udp.name().equalsIgnoreCase(serviceType)) {
return true;
}
return false;
}
}
+
enum State {
- Staged,
- Add,
- Active,
- Revoke
+ Staged, Add, Active, Revoke
}
public String getName();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
index 9375544..708249a 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
@@ -33,8 +33,7 @@ public interface GlobalLoadBalancingRulesService {
GlobalLoadBalancerRule updateGlobalLoadBalancerRule(UpdateGlobalLoadBalancerRuleCmd updateGslbCmd);
- boolean revokeAllGslbRulesForAccount(com.cloud.user.Account caller, long accountId)
- throws com.cloud.exception.ResourceUnavailableException;
+ boolean revokeAllGslbRulesForAccount(com.cloud.user.Account caller, long accountId) throws com.cloud.exception.ResourceUnavailableException;
/*
* methods for managing sites participating in global load balancing
@@ -43,7 +42,6 @@ public interface GlobalLoadBalancingRulesService {
boolean removeFromGlobalLoadBalancerRule(RemoveFromGlobalLoadBalancerRuleCmd removeFromGslbCmd);
-
GlobalLoadBalancerRule findById(long gslbRuleId);
List<GlobalLoadBalancerRule> listGlobalLoadBalancerRule(ListGlobalLoadBalancerRuleCmd listGslbCmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/resource/ResourceState.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/com/cloud/resource/ResourceState.java
index 6e0afa6..6400251 100755
--- a/api/src/com/cloud/resource/ResourceState.java
+++ b/api/src/com/cloud/resource/ResourceState.java
@@ -22,25 +22,12 @@ import java.util.Set;
import com.cloud.utils.fsm.StateMachine;
public enum ResourceState {
- Creating,
- Enabled,
- Disabled,
- PrepareForMaintenance,
- ErrorInMaintenance,
- Maintenance,
- Error;
+ Creating, Enabled, Disabled, PrepareForMaintenance, ErrorInMaintenance, Maintenance, Error;
public enum Event {
- InternalCreated("Resource is created"),
- Enable("Admin enables"),
- Disable("Admin disables"),
- AdminAskMaintenace("Admin asks to enter maintenance"),
- AdminCancelMaintenance("Admin asks to cancel maintenance"),
- InternalEnterMaintenance("Resource enters maintenance"),
- UpdatePassword("Admin updates password of host"),
- UnableToMigrate("Management server migrates VM failed"),
- Error("An internal error happened"),
- DeleteHost("Admin delete a host"),
+ InternalCreated("Resource is created"), Enable("Admin enables"), Disable("Admin disables"), AdminAskMaintenace("Admin asks to enter maintenance"), AdminCancelMaintenance(
+ "Admin asks to cancel maintenance"), InternalEnterMaintenance("Resource enters maintenance"), UpdatePassword("Admin updates password of host"), UnableToMigrate(
+ "Management server migrates VM failed"), Error("An internal error happened"), DeleteHost("Admin delete a host"),
/*
* Below events don't cause resource state to change, they are merely
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/resource/UnableDeleteHostException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/com/cloud/resource/UnableDeleteHostException.java
index 154147c..bb372d6 100755
--- a/api/src/com/cloud/resource/UnableDeleteHostException.java
+++ b/api/src/com/cloud/resource/UnableDeleteHostException.java
@@ -21,7 +21,7 @@ import com.cloud.exception.CloudException;
public class UnableDeleteHostException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.UnableDeleteHostException;
-
+
public UnableDeleteHostException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/server/ManagementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index 1eb4426..65bc58b 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -91,7 +91,6 @@ public interface ManagementService {
*/
Pair<List<? extends Configuration>, Integer> searchForConfigurations(ListCfgsByCmd c);
-
/**
* Searches for Clusters by the specified search criteria
*
@@ -124,9 +123,6 @@ public interface ManagementService {
*/
Pair<List<? extends Host>, Integer> searchForServers(ListHostsCmd cmd);
-
-
-
/**
* Obtains a list of IP Addresses by the specified search criteria. Can search by: "userId", "dataCenterId",
* "address"
@@ -214,7 +210,6 @@ public interface ManagementService {
*/
List<? extends Capacity> listCapacities(ListCapacityCmd cmd);
-
/**
* List system VMs by the given search criteria
*
@@ -237,7 +232,6 @@ public interface ManagementService {
InstanceGroup updateVmGroup(UpdateVMGroupCmd cmd);
-
Map<String, Object> listCapabilities(ListCapabilitiesCmd cmd);
/**
@@ -341,8 +335,7 @@ public interface ManagementService {
* @return Ternary<List<? extends Host>, List<? extends Host>, Map<Host, Boolean>> List of all Hosts to which a VM
* can be migrated, list of Hosts with enough capacity and hosts requiring storage motion for migration.
*/
- Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> listHostsForMigrationOfVM(
- Long vmId, Long startIndex, Long pageSize);
+ Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long pageSize);
/**
* List storage pools for live migrating of a volume. The API returns list of all pools in the cluster to which the
@@ -370,7 +363,8 @@ public interface ManagementService {
List<String> listDeploymentPlanners();
- VirtualMachine upgradeSystemVM(ScaleSystemVMCmd cmd) throws ResourceUnavailableException, ManagementServerException, VirtualMachineMigrationException, ConcurrentOperationException;
+ VirtualMachine upgradeSystemVM(ScaleSystemVMCmd cmd) throws ResourceUnavailableException, ManagementServerException, VirtualMachineMigrationException,
+ ConcurrentOperationException;
void cleanupVMReservations();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/server/ResourceMetaDataService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceMetaDataService.java b/api/src/com/cloud/server/ResourceMetaDataService.java
index a71cfe7..2871d99 100644
--- a/api/src/com/cloud/server/ResourceMetaDataService.java
+++ b/api/src/com/cloud/server/ResourceMetaDataService.java
@@ -16,6 +16,7 @@
// under the License.package com.cloud.server;
package com.cloud.server;
+
import java.util.List;
import java.util.Map;
@@ -33,7 +34,6 @@ public interface ResourceMetaDataService {
*/
boolean addResourceMetaData(String resourceId, ResourceObjectType resourceType, Map<String, String> details);
-
/**
*
* @param resourceId
@@ -43,10 +43,8 @@ public interface ResourceMetaDataService {
*/
public boolean deleteResourceMetaData(String resourceId, ResourceObjectType resourceType, String key);
-
ResourceDetail getDetail(long resourceId, ResourceObjectType resourceType, String key);
-
Map<String, String> getDetailsMap(long resourceId, ResourceObjectType resourceType, Boolean forDisplay);
List<? extends ResourceDetail> getDetailsList(long resourceId, ResourceObjectType resourceType, Boolean forDisplay);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index ba1aeb8..23c3432 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -23,41 +23,41 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface ResourceTag extends ControlledEntity, Identity, InternalIdentity {
//FIXME - extract enum to another interface as its used both by resourceTags and resourceMetaData code
- public enum ResourceObjectType {
- UserVm (true, true),
- Template (true, true),
- ISO (true, false),
- Volume (true, true),
- Snapshot (true, false),
- Network (true, true),
- Nic (false, true),
- LoadBalancer (true, true),
- PortForwardingRule (true, true),
- FirewallRule (true, true),
- SecurityGroup (true, false),
- PublicIpAddress (true, true),
- Project (true, false),
- Vpc (true, false),
- NetworkACL (true, false),
- StaticRoute (true, false),
- VMSnapshot (true, false),
- RemoteAccessVpn (true, true),
- Zone (false, true),
- ServiceOffering (false, true),
+ public enum ResourceObjectType {
+ UserVm(true, true),
+ Template(true, true),
+ ISO(true, false),
+ Volume(true, true),
+ Snapshot(true, false),
+ Network(true, true),
+ Nic(false, true),
+ LoadBalancer(true, true),
+ PortForwardingRule(true, true),
+ FirewallRule(true, true),
+ SecurityGroup(true, false),
+ PublicIpAddress(true, true),
+ Project(true, false),
+ Vpc(true, false),
+ NetworkACL(true, false),
+ StaticRoute(true, false),
+ VMSnapshot(true, false),
+ RemoteAccessVpn(true, true),
+ Zone(false, true),
+ ServiceOffering(false, true),
Storage(false, true);
-
+
ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {
this.resourceTagsSupport = resourceTagsSupport;
this.metadataSupport = resourceMetadataSupport;
}
-
+
private final boolean resourceTagsSupport;
private final boolean metadataSupport;
-
+
public boolean resourceTagsSupport() {
return this.resourceTagsSupport;
}
-
+
public boolean resourceMetadataSupport() {
return this.metadataSupport;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/server/TaggedResourceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java
index 97046ac..72a921d 100644
--- a/api/src/com/cloud/server/TaggedResourceService.java
+++ b/api/src/com/cloud/server/TaggedResourceService.java
@@ -16,6 +16,7 @@
// under the License.package com.cloud.server;
package com.cloud.server;
+
import java.util.List;
import java.util.Map;
@@ -32,7 +33,6 @@ public interface TaggedResourceService {
*/
List<ResourceTag> createTags(List<String> resourceIds, ResourceObjectType resourceType, Map<String, String> tags, String customer);
-
/**
* @param resourceIds
* @param resourceType
@@ -44,7 +44,7 @@ public interface TaggedResourceService {
List<? extends ResourceTag> listByResourceTypeAndId(ResourceObjectType type, long resourceId);
//FIXME - the methods below should be extracted to its separate manager/service responsible just for retrieving object details
- ResourceObjectType getResourceType (String resourceTypeStr);
+ ResourceObjectType getResourceType(String resourceTypeStr);
/**
* @param resourceId
@@ -52,6 +52,6 @@ public interface TaggedResourceService {
* @return
*/
String getUuid(String resourceId, ResourceObjectType resourceType);
-
+
public long getResourceId(String resourceId, ResourceObjectType resourceType);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/DataStoreProviderApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/DataStoreProviderApiService.java b/api/src/com/cloud/storage/DataStoreProviderApiService.java
index f81a996..0ba258c 100644
--- a/api/src/com/cloud/storage/DataStoreProviderApiService.java
+++ b/api/src/com/cloud/storage/DataStoreProviderApiService.java
@@ -24,5 +24,5 @@ import org.apache.cloudstack.api.response.StorageProviderResponse;
public interface DataStoreProviderApiService {
public List<StorageProviderResponse> getDataStoreProviders(String type);
-
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/DataStoreRole.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/DataStoreRole.java b/api/src/com/cloud/storage/DataStoreRole.java
index 0448d29..0a62a56 100644
--- a/api/src/com/cloud/storage/DataStoreRole.java
+++ b/api/src/com/cloud/storage/DataStoreRole.java
@@ -21,20 +21,18 @@ package com.cloud.storage;
import com.cloud.utils.exception.CloudRuntimeException;
public enum DataStoreRole {
- Primary("primary"),
- Image("image"),
- ImageCache("imagecache"),
- Backup("backup");
-
+ Primary("primary"), Image("image"), ImageCache("imagecache"), Backup("backup");
+
public boolean isImageStore() {
return (this.role.equalsIgnoreCase("image") || this.role.equalsIgnoreCase("imagecache")) ? true : false;
}
-
+
private final String role;
+
DataStoreRole(String type) {
this.role = type;
}
-
+
public static DataStoreRole getRole(String role) {
if (role == null) {
throw new CloudRuntimeException("role can't be empty");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/GuestOsCategory.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/GuestOsCategory.java b/api/src/com/cloud/storage/GuestOsCategory.java
index c28d7d6..b46418d 100644
--- a/api/src/com/cloud/storage/GuestOsCategory.java
+++ b/api/src/com/cloud/storage/GuestOsCategory.java
@@ -21,7 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface GuestOsCategory extends Identity, InternalIdentity {
// Used by OS preference, 'None' for no OS preference
- public static final String CATEGORY_NONE ="None";
+ public static final String CATEGORY_NONE = "None";
String getName();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/ImageStore.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/ImageStore.java b/api/src/com/cloud/storage/ImageStore.java
index d2a72a2..ec693c4 100644
--- a/api/src/com/cloud/storage/ImageStore.java
+++ b/api/src/com/cloud/storage/ImageStore.java
@@ -21,7 +21,6 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface ImageStore extends Identity, InternalIdentity {
-
/**
* @return name of the object store.
*/
@@ -32,16 +31,14 @@ public interface ImageStore extends Identity, InternalIdentity {
*/
Long getDataCenterId();
+ /**
+ * @return object store provider name
+ */
+ String getProviderName();
- /**
- * @return object store provider name
- */
- String getProviderName();
-
-
- /**
- *
- * @return data store protocol
- */
- String getProtocol();
+ /**
+ *
+ * @return data store protocol
+ */
+ String getProtocol();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/ScopeType.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/ScopeType.java b/api/src/com/cloud/storage/ScopeType.java
index c9786d8..e20f525 100644
--- a/api/src/com/cloud/storage/ScopeType.java
+++ b/api/src/com/cloud/storage/ScopeType.java
@@ -19,9 +19,5 @@
package com.cloud.storage;
public enum ScopeType {
- HOST,
- CLUSTER,
- ZONE,
- REGION,
- GLOBAL;
+ HOST, CLUSTER, ZONE, REGION, GLOBAL;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/Snapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java
index 27a2fe4..f175ac0 100644
--- a/api/src/com/cloud/storage/Snapshot.java
+++ b/api/src/com/cloud/storage/Snapshot.java
@@ -27,13 +27,7 @@ import com.cloud.utils.fsm.StateObject;
public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, StateObject<Snapshot.State> {
public enum Type {
- MANUAL,
- RECURRING,
- TEMPLATE,
- HOURLY,
- DAILY,
- WEEKLY,
- MONTHLY;
+ MANUAL, RECURRING, TEMPLATE, HOURLY, DAILY, WEEKLY, MONTHLY;
private int max = 8;
public void setMax(int max) {
@@ -55,14 +49,8 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
}
public enum State {
- Allocated,
- Creating,
- CreatedOnPrimary,
- BackingUp,
- BackedUp,
- Copying,
- Destroying,
- Destroyed,//it's a state, user can't see the snapshot from ui, while the snapshot may still exist on the storage
+ Allocated, Creating, CreatedOnPrimary, BackingUp, BackedUp, Copying, Destroying, Destroyed,
+ //it's a state, user can't see the snapshot from ui, while the snapshot may still exist on the storage
Error;
public String toString() {
@@ -75,14 +63,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
}
enum Event {
- CreateRequested,
- OperationNotPerformed,
- BackupToSecondary,
- BackedupToSecondary,
- DestroyRequested,
- CopyingRequested,
- OperationSucceeded,
- OperationFailed
+ CreateRequested, OperationNotPerformed, BackupToSecondary, BackedupToSecondary, DestroyRequested, CopyingRequested, OperationSucceeded, OperationFailed
}
public static final long MANUAL_POLICY_ID = 0L;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/Storage.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
index 07b6667..f0e9931 100755
--- a/api/src/com/cloud/storage/Storage.java
+++ b/api/src/com/cloud/storage/Storage.java
@@ -21,14 +21,11 @@ import java.util.List;
public class Storage {
public static enum ImageFormat {
- QCOW2(true, true, false, "qcow2"),
- RAW(false, false, false, "raw"),
- VHD(true, true, true, "vhd"),
- ISO(false, false, false, "iso"),
- OVA(true, true, true, "ova"),
- VHDX(true, true, true, "vhdx"),
- BAREMETAL(false, false, false, "BAREMETAL"),
- TAR(false, false, false, "tar");
+ QCOW2(true, true, false, "qcow2"), RAW(false, false, false, "raw"), VHD(true, true, true, "vhd"), ISO(false, false, false, "iso"), OVA(true, true, true, "ova"), VHDX(
+ true,
+ true,
+ true,
+ "vhdx"), BAREMETAL(false, false, false, "BAREMETAL"), TAR(false, false, false, "tar");
private final boolean thinProvisioned;
private final boolean supportSparse;
@@ -67,22 +64,11 @@ public class Storage {
return fileExtension;
}
-
+
}
public static enum FileSystem {
- Unknown,
- ext3,
- ntfs,
- fat,
- fat32,
- ext2,
- ext4,
- cdfs,
- hpfs,
- ufs,
- hfs,
- hfsp
+ Unknown, ext3, ntfs, fat, fat32, ext2, ext4, cdfs, hpfs, ufs, hfs, hfsp
}
public static enum TemplateType {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/StoragePool.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/com/cloud/storage/StoragePool.java
index 6e9af12..6ede960 100644
--- a/api/src/com/cloud/storage/StoragePool.java
+++ b/api/src/com/cloud/storage/StoragePool.java
@@ -98,10 +98,10 @@ public interface StoragePool extends Identity, InternalIdentity {
Long getPodId();
- /**
- * @return
- */
- String getStorageProviderName();
-
- boolean isInMaintenance();
+ /**
+ * @return
+ */
+ String getStorageProviderName();
+
+ boolean isInMaintenance();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/StoragePoolStatus.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePoolStatus.java b/api/src/com/cloud/storage/StoragePoolStatus.java
index a35f706..c7ff0ff 100644
--- a/api/src/com/cloud/storage/StoragePoolStatus.java
+++ b/api/src/com/cloud/storage/StoragePoolStatus.java
@@ -17,6 +17,5 @@
package com.cloud.storage;
public enum StoragePoolStatus {
- Initial, Initialized, Creating, Attaching, Up, PrepareForMaintenance,
- ErrorInMaintenance, CancelMaintenance, Maintenance, Removed;
+ Initial, Initialized, Creating, Attaching, Up, PrepareForMaintenance, ErrorInMaintenance, CancelMaintenance, Maintenance, Removed;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/StorageService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java
index cbbc1f3..ac3c385 100644
--- a/api/src/com/cloud/storage/StorageService.java
+++ b/api/src/com/cloud/storage/StorageService.java
@@ -33,7 +33,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
-public interface StorageService{
+public interface StorageService {
/**
* Create StoragePool based on uri
*
@@ -47,8 +47,7 @@ public interface StorageService{
* @throws ResourceUnavailableException
* TODO
*/
- StoragePool createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException,
- UnknownHostException, ResourceUnavailableException;
+ StoragePool createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException, UnknownHostException, ResourceUnavailableException;
ImageStore createSecondaryStagingStore(CreateSecondaryStagingStoreCmd cmd);
@@ -72,8 +71,7 @@ public interface StorageService{
* @throws InsufficientCapacityException
* TODO
*/
- public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException,
- InsufficientCapacityException;
+ public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException, InsufficientCapacityException;
/**
* Complete maintenance for primary storage
@@ -84,8 +82,7 @@ public interface StorageService{
* @throws ResourceUnavailableException
* TODO
*/
- public StoragePool cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd)
- throws ResourceUnavailableException;
+ public StoragePool cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd) throws ResourceUnavailableException;
public StoragePool updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
@@ -108,7 +105,6 @@ public interface StorageService{
* @throws InsufficientCapacityException
* TODO
*/
- public ImageStore prepareSecondaryStorageForObjectStoreMigration(Long storeId) throws ResourceUnavailableException,
- InsufficientCapacityException;
+ public ImageStore prepareSecondaryStorageForObjectStoreMigration(Long storeId) throws ResourceUnavailableException, InsufficientCapacityException;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/StorageStats.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StorageStats.java b/api/src/com/cloud/storage/StorageStats.java
index c30e1de..a474b23 100755
--- a/api/src/com/cloud/storage/StorageStats.java
+++ b/api/src/com/cloud/storage/StorageStats.java
@@ -21,6 +21,7 @@ public interface StorageStats {
* @return bytes used by the storage server already.
*/
public long getByteUsed();
+
/**
* @return bytes capacity of the storage server
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/Upload.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Upload.java b/api/src/com/cloud/storage/Upload.java
index 69e1041..59d203a 100755
--- a/api/src/com/cloud/storage/Upload.java
+++ b/api/src/com/cloud/storage/Upload.java
@@ -24,7 +24,19 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface Upload extends InternalIdentity, Identity {
public static enum Status {
- UNKNOWN, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS, NOT_COPIED, COPY_IN_PROGRESS, COPY_ERROR, COPY_COMPLETE, DOWNLOAD_URL_CREATED, DOWNLOAD_URL_NOT_CREATED, ERROR
+ UNKNOWN,
+ ABANDONED,
+ UPLOADED,
+ NOT_UPLOADED,
+ UPLOAD_ERROR,
+ UPLOAD_IN_PROGRESS,
+ NOT_COPIED,
+ COPY_IN_PROGRESS,
+ COPY_ERROR,
+ COPY_COMPLETE,
+ DOWNLOAD_URL_CREATED,
+ DOWNLOAD_URL_NOT_CREATED,
+ ERROR
}
public static enum Type {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/Volume.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index dd59f12..5344b36 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -40,9 +40,9 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
Resizing("The volume is being resized"),
Expunging("The volume is being expunging"),
Expunged("The volume is being expunging"),
- Destroy("The volume is destroyed, and can't be recovered."),
- Destroying("The volume is destroying, and can't be recovered."),
- UploadOp ("The volume upload operation is in progress or in short the volume is on secondary storage"),
+ Destroy("The volume is destroyed, and can't be recovered."),
+ Destroying("The volume is destroying, and can't be recovered."),
+ UploadOp("The volume upload operation is in progress or in short the volume is on secondary storage"),
Uploading("volume is uploading"),
Copying("volume is copying from image store to primary, in case it's an uploaded volume"),
Uploaded("volume is uploaded");
@@ -69,12 +69,12 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
s_fsm.addTransition(Creating, Event.OperationFailed, Allocated);
s_fsm.addTransition(Creating, Event.OperationSucceeded, Ready);
s_fsm.addTransition(Creating, Event.DestroyRequested, Destroy);
- s_fsm.addTransition(Creating, Event.CreateRequested, Creating);
+ s_fsm.addTransition(Creating, Event.CreateRequested, Creating);
s_fsm.addTransition(Ready, Event.ResizeRequested, Resizing);
s_fsm.addTransition(Resizing, Event.OperationSucceeded, Ready);
- s_fsm.addTransition(Resizing, Event.OperationFailed, Ready);
+ s_fsm.addTransition(Resizing, Event.OperationFailed, Ready);
s_fsm.addTransition(Allocated, Event.UploadRequested, UploadOp);
- s_fsm.addTransition(Uploaded, Event.CopyRequested, Copying);
+ s_fsm.addTransition(Uploaded, Event.CopyRequested, Copying);
s_fsm.addTransition(Copying, Event.OperationSucceeded, Ready);
s_fsm.addTransition(Copying, Event.OperationFailed, Uploaded);
s_fsm.addTransition(UploadOp, Event.DestroyRequested, Destroy);
@@ -174,17 +174,19 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
public Date getUpdated();
- /**
- * @return
- */
- String getReservationId();
-
- /**
- * @param reserv
- */
- void setReservationId(String reserv);
- Storage.ImageFormat getFormat();
- Long getVmSnapshotChainSize();
+ /**
+ * @return
+ */
+ String getReservationId();
+
+ /**
+ * @param reserv
+ */
+ void setReservationId(String reserv);
+
+ Storage.ImageFormat getFormat();
+
+ Long getVmSnapshotChainSize();
void setHypervisorSnapshotReserve(Integer hypervisorSnapshotReserve);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/storage/VolumeApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/com/cloud/storage/VolumeApiService.java
index 2865628..8274b15 100644
--- a/api/src/com/cloud/storage/VolumeApiService.java
+++ b/api/src/com/cloud/storage/VolumeApiService.java
@@ -51,7 +51,6 @@ public interface VolumeApiService {
*/
Volume createVolume(CreateVolumeCmd cmd);
-
/**
* Resizes the volume based on the given criteria
*
@@ -71,7 +70,7 @@ public interface VolumeApiService {
*
* @return Volume object
*/
- Volume uploadVolume(UploadVolumeCmd cmd) throws ResourceAllocationException;
+ Volume uploadVolume(UploadVolumeCmd cmd) throws ResourceAllocationException;
boolean deleteVolume(long volumeId, Account caller) throws ConcurrentOperationException;
@@ -79,11 +78,10 @@ public interface VolumeApiService {
Volume detachVolumeFromVM(DetachVolumeCmd cmmd);
- Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account, boolean quiescevm)
- throws ResourceAllocationException;
+ Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account, boolean quiescevm) throws ResourceAllocationException;
+
+ Snapshot allocSnapshot(Long volumeId, Long policyId) throws ResourceAllocationException;
- Snapshot allocSnapshot(Long volumeId, Long policyId)
- throws ResourceAllocationException;
Volume updateVolume(long volumeId, String path, String state, Long storageId, Boolean displayVolume);
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/template/TemplateApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/template/TemplateApiService.java b/api/src/com/cloud/template/TemplateApiService.java
index 7387661..9a2e215 100755
--- a/api/src/com/cloud/template/TemplateApiService.java
+++ b/api/src/com/cloud/template/TemplateApiService.java
@@ -91,11 +91,9 @@ public interface TemplateApiService {
boolean updateTemplateOrIsoPermissions(BaseUpdateTemplateOrIsoPermissionsCmd cmd);
- VirtualMachineTemplate createPrivateTemplateRecord(CreateTemplateCmd cmd,
- Account templateOwner) throws ResourceAllocationException;
+ VirtualMachineTemplate createPrivateTemplateRecord(CreateTemplateCmd cmd, Account templateOwner) throws ResourceAllocationException;
- VirtualMachineTemplate createPrivateTemplate(CreateTemplateCmd command)
- throws CloudRuntimeException;
+ VirtualMachineTemplate createPrivateTemplate(CreateTemplateCmd command) throws CloudRuntimeException;
VirtualMachineTemplate updateTemplate(UpdateIsoCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/template/VirtualMachineTemplate.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/com/cloud/template/VirtualMachineTemplate.java
index d13146c..9118bb2 100755
--- a/api/src/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/com/cloud/template/VirtualMachineTemplate.java
@@ -29,8 +29,7 @@ import com.cloud.storage.Storage.TemplateType;
public interface VirtualMachineTemplate extends ControlledEntity, Identity, InternalIdentity {
enum State {
- Active,
- Inactive;
+ Active, Inactive;
}
public static enum BootloaderType {
@@ -97,6 +96,7 @@ public interface VirtualMachineTemplate extends ControlledEntity, Identity, Inte
Long getSourceTemplateId();
String getTemplateTag();
+
Map getDetails();
Boolean isDynamicallyScalable();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/user/Account.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/Account.java b/api/src/com/cloud/user/Account.java
index 940a0eb..9b46eae 100755
--- a/api/src/com/cloud/user/Account.java
+++ b/api/src/com/cloud/user/Account.java
@@ -22,23 +22,15 @@ import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
-
public interface Account extends ControlledEntity, InternalIdentity, Identity {
public enum Type {
- Normal,
- Admin,
- DomainAdmin,
- CustomerCare,
- Project
+ Normal, Admin, DomainAdmin, CustomerCare, Project
}
public enum State {
- disabled,
- enabled,
- locked
+ disabled, enabled, locked
}
-
public static final short ACCOUNT_TYPE_NORMAL = 0;
public static final short ACCOUNT_TYPE_ADMIN = 1;
public static final short ACCOUNT_TYPE_DOMAIN_ADMIN = 2;
@@ -63,9 +55,9 @@ public interface Account extends ControlledEntity, InternalIdentity, Identity {
public String getNetworkDomain();
public Long getDefaultZoneId();
-
+
public String getUuid();
-
+
boolean isDefault();
-
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/user/AccountService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index 8153a3f..ddd27fd 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -54,8 +54,8 @@ public interface AccountService {
*
* @return the user if created successfully, null otherwise
*/
- UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType, Long domainId, String networkDomain,
- Map<String, String> details, String accountUUID, String userUUID);
+ UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType,
+ Long domainId, String networkDomain, Map<String, String> details, String accountUUID, String userUUID);
/**
* Locks a user by userId. A locked user cannot access the API, but will still have running VMs/IP addresses
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/user/DomainService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/com/cloud/user/DomainService.java
index f10728f..18588bd 100644
--- a/api/src/com/cloud/user/DomainService.java
+++ b/api/src/com/cloud/user/DomainService.java
@@ -35,7 +35,6 @@ public interface DomainService {
Domain getDomainByName(String name, long parentId);
-
/**
* Return whether a domain is a child domain of a given domain.
*
@@ -44,11 +43,9 @@ public interface DomainService {
*/
boolean isChildDomain(Long parentId, Long childId);
- Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd)
- throws PermissionDeniedException;
+ Pair<List<? extends Domain>, Integer> searchForDomains(ListDomainsCmd cmd) throws PermissionDeniedException;
- Pair<List<? extends Domain>, Integer> searchForDomainChildren(ListDomainChildrenCmd cmd)
- throws PermissionDeniedException;
+ Pair<List<? extends Domain>, Integer> searchForDomainChildren(ListDomainChildrenCmd cmd) throws PermissionDeniedException;
/**
* find the domain by its path
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/user/User.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java
index dcf27a0..48f936c 100644
--- a/api/src/com/cloud/user/User.java
+++ b/api/src/com/cloud/user/User.java
@@ -72,7 +72,7 @@ public interface User extends OwnedBy, InternalIdentity {
String getRegistrationToken();
boolean isRegistered();
-
+
boolean isDefault();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/BareMetalVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/BareMetalVmService.java b/api/src/com/cloud/vm/BareMetalVmService.java
index 9d39b9c..5b5c5b9 100755
--- a/api/src/com/cloud/vm/BareMetalVmService.java
+++ b/api/src/com/cloud/vm/BareMetalVmService.java
@@ -16,6 +16,5 @@
// under the License.
package com.cloud.vm;
-
public interface BareMetalVmService extends UserVmService {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/ConsoleProxy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/ConsoleProxy.java b/api/src/com/cloud/vm/ConsoleProxy.java
index 1d4fcb1..cea4d41 100644
--- a/api/src/com/cloud/vm/ConsoleProxy.java
+++ b/api/src/com/cloud/vm/ConsoleProxy.java
@@ -22,6 +22,6 @@ package com.cloud.vm;
*/
public interface ConsoleProxy extends SystemVm {
public int getActiveSession();
+
public byte[] getSessionDetails();
}
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/DiskProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java
index 3d4c9e7..f72142c 100644
--- a/api/src/com/cloud/vm/DiskProfile.java
+++ b/api/src/com/cloud/vm/DiskProfile.java
@@ -58,12 +58,20 @@ public class DiskProfile {
}
public DiskProfile(Volume vol, DiskOffering offering, HypervisorType hyperType) {
- this(vol.getId(), vol.getVolumeType(), vol.getName(), offering.getId(), vol.getSize(), offering.getTagsArray(), offering.getUseLocalStorage(), offering.isCustomized(), null);
+ this(vol.getId(),
+ vol.getVolumeType(),
+ vol.getName(),
+ offering.getId(),
+ vol.getSize(),
+ offering.getTagsArray(),
+ offering.getUseLocalStorage(),
+ offering.isCustomized(),
+ null);
this.hyperType = hyperType;
}
-
+
public DiskProfile(DiskProfile dp) {
-
+
}
/**
@@ -146,17 +154,17 @@ public class DiskProfile {
public HypervisorType getHypervisorType() {
return this.hyperType;
}
-
+
public void setPath(String path) {
- this.path = path;
+ this.path = path;
}
-
+
public String getPath() {
- return this.path;
+ return this.path;
}
-
+
public void setSize(long size) {
- this.size = size;
+ this.size = size;
}
public void setBytesReadRate(Long bytesReadRate) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/Nic.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/Nic.java b/api/src/com/cloud/vm/Nic.java
index b2f6976..0517219 100644
--- a/api/src/com/cloud/vm/Nic.java
+++ b/api/src/com/cloud/vm/Nic.java
@@ -38,9 +38,8 @@ public interface Nic extends Identity, InternalIdentity {
}
public enum State implements FiniteState<State, Event> {
- Allocated("Resource is allocated but not reserved"), Reserving("Resource is being reserved right now"),
- Reserved("Resource has been reserved."), Releasing("Resource is being released"), Deallocating(
- "Resource is being deallocated");
+ Allocated("Resource is allocated but not reserved"), Reserving("Resource is being reserved right now"), Reserved("Resource has been reserved."), Releasing(
+ "Resource is being released"), Deallocating("Resource is being deallocated");
String _description;
@@ -146,10 +145,11 @@ public interface Nic extends Identity, InternalIdentity {
AddressFormat getAddressFormat();
- String getIp6Gateway();
+ String getIp6Gateway();
- String getIp6Cidr();
+ String getIp6Cidr();
+
+ String getIp6Address();
- String getIp6Address();
boolean getSecondaryIp();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/NicIpAlias.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java
index 11e127c..c212226 100644
--- a/api/src/com/cloud/vm/NicIpAlias.java
+++ b/api/src/com/cloud/vm/NicIpAlias.java
@@ -23,23 +23,30 @@ import org.apache.cloudstack.api.InternalIdentity;
/** Each entry represents the alis ip of a perticular nic.
*
*/
-public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity{
+public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity {
/**
* @return id in the CloudStack database
*/
- enum state {
- active,
- revoked,
+ enum state {
+ active, revoked,
}
+
long getId();
+
long getNicId();
+
String getIp4Address();
+
String getIp6Address();
+
long getNetworkId();
+
long getVmId();
+
Long getAliasCount();
+
String getNetmask();
- String getGateway();
+ String getGateway();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/NicProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/com/cloud/vm/NicProfile.java
index 5970ccd..30d9b1d 100644
--- a/api/src/com/cloud/vm/NicProfile.java
+++ b/api/src/com/cloud/vm/NicProfile.java
@@ -214,8 +214,7 @@ public class NicProfile implements InternalIdentity {
return strategy;
}
- public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate,
- boolean isSecurityGroupEnabled, String name) {
+ public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate, boolean isSecurityGroupEnabled, String name) {
this.id = nic.getId();
this.networkId = network.getId();
this.gateway = nic.getGateway();
@@ -306,48 +305,56 @@ public class NicProfile implements InternalIdentity {
@Override
public String toString() {
- return new StringBuilder("NicProfile[").append(id).append("-").append(vmId).append("-").
- append(reservationId).append("-").append(ip4Address).append("-").append(broadcastUri).toString();
+ return new StringBuilder("NicProfile[").append(id)
+ .append("-")
+ .append(vmId)
+ .append("-")
+ .append(reservationId)
+ .append("-")
+ .append(ip4Address)
+ .append("-")
+ .append(broadcastUri)
+ .toString();
}
- public String getIp6Gateway() {
- return ip6Gateway;
- }
+ public String getIp6Gateway() {
+ return ip6Gateway;
+ }
- public void setIp6Gateway(String ip6Gateway) {
- this.ip6Gateway = ip6Gateway;
- }
+ public void setIp6Gateway(String ip6Gateway) {
+ this.ip6Gateway = ip6Gateway;
+ }
- public String getIp6Cidr() {
- return ip6Cidr;
- }
+ public String getIp6Cidr() {
+ return ip6Cidr;
+ }
- public void setIp6Cidr(String ip6Cidr) {
- this.ip6Cidr = ip6Cidr;
- }
+ public void setIp6Cidr(String ip6Cidr) {
+ this.ip6Cidr = ip6Cidr;
+ }
- public String getRequestedIpv6() {
- return requestedIpv6;
- }
+ public String getRequestedIpv6() {
+ return requestedIpv6;
+ }
- public void setRequestedIpv6(String requestedIpv6) {
- this.requestedIpv6 = requestedIpv6;
- }
+ public void setRequestedIpv6(String requestedIpv6) {
+ this.requestedIpv6 = requestedIpv6;
+ }
- public String getIp6Dns1() {
- return ip6Dns1;
- }
+ public String getIp6Dns1() {
+ return ip6Dns1;
+ }
- public void setIp6Dns1(String ip6Dns1) {
- this.ip6Dns1 = ip6Dns1;
- }
+ public void setIp6Dns1(String ip6Dns1) {
+ this.ip6Dns1 = ip6Dns1;
+ }
- public String getIp6Dns2() {
- return ip6Dns2;
- }
+ public String getIp6Dns2() {
+ return ip6Dns2;
+ }
- public void setIp6Dns2(String ip6Dns2) {
- this.ip6Dns2 = ip6Dns2;
- }
+ public void setIp6Dns2(String ip6Dns2) {
+ this.ip6Dns2 = ip6Dns2;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/NicSecondaryIp.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/com/cloud/vm/NicSecondaryIp.java
index 655d172..02937f4 100644
--- a/api/src/com/cloud/vm/NicSecondaryIp.java
+++ b/api/src/com/cloud/vm/NicSecondaryIp.java
@@ -20,17 +20,20 @@ import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
-
/**
* Nic represents one nic on the VM.
*/
-public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIdentity {
+public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIdentity {
/**
* @return id in the CloudStack database
*/
long getId();
+
long getNicId();
+
String getIp4Address();
+
long getNetworkId();
+
long getVmId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/SecondaryStorageVm.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/SecondaryStorageVm.java b/api/src/com/cloud/vm/SecondaryStorageVm.java
index 9acff14..fe94186 100644
--- a/api/src/com/cloud/vm/SecondaryStorageVm.java
+++ b/api/src/com/cloud/vm/SecondaryStorageVm.java
@@ -21,6 +21,7 @@ package com.cloud.vm;
* to interface the management server to secondary storage
*/
public interface SecondaryStorageVm extends SystemVm {
- enum Role { templateProcessor, commandExecutor }
+ enum Role {
+ templateProcessor, commandExecutor
+ }
}
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/SystemVm.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/SystemVm.java b/api/src/com/cloud/vm/SystemVm.java
index a697d08..c3aa726 100644
--- a/api/src/com/cloud/vm/SystemVm.java
+++ b/api/src/com/cloud/vm/SystemVm.java
@@ -20,7 +20,10 @@ import java.util.Date;
public interface SystemVm extends VirtualMachine {
public String getPublicIpAddress();
+
public String getPublicNetmask();
+
public String getPublicMacAddress();
+
public Date getLastUpdateTime();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index 6fc8b54..7f4fb3c 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -101,8 +101,8 @@ public interface UserVmService {
*/
UserVm resetVMSSHKey(ResetVMSSHKeyCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException;
- UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException,
- ResourceAllocationException;
+ UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException,
+ InsufficientCapacityException, ResourceAllocationException;
UserVm rebootVirtualMachine(RebootVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException;
@@ -131,7 +131,6 @@ public interface UserVmService {
UserVm recoverVirtualMachine(RecoverVMCmd cmd) throws ResourceAllocationException;
-
/**
* Creates a Basic Zone User VM in the database and returns the VM to the
* caller.
@@ -203,11 +202,11 @@ public interface UserVmService {
* available.
* @throws InsufficientResourcesException
*/
- UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account owner, String hostName,
- String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
- HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
- IpAddresses defaultIp, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize)
- throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account owner,
+ String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
+ String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed,
+ Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
+ StorageUnavailableException, ResourceAllocationException;
/**
* Creates a User VM in Advanced Zone (Security Group feature is enabled) in
@@ -282,10 +281,11 @@ public interface UserVmService {
* available.
* @throws InsufficientResourcesException
*/
- UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList, List<Long> securityGroupIdList,
- Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, String sshKeyPair,
- Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize)
- throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList,
+ List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
+ HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
+ List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException,
+ ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Creates a User VM in Advanced Zone (Security Group feature is disabled)
@@ -357,12 +357,12 @@ public interface UserVmService {
* available.
* @throws InsufficientResourcesException
*/
- UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList, Account owner, String hostName,
- String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
- HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps,
- IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdkisksize)
+ UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList, Account owner,
+ String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
+ String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed,
+ Integer memory, Integer cpuNumber, Long rootdkisksize)
- throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Starts the virtual machine created from createVirtualMachine.
@@ -405,11 +405,10 @@ public interface UserVmService {
void deletePrivateTemplateRecord(Long templateId);
-
HypervisorType getHypervisorTypeOfUserVM(long vmid);
UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException,
- ResourceAllocationException;
+ ResourceAllocationException;
UserVm getUserVm(long vmId);
@@ -436,7 +435,8 @@ public interface UserVmService {
* @throws VirtualMachineMigrationException
* if the VM to be migrated is not in Running state
*/
- VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
+ VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
+ VirtualMachineMigrationException;
/**
* Migrate the given VM with its volumes to the destination host. The API returns the migrated VM if it succeeds.
@@ -461,9 +461,8 @@ public interface UserVmService {
* @throws VirtualMachineMigrationException
* if the VM to be migrated is not in Running state
*/
- VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map<String, String> volumeToPool)
- throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
- VirtualMachineMigrationException;
+ VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map<String, String> volumeToPool) throws ResourceUnavailableException,
+ ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;