You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/04 11:02:57 UTC
[38/55] [abbrv] api_refactor: refactor project apis
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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/5e0501d1/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 d799b0b..43daa14 100644
--- a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
+++ b/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
@@ -27,8 +27,8 @@ public interface RemoteAccessVPNServiceProvider extends NetworkElement {
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;
-
+
IpDeployer getIpDeployer(Network network);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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/5e0501d1/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/5e0501d1/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..bb35313 100644
--- a/api/src/com/cloud/network/firewall/FirewallService.java
+++ b/api/src/com/cloud/network/firewall/FirewallService.java
@@ -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/5e0501d1/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..2c84a20 100644
--- a/api/src/com/cloud/network/firewall/NetworkACLService.java
+++ b/api/src/com/cloud/network/firewall/NetworkACLService.java
@@ -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);
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/guru/NetworkGuru.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/guru/NetworkGuru.java b/api/src/com/cloud/network/guru/NetworkGuru.java
index 9b8c04b..4a9b871 100755
--- a/api/src/com/cloud/network/guru/NetworkGuru.java
+++ b/api/src/com/cloud/network/guru/NetworkGuru.java
@@ -35,7 +35,7 @@ import com.cloud.vm.VirtualMachineProfile;
/**
* - Designs a virtual network depending on the network offering.
* - Implements the virtual network when a virtual machine requires the network to be started.
- *
+ *
* There can be multiple NetworkGurus in a CloudStack system. Each NetworkGuru
* resources when VMs are gone.
*
@@ -44,28 +44,28 @@ import com.cloud.vm.VirtualMachineProfile;
* This means the NetworkGuru checks the parameters such as cidr, gateway,
* vlan, etc and returns a network that can work with those paremeters.
* Note that at this point the network is only a virtual network. It has
- * not been substantiated with resources, such as vlan, to make the network
+ * not been substantiated with resources, such as vlan, to make the network
* functional in the physical environment. At this stage, the network is in
- * Allocated state.
- *
- * - When the first virtual machine is about to be started and requires network
+ * Allocated state.
+ *
+ * - When the first virtual machine is about to be started and requires network
* services, the guest network needs to have resources to make it usable
* within the physical environment. At this time, the NetworkGuru is
* called with the implement() method to acquire those resources.
- *
+ *
* - For every virtual machine starting in the network, the NetworkGuru is
* asked via the reserve() method to make sure everything the virtual
* machine needs to be functional in the network is reserved.
- *
+ *
* - For every virtual machine being stopped in the network, the NetworkGuru
* is informed via the release() method to make sure resources occupied
* by the virtual machine is released.
- *
+ *
* - If all virtual machines within the network have been stopped, the guest
* network is garbage collected. When a guest network is garbage collected
* the NetworkGuru is informed via the shutdown() method to release any
* resources it allocated to that network.
- *
+ *
* - When a guest network is being deleted, the NetworkGuru is informed via
* the trash() method.
*
@@ -74,18 +74,18 @@ public interface NetworkGuru extends Adapter {
/**
* Cloud stack requires the NetworkGuru to design a guest network given
* the software packages Once a NetworkGuru returns the designed network,
- * that NetworkGuru is forever associated with the guest network. It is
+ * that NetworkGuru is forever associated with the guest network. It is
* very important for the NetworkGuru implementation to be very specific
* about the network it is responsible for designing. Things that can
* be used to make determination can be isolation methods, services
* provided on the guest network and the service provider that's on the
* guest network.
- *
+ *
* If a network is already fully substantiated with the necessary resources
- * during this design phase, then the state should be set to Setup. If
+ * during this design phase, then the state should be set to Setup. If
* the resources are not allocated at this point, the state should be set
- * to Allocated.
- *
+ * to Allocated.
+ *
* @param offering network offering that contains the package of services
* the end user intends to use on that network.
* @param plan where is this network being deployed.
@@ -99,29 +99,29 @@ public interface NetworkGuru extends Adapter {
* For guest networks that are in Allocated state after the design stage,
* resources are allocated when the guest network is actually being used
* by a virtual machine. implement() is called to acquire those resources.
- *
+ *
* @param network network to be implemented.
* @param offering network offering that the network was created with.
* @param destination where the network is being deployed in.
* @return a fully implemented Network.
- * @throws InsufficientVirtualNetworkCapcityException if there's not
+ * @throws InsufficientVirtualNetworkCapcityException if there's not
* enough resources to make the guest network usable in the physical
- * environment. At this time, the admin generally must be involved to
+ * environment. At this time, the admin generally must be involved to
* allocate more resources before any more guest network can be implemented.
*/
Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context) throws InsufficientVirtualNetworkCapcityException;
/**
- * Once a guest network has been designed, virtual machines can be
- * created. allocated() is called for the NetworkGuru to design a nic
- * that will make the virtual machine work within the guest network.
- *
+ * Once a guest network has been designed, virtual machines can be
+ * created. allocated() is called for the NetworkGuru to design a nic
+ * that will make the virtual machine work within the guest network.
+ *
* @param network guest network that the virtual machine will be deployed in.
- * @param nic nic information that the end user wants to set. The
+ * @param nic nic information that the end user wants to set. The
* NetworkGuru should check this information with the guest
* network settings to make sure everything will work.
* @param vm virtual machine that is about to be deployed.
- * @return NicProfile nic with all of the information
+ * @return NicProfile nic with all of the information
* @throws InsufficientVirtualNetworkCapcityException if there's
* insufficient capacity within the guest network.
* @throws InsufficientAddressCapacityException if there are not addresses
@@ -134,7 +134,7 @@ public interface NetworkGuru extends Adapter {
* be allocated its resources in order for it to participate within the
* guest network. reserve() is called for the NetworkGuru to make sure
* that works.
- *
+ *
* @param nic nic that the vm is using to access the guest network.
* @param network guest network the vm is in.
* @param vm vm
@@ -145,14 +145,14 @@ public interface NetworkGuru extends Adapter {
* @throws InsufficientAddressCapacityException if there's not enough ip
* addresses.
* @throws ConcurrentOperationException if there are multiple operations
- * happening on this guest network or vm.
+ * happening on this guest network or vm.
*/
void reserve(NicProfile nic, Network network, VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException;
/**
* When a virtual machine is stopped, the NetworkGuru is informed via the
- * release() method to release any resources.
- *
+ * release() method to release any resources.
+ *
* @param nic nic that the vm is using to access the guest network.
* @param vm virtual machine
* @param reservationId reservation id passed to it in the ReservationContext
@@ -164,7 +164,7 @@ public interface NetworkGuru extends Adapter {
* When a virtual machine is destroyed, the NetworkGuru is informed via
* the deallocate() method to make sure any resources that are allocated
* are released.
- *
+ *
* @param network guest network that the vm was running in.
* @param nic nic that the vm was using to access the guest network.
* @param vm virtual machine being destroyed.
@@ -181,19 +181,19 @@ public interface NetworkGuru extends Adapter {
void updateNicProfile(NicProfile profile, Network network);
/**
- * When no virtual machines are running in the network, the network is
+ * When no virtual machines are running in the network, the network is
* shutdown and all physical resources are released. The NetworkGuru is
* informed via the shutdown method().
- *
+ *
* @param network guest network being shut down
* @param offering network offering the guest network was created with.
*/
void shutdown(NetworkProfile network, NetworkOffering offering);
/**
- * When a guest network is destroyed, the NetworkGuru is informed via the
+ * When a guest network is destroyed, the NetworkGuru is informed via the
* trash() method to recover any resources.
- *
+ *
* @param network guest network being destroyed.
* @param offering network offering the guest network was created with.
* @param owner owner of the network.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/lb/LoadBalancingRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRule.java b/api/src/com/cloud/network/lb/LoadBalancingRule.java
index 186ea56..fb1d988 100644
--- a/api/src/com/cloud/network/lb/LoadBalancingRule.java
+++ b/api/src/com/cloud/network/lb/LoadBalancingRule.java
@@ -230,7 +230,7 @@ public class LoadBalancingRule implements FirewallRule, LoadBalancer {
return null;
}
-
+
@Override
public TrafficType getTrafficType() {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
index 0cf2ef9..c5e6b5c 100644
--- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
+++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
@@ -36,7 +36,7 @@ import com.cloud.utils.Pair;
public interface LoadBalancingRulesService {
/**
* Create a load balancer rule from the given ipAddress/port to the given private port
- *
+ *
* @param openFirewall
* TODO
* @param cmd
@@ -53,7 +53,7 @@ public interface LoadBalancingRulesService {
/**
* Create a stickiness policy to a load balancer from the given stickiness method name and parameters in
* (name,value) pairs.
- *
+ *
* @param cmd
* the command specifying the stickiness method name, params (name,value pairs), policy name and
* description.
@@ -63,7 +63,7 @@ public interface LoadBalancingRulesService {
public StickinessPolicy createLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws NetworkRuleConflictException;
public boolean applyLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws ResourceUnavailableException;
-
+
boolean deleteLBStickinessPolicy(long stickinessPolicyId, boolean apply);
/**
* Assign a virtual machine, or list of virtual machines, to a load balancer.
@@ -77,7 +77,7 @@ public interface LoadBalancingRulesService {
/**
* List instances that have either been applied to a load balancer or are eligible to be assigned to a load
* balancer.
- *
+ *
* @param cmd
* @return list of vm instances that have been or can be applied to a load balancer
*/
@@ -85,7 +85,7 @@ public interface LoadBalancingRulesService {
/**
* List load balancer rules based on the given criteria
- *
+ *
* @param cmd
* the command that specifies the criteria to use for listing load balancers. Load balancers can be
* listed
@@ -96,7 +96,7 @@ public interface LoadBalancingRulesService {
/**
* List stickiness policies based on the given criteria
- *
+ *
* @param cmd
* the command specifies the load balancing rule id.
* @return list of stickiness policies that match the criteria.
@@ -107,4 +107,4 @@ public interface LoadBalancingRulesService {
LoadBalancer findById(long LoadBalancer);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/rules/FirewallRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/com/cloud/network/rules/FirewallRule.java
index f2a83af..148b482 100644
--- a/api/src/com/cloud/network/rules/FirewallRule.java
+++ b/api/src/com/cloud/network/rules/FirewallRule.java
@@ -29,39 +29,39 @@ public interface FirewallRule extends ControlledEntity {
StaticNat,
NetworkACL,
}
-
+
enum FirewallRuleType {
System, // The pre-defined rules created by admin, in the system wide
User; // the rules created by user, to a specific ip
}
-
+
enum State {
Staged, // Rule been created but has never got through network rule conflict detection. Rules in this state can not be sent to network elements.
Add, // Add means the rule has been created and has gone through network rule conflict detection.
Active, // Rule has been sent to the network elements and reported to be active.
Revoke // Revoke means this rule has been revoked. If this rule has been sent to the network elements, the rule will be deleted from database.
}
-
+
enum TrafficType {
Ingress,
Egress
}
-
+
/**
* @return database id.
*/
long getId();
-
+
/**
* @return external id.
*/
String getXid();
-
+
/**
* @return first port of the source port range.
*/
Integer getSourcePortStart();
-
+
/**
* @return last port of the source prot range. If this is null, that means only one port is mapped.
*/
@@ -71,21 +71,21 @@ public interface FirewallRule extends ControlledEntity {
* @return protocol to open these ports for.
*/
String getProtocol();
-
+
Purpose getPurpose();
-
+
State getState();
-
+
long getNetworkId();
-
+
Long getSourceIpAddressId();
Integer getIcmpCode();
Integer getIcmpType();
-
+
List<String> getSourceCidrList();
-
+
Long getRelated();
FirewallRuleType getType();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/rules/LbStickinessMethod.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/LbStickinessMethod.java b/api/src/com/cloud/network/rules/LbStickinessMethod.java
index 5f0abe8..c71b19e 100644
--- a/api/src/com/cloud/network/rules/LbStickinessMethod.java
+++ b/api/src/com/cloud/network/rules/LbStickinessMethod.java
@@ -24,14 +24,14 @@ import com.google.gson.annotations.SerializedName;
public class LbStickinessMethod {
public static class StickinessMethodType {
private String _name;
-
+
public static final StickinessMethodType LBCookieBased = new StickinessMethodType("LbCookie");
public static final StickinessMethodType AppCookieBased = new StickinessMethodType("AppCookie");
public static final StickinessMethodType SourceBased = new StickinessMethodType("SourceBased");
public StickinessMethodType(String name) {
_name = name;
}
-
+
public String getName() {
return _name;
}
@@ -40,13 +40,13 @@ public class LbStickinessMethod {
public class LbStickinessMethodParam {
@SerializedName("paramname")
private String _paramName;
-
+
@SerializedName("required")
private Boolean _required;
-
+
@SerializedName("isflag")
private Boolean _isFlag;
-
+
@SerializedName("description")
private String _description;
@@ -65,7 +65,7 @@ public class LbStickinessMethod {
public void setParamName(String paramName) {
this._paramName = paramName;
}
-
+
public Boolean getIsflag() {
return _isFlag;
}
@@ -73,7 +73,7 @@ public class LbStickinessMethod {
public void setIsflag(Boolean isFlag) {
this._isFlag = isFlag;
}
-
+
public Boolean getRequired() {
return _required;
}
@@ -94,10 +94,10 @@ public class LbStickinessMethod {
@SerializedName("methodname")
private String _methodName;
-
+
@SerializedName("paramlist")
private List<LbStickinessMethodParam> _paramList;
-
+
@SerializedName("description")
private String _description;
@@ -118,7 +118,7 @@ public class LbStickinessMethod {
public String getMethodName() {
return _methodName;
}
-
+
public List<LbStickinessMethodParam> getParamList() {
return _paramList;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/rules/PortForwardingRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/PortForwardingRule.java b/api/src/com/cloud/network/rules/PortForwardingRule.java
index 6ac6f45..c353e9b 100644
--- a/api/src/com/cloud/network/rules/PortForwardingRule.java
+++ b/api/src/com/cloud/network/rules/PortForwardingRule.java
@@ -26,26 +26,26 @@ public interface PortForwardingRule extends FirewallRule {
* @return destination ip address.
*/
Ip getDestinationIpAddress();
-
-
+
+
/**
* updates the destination ip address.
*/
void setDestinationIpAddress(Ip destinationIpAddress);
-
+
/**
* @return start of destination port.
*/
int getDestinationPortStart();
-
+
/**
* @return end of destination port range
*/
int getDestinationPortEnd();
-
+
/**
* @return destination ip address.
*/
- long getVirtualMachineId();
-
+ long getVirtualMachineId();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/rules/RulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/com/cloud/network/rules/RulesService.java
index 8eadfba..ddebcd0 100644
--- a/api/src/com/cloud/network/rules/RulesService.java
+++ b/api/src/com/cloud/network/rules/RulesService.java
@@ -31,7 +31,7 @@ public interface RulesService {
/**
* Creates a port forwarding rule between two ip addresses or between
* an ip address and a virtual machine.
- *
+ *
* @param rule
* rule to be created.
* @param vmId
@@ -46,7 +46,7 @@ public interface RulesService {
/**
* Revokes a port forwarding rule
- *
+ *
* @param ruleId
* the id of the rule to revoke.
* @param caller
@@ -56,7 +56,7 @@ public interface RulesService {
/**
* List port forwarding rules assigned to an ip address
- *
+ *
* @param cmd
* the command object holding the criteria for listing port forwarding rules (the ipAddress)
* @return list of port forwarding rules on the given address, empty list if no rules exist
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 bf29ab4..390a0db 100644
--- a/api/src/com/cloud/network/rules/StaticNat.java
+++ b/api/src/com/cloud/network/rules/StaticNat.java
@@ -18,13 +18,13 @@ package com.cloud.network.rules;
public interface StaticNat{
-
+
long getAccountId();
-
+
long getDomainId();
-
+
long getNetworkId();
-
+
long getSourceIpAddressId();
String getDestIpAddress();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 37287f0..86c2aca 100644
--- a/api/src/com/cloud/network/security/SecurityGroupRules.java
+++ b/api/src/com/cloud/network/security/SecurityGroupRules.java
@@ -39,6 +39,6 @@ public interface SecurityGroupRules {
Long getAllowedNetworkId();
String getAllowedSourceIpCidr();
-
+
SecurityRuleType getRuleType();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 4a4b171..55b6e78 100644
--- a/api/src/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/com/cloud/network/security/SecurityGroupService.java
@@ -38,7 +38,7 @@ public interface SecurityGroupService {
public SecurityGroup createSecurityGroup(CreateSecurityGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
boolean revokeSecurityGroupIngress(RevokeSecurityGroupIngressCmd cmd);
boolean revokeSecurityGroupEgress(RevokeSecurityGroupEgressCmd cmd);
-
+
boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException;
/**
@@ -49,7 +49,7 @@ public interface SecurityGroupService {
public List<? extends SecurityGroupRules> searchForSecurityGroupRules(ListSecurityGroupsCmd cmd) throws PermissionDeniedException, InvalidParameterValueException;
public List<? extends SecurityRule> authorizeSecurityGroupIngress(AuthorizeSecurityGroupIngressCmd cmd);
-
+
public List<? extends SecurityRule> authorizeSecurityGroupEgress(AuthorizeSecurityGroupEgressCmd cmd);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 401283a..faf1b56 100644
--- a/api/src/com/cloud/network/security/SecurityRule.java
+++ b/api/src/com/cloud/network/security/SecurityRule.java
@@ -23,11 +23,11 @@ public interface SecurityRule {
public static class SecurityRuleType {
public static final SecurityRuleType IngressRule = new SecurityRuleType("ingress");
public static final SecurityRuleType EgressRule = new SecurityRuleType("egress");
-
+
public SecurityRuleType(String type) {
this._type = type;
}
-
+
public String getType(){
return _type;
}
@@ -40,11 +40,11 @@ public interface SecurityRule {
int getStartPort();
int getEndPort();
-
+
String getType();
-
+
SecurityRuleType getRuleType();
-
+
String getProtocol();
AsyncInstanceCreateStatus getCreateStatus();
@@ -52,7 +52,7 @@ public interface SecurityRule {
Long getAllowedNetworkId();
String getAllowedSourceIpCidr();
-
+
String getUuid();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 992a87c..857fc22 100644
--- a/api/src/com/cloud/network/vpc/PrivateIp.java
+++ b/api/src/com/cloud/network/vpc/PrivateIp.java
@@ -42,7 +42,7 @@ public interface PrivateIp {
* @return
*/
String getMacAddress();
-
+
long getNetworkId();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/vpc/StaticRoute.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/com/cloud/network/vpc/StaticRoute.java
index 56b34cb..9a900b2 100644
--- a/api/src/com/cloud/network/vpc/StaticRoute.java
+++ b/api/src/com/cloud/network/vpc/StaticRoute.java
@@ -51,5 +51,5 @@ public interface StaticRoute extends ControlledEntity{
*/
long getId();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 73d0a84..0771aff 100644
--- a/api/src/com/cloud/network/vpc/StaticRouteProfile.java
+++ b/api/src/com/cloud/network/vpc/StaticRouteProfile.java
@@ -28,7 +28,7 @@ public class StaticRouteProfile implements StaticRoute{
String gateway;
String netmask;
String ipAddress;
-
+
public StaticRouteProfile(StaticRoute staticRoute, VpcGateway gateway) {
this.id = staticRoute.getId();
@@ -82,7 +82,7 @@ public class StaticRouteProfile implements StaticRoute{
public String getVlanTag() {
return vlanTag;
}
-
+
public String getIp4Address() {
return ipAddress;
}
@@ -94,5 +94,5 @@ public class StaticRouteProfile implements StaticRoute{
public String getNetmask() {
return netmask;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 c9f52ff..b9f3d6c 100644
--- a/api/src/com/cloud/network/vpc/Vpc.java
+++ b/api/src/com/cloud/network/vpc/Vpc.java
@@ -24,7 +24,7 @@ public interface Vpc extends ControlledEntity{
Enabled,
Inactive
}
-
+
public static final String _supportedProviders = Network.Provider.VPCVirtualRouter.getName();
boolean readyToUse();
@@ -32,7 +32,7 @@ public interface Vpc extends ControlledEntity{
long getId();
String getUuid();
-
+
String getName();
long getZoneId();
@@ -42,11 +42,11 @@ public interface Vpc extends ControlledEntity{
State getState();
long getVpcOfferingId();
-
+
String getDisplayText();
String getNetworkDomain();
boolean isRestartRequired();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 23f31fb..1ba28cc 100644
--- a/api/src/com/cloud/network/vpc/VpcGateway.java
+++ b/api/src/com/cloud/network/vpc/VpcGateway.java
@@ -25,13 +25,13 @@ public interface VpcGateway extends Identity, ControlledEntity {
Public,
Vpn
}
-
+
public enum State {
Creating,
Ready,
Deleting
}
-
+
long getId();
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 10c1d2a..2c2b6f5 100644
--- a/api/src/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/com/cloud/network/vpc/VpcOffering.java
@@ -21,7 +21,7 @@ public interface VpcOffering {
Disabled,
Enabled
}
-
+
public static final String defaultVPCOfferingName = "Default VPC offering";
long getId();
@@ -35,7 +35,7 @@ public interface VpcOffering {
String getDisplayText();
State getState();
-
+
boolean isDefault();
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 3d6c2b7..18e4fa1 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -37,20 +37,20 @@ import com.cloud.user.User;
import com.cloud.utils.Pair;
public interface VpcService {
-
+
public VpcOffering getVpcOffering(long vpcOfferingId);
-
+
public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices);
-
+
public Vpc getVpc(long vpcId);
-
+
public Vpc getActiveVpc(long vpcId);
-
+
public List<? extends Network> getVpcNetworks(long vpcId);
-
+
Map<Service, Set<Provider>> getVpcOffSvcProvidersMap(long vpcOffId);
-
- List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr,
+
+ List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr,
Boolean isDefault, String keyword, String state, Long startIndex, Long pageSizeVal);
/**
@@ -85,9 +85,9 @@ public interface VpcService {
/**
* @param vpcId
* @return
- * @throws InsufficientCapacityException
- * @throws ResourceUnavailableException
- * @throws ConcurrentOperationException
+ * @throws InsufficientCapacityException
+ * @throws ResourceUnavailableException
+ * @throws ConcurrentOperationException
*/
public boolean deleteVpc(long vpcId) throws ConcurrentOperationException, ResourceUnavailableException;
@@ -120,22 +120,22 @@ public interface VpcService {
* @param vpc
* @return
*/
- public List<? extends Vpc> listVpcs(Long id, String vpcName, String displayText,
+ public List<? extends Vpc> listVpcs(Long id, String vpcName, String displayText,
List<String> supportedServicesStr, String cidr, Long vpcOffId, String state, String accountName, Long domainId,
- String keyword, Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive, Boolean listAll,
+ String keyword, Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive, Boolean listAll,
Boolean restartRequired, Map<String, String> tags, Long projectId);
/**
* @param vpcId
* @param destroyOnFailure TODO
* @return
- * @throws InsufficientCapacityException
- * @throws ResourceUnavailableException
- * @throws ConcurrentOperationException
+ * @throws InsufficientCapacityException
+ * @throws ResourceUnavailableException
+ * @throws ConcurrentOperationException
*/
- boolean startVpc(long vpcId, boolean destroyOnFailure) throws ConcurrentOperationException,
+ boolean startVpc(long vpcId, boolean destroyOnFailure) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
-
+
/**
* @param vpcId
* @return
@@ -147,10 +147,10 @@ public interface VpcService {
/**
* @param id
* @return
- * @throws InsufficientCapacityException
+ * @throws InsufficientCapacityException
*/
boolean restartVpc(long id) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
-
+
PrivateGateway getVpcPrivateGateway(long id);
/**
@@ -162,28 +162,28 @@ public interface VpcService {
* @param netmask
* @param gatewayOwnerId
* @return
- * @throws InsufficientCapacityException
- * @throws ConcurrentOperationException
- * @throws ResourceAllocationException
+ * @throws InsufficientCapacityException
+ * @throws ConcurrentOperationException
+ * @throws ResourceAllocationException
*/
- public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress,
- String gateway, String netmask, long gatewayOwnerId) throws ResourceAllocationException,
+ public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress,
+ String gateway, String netmask, long gatewayOwnerId) throws ResourceAllocationException,
ConcurrentOperationException, InsufficientCapacityException;
/**
* @param gatewayId
* @param destroyOnFailure TODO
* @return
- * @throws ResourceUnavailableException
- * @throws ConcurrentOperationException
+ * @throws ResourceUnavailableException
+ * @throws ConcurrentOperationException
*/
public PrivateGateway applyVpcPrivateGateway(long gatewayId, boolean destroyOnFailure) throws ConcurrentOperationException, ResourceUnavailableException;
-
+
/**
* @param id
* @return
- * @throws ResourceUnavailableException
- * @throws ConcurrentOperationException
+ * @throws ResourceUnavailableException
+ * @throws ConcurrentOperationException
*/
boolean deleteVpcPrivateGateway(long gatewayId) throws ConcurrentOperationException, ResourceUnavailableException;
@@ -202,14 +202,14 @@ public interface VpcService {
/**
* @param vpcId
* @return
- * @throws ResourceUnavailableException
+ * @throws ResourceUnavailableException
*/
public boolean applyStaticRoutes(long vpcId) throws ResourceUnavailableException;
/**
* @param routeId
* @return TODO
- * @throws ResourceUnavailableException
+ * @throws ResourceUnavailableException
*/
public boolean revokeStaticRoute(long routeId) throws ResourceUnavailableException;
@@ -231,7 +231,7 @@ public interface VpcService {
* @return
*/
VpcGateway getVpcGateway(long id);
-
+
/**
* @param ipId
* @param vpcId
@@ -243,7 +243,7 @@ public interface VpcService {
*/
IpAddress associateIPToVpc(long ipId, long vpcId) throws ResourceAllocationException, ResourceUnavailableException,
InsufficientAddressCapacityException, ConcurrentOperationException;
-
- public Network updateVpcGuestNetwork(long networkId, String name, String displayText, Account callerAccount,
+
+ public Network updateVpcGuestNetwork(long networkId, String name, String displayText, Account callerAccount,
User callerUser, String domainSuffix, Long ntwkOffId, Boolean changeCidr);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 b74611b..11ba1e5 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -29,7 +29,7 @@ import com.cloud.utils.Pair;
public interface RemoteAccessVpnService {
- RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall, long networkId)
+ RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall, long networkId)
throws NetworkRuleConflictException;
void destroyRemoteAccessVpn(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
RemoteAccessVpn startRemoteAccessVpn(long vpnServerAddressId, boolean openFirewall) throws ResourceUnavailableException;
@@ -38,12 +38,12 @@ public interface RemoteAccessVpnService {
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);
-
+
RemoteAccessVpn getRemoteAccessVpn(long vpnId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 a937c6d..32a338f 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -21,7 +21,7 @@ import java.util.Date;
/**
* Represents a disk offering that specifies what the end user needs in
* the disk offering.
- *
+ *
*/
public interface DiskOffering {
long getId();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 a514ccf..ef9bead 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -21,7 +21,7 @@ import com.cloud.network.Networks.TrafficType;
/**
* Describes network offering
- *
+ *
*/
public interface NetworkOffering {
@@ -40,7 +40,7 @@ public interface NetworkOffering {
public final static String SystemManagementNetwork = "System-Management-Network";
public final static String SystemStorageNetwork = "System-Storage-Network";
public final static String SystemPrivateGatewayNetworkOffering = "System-Private-Gateway-Network-Offering";
-
+
public final static String DefaultSharedNetworkOfferingWithSGService = "DefaultSharedNetworkOfferingWithSGService";
public final static String DefaultIsolatedNetworkOfferingWithSourceNatService = "DefaultIsolatedNetworkOfferingWithSourceNatService";
public final static String OvsIsolatedNetworkOfferingWithSourceNatService = "OvsIsolatedNetworkOfferingWithSourceNatService";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/offering/OfferingManager.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/OfferingManager.java b/api/src/com/cloud/offering/OfferingManager.java
index 3cc68db..576679d 100644
--- a/api/src/com/cloud/offering/OfferingManager.java
+++ b/api/src/com/cloud/offering/OfferingManager.java
@@ -18,30 +18,30 @@ package com.cloud.offering;
/**
* An administrator can create, delete, enable, and disable offerings.
- *
+ *
* There are three types of offerings:
* - Disk Offering - package of disk performance and size specification.
* - Network Offering - package of services available on a network.
- *
+ *
*/
public interface OfferingManager {
/**
* Creates a service offering.
- *
+ *
* @return ServiceOffering
*/
ServiceOffering createServiceOffering();
/**
* Creates a disk offering.
- *
+ *
* @return DiskOffering
*/
DiskOffering createDiskOffering();
/**
* Creates a network offering.
- *
+ *
* @return NetworkOffering
*/
NetworkOffering createNetworkOffering();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 ea143b7..c0ec91b 100644
--- a/api/src/com/cloud/projects/ProjectService.java
+++ b/api/src/com/cloud/projects/ProjectService.java
@@ -29,7 +29,7 @@ import com.cloud.utils.Pair;
public interface ProjectService {
/**
* Creates a new project
- *
+ *
* @param name
* - project name
* @param displayText
@@ -45,7 +45,7 @@ public interface ProjectService {
/**
* Deletes a project
- *
+ *
* @param id
* - project id
* @return true if the project was deleted successfully, false otherwise
@@ -54,14 +54,14 @@ public interface ProjectService {
/**
* Gets a project by id
- *
+ *
* @param id
* - project id
* @return project object
*/
Project getProject(long id);
- Pair<List<? extends Project>, Integer> listProjects(Long id, String name, String displayText, String state, String accountName,
+ Pair<List<? extends Project>, Integer> listProjects(Long id, String name, String displayText, String state, String accountName,
Long domainId, String keyword, Long startIndex, Long pageSize, boolean listAll, boolean isRecursive, Map<String, String> tags);
ProjectAccount assignAccountToProject(Project project, long accountId, Role accountRole);
@@ -94,6 +94,6 @@ public interface ProjectService {
Project enableProject(long projectId);
boolean deleteProjectInvitation(long invitationId);
-
+
Project findByProjectAccountIdIncludingRemoved(long projectAccountId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/resource/ResourceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/com/cloud/resource/ResourceService.java
index 1065453..d36ca35 100755
--- a/api/src/com/cloud/resource/ResourceService.java
+++ b/api/src/com/cloud/resource/ResourceService.java
@@ -41,11 +41,11 @@ import com.cloud.utils.fsm.NoTransitionException;
public interface ResourceService {
/**
* Updates a host
- *
+ *
* @param cmd
* - the command specifying hostId
* @return hostObject
- * @throws NoTransitionException
+ * @throws NoTransitionException
*/
Host updateHost(UpdateHostCmd cmd) throws NoTransitionException;
@@ -56,7 +56,7 @@ public interface ResourceService {
/**
* We will automatically create a cloud.com cluster to attach to the external cluster and return a hyper host to perform
* host related operation within the cluster
- *
+ *
* @param cmd
* @return
* @throws IllegalArgumentException
@@ -76,12 +76,12 @@ public interface ResourceService {
/**
* Deletes a host
- *
+ *
* @param hostId
* TODO
* @param isForced
* TODO
- *
+ *
* @param true if deleted, false otherwise
*/
boolean deleteHost(long hostId, boolean isForced, boolean isForceDeleteStorage);
@@ -93,7 +93,7 @@ public interface ResourceService {
Cluster getCluster(Long clusterId);
Swift discoverSwift(AddSwiftCmd addSwiftCmd) throws DiscoveryException;
-
+
List<HypervisorType> getSupportedHypervisorTypes(long zoneId, boolean forVirtualRouter, Long podId);
List<? extends Swift> listSwifts(ListSwiftsCmd cmd);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/serializer/Param.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/serializer/Param.java b/api/src/com/cloud/serializer/Param.java
index 0051882..02deb6f 100644
--- a/api/src/com/cloud/serializer/Param.java
+++ b/api/src/com/cloud/serializer/Param.java
@@ -31,6 +31,6 @@ public @interface Param {
Class<?> responseObject() default Object.class;
boolean includeInApiDoc() default true;
-
+
String since() default "";
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 c97b67b..65360a5 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -94,7 +94,7 @@ import com.cloud.vm.VirtualMachine.Type;
/**
* Hopefully this is temporary.
- *
+ *
*/
public interface ManagementService {
static final String Name = "management-server";
@@ -104,21 +104,21 @@ public interface ManagementService {
* for the
* account that invokes the API. By specifying available=true all zones which the account can access. By specifying
* available=false the zones where the account has virtual machine instances will be returned.
- *
+ *
* @return a list of DataCenters
*/
List<? extends DataCenter> listDataCenters(ListZonesByCmd cmd);
/**
* returns the a map of the names/values in the configuraton table
- *
+ *
* @return map of configuration name/values
*/
Pair<List<? extends Configuration>, Integer> searchForConfigurations(ListCfgsByCmd c);
/**
* Searches for Service Offerings by the specified search criteria Can search by: "name"
- *
+ *
* @param cmd
* @return List of ServiceOfferings
*/
@@ -126,12 +126,12 @@ public interface ManagementService {
/**
* Searches for Clusters by the specified search criteria
- *
+ *
* @param c
* @return
*/
Pair<List<? extends Cluster>, Integer> searchForClusters(ListClustersCmd c);
-
+
/**
* Searches for Clusters by the specified zone Id.
* @param zoneId
@@ -141,7 +141,7 @@ public interface ManagementService {
/**
* Searches for Pods by the specified search criteria Can search by: pod name and/or zone name
- *
+ *
* @param cmd
* @return List of Pods
*/
@@ -150,7 +150,7 @@ public interface ManagementService {
/**
* Searches for servers by the specified search criteria Can search by: "name", "type", "state", "dataCenterId",
* "podId"
- *
+ *
* @param cmd
* @return List of Hosts
*/
@@ -158,7 +158,7 @@ public interface ManagementService {
/**
* Creates a new template
- *
+ *
* @param cmd
* @return updated template
*/
@@ -170,7 +170,7 @@ public interface ManagementService {
* Obtains a list of events by the specified search criteria. Can search by: "username", "type", "level",
* "startDate",
* "endDate"
- *
+ *
* @param c
* @return List of Events.
*/
@@ -180,7 +180,7 @@ public interface ManagementService {
* Obtains a list of routers by the specified search criteria. Can search by: "userId", "name", "state",
* "dataCenterId",
* "podId", "hostId"
- *
+ *
* @param cmd
* @return List of DomainRouters.
*/
@@ -189,7 +189,7 @@ public interface ManagementService {
/**
* Obtains a list of IP Addresses by the specified search criteria. Can search by: "userId", "dataCenterId",
* "address"
- *
+ *
* @param cmd
* the command that wraps the search criteria
* @return List of IPAddresses
@@ -198,14 +198,14 @@ public interface ManagementService {
/**
* Obtains a list of all guest OS.
- *
+ *
* @return list of GuestOS
*/
Pair<List<? extends GuestOS>, Integer> listGuestOSByCriteria(ListGuestOsCmd cmd);
/**
* Obtains a list of all guest OS categories.
- *
+ *
* @return list of GuestOSCategories
*/
Pair<List<? extends GuestOsCategory>, Integer> listGuestOSCategoriesByCriteria(ListGuestOsCategoriesCmd cmd);
@@ -217,12 +217,12 @@ public interface ManagementService {
VirtualMachine rebootSystemVM(RebootSystemVmCmd cmd);
VirtualMachine destroySystemVM(DestroySystemVmCmd cmd);
-
+
VirtualMachine upgradeSystemVM(UpgradeSystemVMCmd cmd);
/**
* update an existing domain
- *
+ *
* @param cmd
* - the command containing domainId and new domainName
* @return Domain object if the command succeeded
@@ -231,7 +231,7 @@ public interface ManagementService {
/**
* Searches for alerts
- *
+ *
* @param c
* @return List of Alerts
*/
@@ -239,7 +239,7 @@ public interface ManagementService {
/**
* list all the capacity rows in capacity operations table
- *
+ *
* @param cmd
* @return List of capacities
*/
@@ -247,7 +247,7 @@ public interface ManagementService {
/**
* List ISOs that match the specified criteria.
- *
+ *
* @param cmd
* The command that wraps the (optional) templateId, name, keyword, templateFilter, bootable, account,
* and zoneId
@@ -258,7 +258,7 @@ public interface ManagementService {
/**
* List templates that match the specified criteria.
- *
+ *
* @param cmd
* The command that wraps the (optional) templateId, name, keyword, templateFilter, bootable, account,
* and zoneId
@@ -269,7 +269,7 @@ public interface ManagementService {
/**
* Search for disk offerings based on search criteria
- *
+ *
* @param cmd
* the command containing the criteria to use for searching for disk offerings
* @return a list of disk offerings that match the given criteria
@@ -278,7 +278,7 @@ public interface ManagementService {
/**
* List storage pools that match the given criteria
- *
+ *
* @param cmd
* the command that wraps the search criteria (zone, pod, name, IP address, path, and cluster id)
* @return a list of storage pools that match the given criteria
@@ -287,7 +287,7 @@ public interface ManagementService {
/**
* List system VMs by the given search criteria
- *
+ *
* @param cmd
* the command that wraps the search criteria (host, name, state, type, zone, pod, and/or id)
* @return the list of system vms that match the given criteria
@@ -296,7 +296,7 @@ public interface ManagementService {
/**
* Returns back a SHA1 signed response
- *
+ *
* @param userId
* -- id for the user
* @return -- ArrayList of <CloudId+Signature>
@@ -313,7 +313,7 @@ public interface ManagementService {
/**
* Extracts the volume to a particular location.
- *
+ *
* @param cmd
* the command specifying url (where the volume needs to be extracted to), zoneId (zone where the volume
* exists),
@@ -321,23 +321,23 @@ public interface ManagementService {
* @throws URISyntaxException
* @throws InternalErrorException
* @throws PermissionDeniedException
- *
+ *
*/
Long extractVolume(ExtractVolumeCmd cmd) throws URISyntaxException;
/**
* return an array of available hypervisors
- *
+ *
* @param zoneId
* TODO
- *
+ *
* @return an array of available hypervisors in the cloud
*/
List<String> getHypervisors(Long zoneId);
/**
* This method uploads a custom cert to the db, and patches every cpvm with it on the current ms
- *
+ *
* @param cmd
* -- upload certificate cmd
* @return -- returns a string on success
@@ -350,7 +350,7 @@ public interface ManagementService {
/**
* Searches for vlan by the specified search criteria Can search by: "id", "vlan", "name", "zoneID"
- *
+ *
* @param cmd
* @return List of Vlans
*/
@@ -358,7 +358,7 @@ public interface ManagementService {
/**
* Search for async jobs by account and/or startDate
- *
+ *
* @param cmd
* the command specifying the account and start date parameters
* @return the list of async jobs that match the criteria
@@ -367,7 +367,7 @@ public interface ManagementService {
/**
* Generates a random password that will be used (initially) by newly created and started virtual machines
- *
+ *
* @return a random password
*/
String generateRandomPassword();
@@ -378,7 +378,7 @@ public interface ManagementService {
/**
* Search registered key pairs for the logged in user.
- *
+ *
* @param cmd
* The api command class.
* @return The list of key pairs found.
@@ -387,7 +387,7 @@ public interface ManagementService {
/**
* Registers a key pair for a given public key.
- *
+ *
* @param cmd
* The api command class.
* @return A VO with the key pair name and a finger print for the public key.
@@ -396,7 +396,7 @@ public interface ManagementService {
/**
* Creates a new
- *
+ *
* @param cmd
* The api command class.
* @return A VO containing the key pair name, finger print for the public key and the private key material of the
@@ -406,7 +406,7 @@ public interface ManagementService {
/**
* Deletes a key pair by name.
- *
+ *
* @param cmd
* The api command class.
* @return True on success. False otherwise.
@@ -415,7 +415,7 @@ public interface ManagementService {
/**
* Finds and returns an encrypted password for a VM.
- *
+ *
* @param cmd
* The api command class.
* @return The encrypted password.
@@ -428,7 +428,7 @@ public interface ManagementService {
* List hosts for migrating the given VM. The API returns list of all hosts in the VM's cluster minus the current
* host and
* also a list of hosts that seem to have enough CPU and RAM capacity to host this VM.
- *
+ *
* @param Long
* vmId
* Id of The VM to migrate
@@ -445,7 +445,7 @@ public interface ManagementService {
/**
* list all the top consumed resources across different capacity types
- *
+ *
* @param cmd
* @return List of capacities
*/
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 117e721..0c160c4 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -19,7 +19,7 @@ package com.cloud.server;
import com.cloud.acl.ControlledEntity;
public interface ResourceTag extends ControlledEntity{
-
+
public enum TaggedResourceType {
UserVm,
Template,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 dce799e..d813b65 100644
--- a/api/src/com/cloud/server/TaggedResourceService.java
+++ b/api/src/com/cloud/server/TaggedResourceService.java
@@ -24,7 +24,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.utils.Pair;
public interface TaggedResourceService {
-
+
TaggedResourceType getResourceType (String resourceTypeStr);
/**
@@ -56,6 +56,6 @@ public interface TaggedResourceService {
* @return
*/
boolean deleteTags(List<String> resourceIds, TaggedResourceType resourceType, Map<String, String> tags);
-
+
List<? extends ResourceTag> listByResourceTypeAndId(TaggedResourceType type, long resourceId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 497523d..2d01f9c 100644
--- a/api/src/com/cloud/storage/StoragePool.java
+++ b/api/src/com/cloud/storage/StoragePool.java
@@ -33,7 +33,7 @@ public interface StoragePool {
String getName();
/***
- *
+ *
* @return unique identifier
*/
String getUuid();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 587c138..b05bc15 100644
--- a/api/src/com/cloud/storage/StorageService.java
+++ b/api/src/com/cloud/storage/StorageService.java
@@ -38,7 +38,7 @@ import com.cloud.utils.Pair;
public interface StorageService{
/**
* Create StoragePool based on uri
- *
+ *
* @param cmd
* the command object that specifies the zone, cluster/pod, URI, details, etc. to use to create the
* storage pool.
@@ -49,12 +49,12 @@ public interface StorageService{
* @throws ResourceUnavailableException
* TODO
*/
- StoragePool createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException,
+ StoragePool createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException,
UnknownHostException, ResourceUnavailableException;
/**
* Creates the database object for a volume based on the given criteria
- *
+ *
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
@@ -65,7 +65,7 @@ public interface StorageService{
/**
* Creates the volume based on the given criteria
- *
+ *
* @param cmd
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
@@ -76,7 +76,7 @@ public interface StorageService{
/**
* Delete the storage pool
- *
+ *
* @param cmd
* - the command specifying poolId
* @return success or failure
@@ -85,7 +85,7 @@ public interface StorageService{
/**
* Enable maintenance for primary storage
- *
+ *
* @param cmd
* - the command specifying primaryStorageId
* @return the primary storage pool
@@ -94,19 +94,19 @@ public interface StorageService{
* @throws InsufficientCapacityException
* TODO
*/
- public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException,
+ public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException,
InsufficientCapacityException;
/**
* Complete maintenance for primary storage
- *
+ *
* @param cmd
* - the command specifying primaryStorageId
* @return the primary storage pool
* @throws ResourceUnavailableException
* TODO
*/
- public StoragePool cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd)
+ public StoragePool cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd)
throws ResourceUnavailableException;
public StoragePool updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
@@ -119,9 +119,9 @@ public interface StorageService{
/**
* Uploads the volume to secondary storage
- *
- * @param UploadVolumeCmd cmd
- *
+ *
+ * @param UploadVolumeCmd cmd
+ *
* @return Volume object
*/
Volume uploadVolume(UploadVolumeCmd cmd) throws ResourceAllocationException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 fe21c44..c30e1de 100755
--- a/api/src/com/cloud/storage/StorageStats.java
+++ b/api/src/com/cloud/storage/StorageStats.java
@@ -22,7 +22,7 @@ public interface StorageStats {
*/
public long getByteUsed();
/**
- * @return bytes capacity of the storage server
+ * @return bytes capacity of the storage server
*/
public long getCapacityBytes();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 6e8e48e..d24c4fd 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -35,8 +35,8 @@ public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.St
Migrating("The volume is migrating to other storage pool"),
Snapshotting("There is a snapshot created on this volume, not backed up to secondary storage yet"),
Expunging("The volume is being expunging"),
- Destroy("The volume is destroyed, 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."),
+ UploadOp ("The volume upload operation is in progress or in short the volume is on secondary storage");
String _description;
@@ -60,11 +60,11 @@ public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.St
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(Allocated, Event.UploadRequested, UploadOp);
- s_fsm.addTransition(UploadOp, Event.CopyRequested, Creating);// CopyRequested for volume from sec to primary storage
+ s_fsm.addTransition(UploadOp, Event.CopyRequested, Creating);// CopyRequested for volume from sec to primary storage
s_fsm.addTransition(Creating, Event.CopySucceeded, Ready);
- s_fsm.addTransition(Creating, Event.CopyFailed, UploadOp);// Copying volume from sec to primary failed.
+ s_fsm.addTransition(Creating, Event.CopyFailed, UploadOp);// Copying volume from sec to primary failed.
s_fsm.addTransition(UploadOp, Event.DestroyRequested, Destroy);
s_fsm.addTransition(Ready, Event.DestroyRequested, Destroy);
s_fsm.addTransition(Destroy, Event.ExpungingRequested, Expunging);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/storage/snapshot/SnapshotService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotService.java b/api/src/com/cloud/storage/snapshot/SnapshotService.java
index 84388e9..967c2cc 100644
--- a/api/src/com/cloud/storage/snapshot/SnapshotService.java
+++ b/api/src/com/cloud/storage/snapshot/SnapshotService.java
@@ -34,7 +34,7 @@ public interface SnapshotService {
/**
* List all snapshots of a disk volume. Optionally lists snapshots created by specified interval
- *
+ *
* @param cmd
* the command containing the search criteria (order by, limit, etc.)
* @return list of snapshots
@@ -46,7 +46,7 @@ public interface SnapshotService {
* Delete specified snapshot from the specified. If no other policies are assigned it calls destroy snapshot. This
* will be
* used for manual snapshots too.
- *
+ *
* @param snapshotId
* TODO
*/
@@ -56,7 +56,7 @@ public interface SnapshotService {
* Creates a policy with specified schedule. maxSnaps specifies the number of most recent snapshots that are to be
* retained.
* If the number of snapshots go beyond maxSnaps the oldest snapshot is deleted
- *
+ *
* @param cmd
* the command that
* @param policyOwner
@@ -67,7 +67,7 @@ public interface SnapshotService {
/**
* Get the recurring snapshots scheduled for this volume currently along with the time at which they are scheduled
- *
+ *
* @param cmd
* the command wrapping the volumeId (volume for which the snapshots are required) and policyId (to show
* snapshots for only this policy).
@@ -77,7 +77,7 @@ public interface SnapshotService {
/**
* list all snapshot policies assigned to the specified volume
- *
+ *
* @param cmd
* the command that specifies the volume criteria
* @return list of snapshot policies
@@ -90,12 +90,12 @@ public interface SnapshotService {
/**
* Create a snapshot of a volume
- *
+ *
* @param snapshotOwner
* TODO
* @param cmd
* the API command wrapping the parameters for creating the snapshot (mainly volumeId)
- *
+ *
* @return the Snapshot that was created
*/
Snapshot createSnapshot(Long volumeId, Long policyId, Long snapshotId, Account snapshotOwner);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/template/BasedOn.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/template/BasedOn.java b/api/src/com/cloud/template/BasedOn.java
index 25d409e..a95c697 100644
--- a/api/src/com/cloud/template/BasedOn.java
+++ b/api/src/com/cloud/template/BasedOn.java
@@ -20,7 +20,7 @@ package com.cloud.template;
* BasedOn is implemented by all objects that are based on a certain template.
*/
public interface BasedOn {
-
+
/**
* @return the template id that the volume is based on.
*/
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/template/TemplateService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/template/TemplateService.java b/api/src/com/cloud/template/TemplateService.java
index e45f43d..adad154 100755
--- a/api/src/com/cloud/template/TemplateService.java
+++ b/api/src/com/cloud/template/TemplateService.java
@@ -48,7 +48,7 @@ public interface TemplateService {
/**
* Deletes a template
- *
+ *
* @param cmd
* - the command specifying templateId
*/
@@ -56,7 +56,7 @@ public interface TemplateService {
/**
* Deletes a template
- *
+ *
* @param cmd
* - the command specifying isoId
* @return true if deletion is successful, false otherwise
@@ -65,7 +65,7 @@ public interface TemplateService {
/**
* Extracts an ISO
- *
+ *
* @param cmd
* - the command specifying the mode and id of the ISO
* @return extractId.
@@ -74,7 +74,7 @@ public interface TemplateService {
/**
* Extracts a Template
- *
+ *
* @param cmd
* - the command specifying the mode and id of the template
* @return extractId
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 fc45698..3980910 100755
--- a/api/src/com/cloud/user/Account.java
+++ b/api/src/com/cloud/user/Account.java
@@ -34,7 +34,7 @@ public interface Account extends ControlledEntity {
enabled,
locked
}
-
+
public static final short ACCOUNT_TYPE_NORMAL = 0;
public static final short ACCOUNT_TYPE_ADMIN = 1;
@@ -60,7 +60,7 @@ public interface Account extends ControlledEntity {
public Date getRemoved();
public String getNetworkDomain();
-
+
public Long getDefaultZoneId();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 90e3551..ff4e3b7 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -37,7 +37,7 @@ public interface AccountService {
/**
* Creates a new user and account, stores the password as is so encrypted passwords are recommended.
- *
+ *
* @param userName
* TODO
* @param password
@@ -58,7 +58,7 @@ public interface AccountService {
* TODO
* @param networkDomain
* TODO
- *
+ *
* @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,
@@ -66,17 +66,17 @@ public interface AccountService {
/**
* Deletes a user by userId
- *
+ *
* @param accountId
* - id of the account do delete
- *
+ *
* @return true if delete was successful, false otherwise
*/
boolean deleteUserAccount(long accountId);
/**
* Disables a user by userId
- *
+ *
* @param userId
* - the userId
* @return UserAccount object
@@ -85,7 +85,7 @@ public interface AccountService {
/**
* Enables a user
- *
+ *
* @param userId
* - the userId
* @return UserAccount object
@@ -95,7 +95,7 @@ public interface AccountService {
/**
* Locks a user by userId. A locked user cannot access the API, but will still have running VMs/IP addresses
* allocated/etc.
- *
+ *
* @param userId
* @return UserAccount object
*/
@@ -103,7 +103,7 @@ public interface AccountService {
/**
* Update a user by userId
- *
+ *
* @param userId
* @return UserAccount object
*/
@@ -111,7 +111,7 @@ public interface AccountService {
/**
* Disables an account by accountName and domainId
- *
+ *
* @param accountName
* TODO
* @param domainId
@@ -125,7 +125,7 @@ public interface AccountService {
/**
* Enables an account by accountId
- *
+ *
* @param accountName
* - the enableAccount command defining the accountId to be deleted.
* @param domainId
@@ -139,7 +139,7 @@ public interface AccountService {
* Locks an account by accountId. A locked account cannot access the API, but will still have running VMs/IP
* addresses
* allocated/etc.
- *
+ *
* @param accountName
* - the LockAccount command defining the accountId to be locked.
* @param domainId
@@ -151,7 +151,7 @@ public interface AccountService {
/**
* Updates an account name
- *
+ *
* @param cmd
* - the parameter containing accountId
* @return updated account object
@@ -197,7 +197,7 @@ public interface AccountService {
throws PermissionDeniedException;
UserAccount getUserByApiKey(String apiKey);
-
+
void checkAccess(Account account, Domain domain) throws PermissionDeniedException;
void checkAccess(Account account, AccessType accessType, boolean sameOwner, ControlledEntity... entities) throws PermissionDeniedException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 83f3622..3d31244 100644
--- a/api/src/com/cloud/user/DomainService.java
+++ b/api/src/com/cloud/user/DomainService.java
@@ -32,7 +32,7 @@ public interface DomainService {
/**
* Return whether a domain is a child domain of a given domain.
- *
+ *
* @param parentId
* @param childId
*/
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/user/ResourceLimitService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/ResourceLimitService.java b/api/src/com/cloud/user/ResourceLimitService.java
index 98dfc11..75411b0 100644
--- a/api/src/com/cloud/user/ResourceLimitService.java
+++ b/api/src/com/cloud/user/ResourceLimitService.java
@@ -28,7 +28,7 @@ public interface ResourceLimitService {
/**
* Updates an existing resource limit with the specified details. If a limit doesn't exist, will create one.
- *
+ *
* @param accountId
* TODO
* @param domainId
@@ -37,14 +37,14 @@ public interface ResourceLimitService {
* TODO
* @param max
* TODO
- *
+ *
* @return the updated/created resource limit
*/
ResourceLimit updateResourceLimit(Long accountId, Long domainId, Integer resourceType, Long max);
/**
* Updates an existing resource count details for the account/domain
- *
+ *
* @param accountId
* TODO
* @param domainId
@@ -57,7 +57,7 @@ public interface ResourceLimitService {
/**
* Search for resource limits for the given id and/or account and/or type and/or domain.
- *
+ *
* @param id
* TODO
* @param accountId
@@ -73,7 +73,7 @@ public interface ResourceLimitService {
/**
* Finds the resource limit for a specified account and type. If the account has an infinite limit, will check
* the account's parent domain, and if that limit is also infinite, will return the ROOT domain's limit.
- *
+ *
* @param account
* @param type
* @return resource limit
@@ -83,7 +83,7 @@ public interface ResourceLimitService {
/**
* Finds the resource limit for a specified domain and type. If the domain has an infinite limit, will check
* up the domain hierarchy
- *
+ *
* @param account
* @param type
* @return resource limit
@@ -92,7 +92,7 @@ public interface ResourceLimitService {
/**
* Increments the resource count
- *
+ *
* @param accountId
* @param type
* @param delta
@@ -101,7 +101,7 @@ public interface ResourceLimitService {
/**
* Decrements the resource count
- *
+ *
* @param accountId
* @param type
* @param delta
@@ -110,7 +110,7 @@ public interface ResourceLimitService {
/**
* Checks if a limit has been exceeded for an account
- *
+ *
* @param account
* @param type
* @param count
@@ -122,7 +122,7 @@ public interface ResourceLimitService {
/**
* Gets the count of resources for a resource type and account
- *
+ *
* @param account
* @param type
* @return count of resources
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 3beff0a..dfba18a 100644
--- a/api/src/com/cloud/vm/Nic.java
+++ b/api/src/com/cloud/vm/Nic.java
@@ -35,7 +35,7 @@ public interface Nic {
}
public enum State implements FiniteState<State, Event> {
- Allocated("Resource is allocated but not reserved"), Reserving("Resource is being reserved right now"),
+ 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");
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/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 c5ffbea..bdd553b 100644
--- a/api/src/com/cloud/vm/NicProfile.java
+++ b/api/src/com/cloud/vm/NicProfile.java
@@ -207,7 +207,7 @@ public class NicProfile {
return strategy;
}
- public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate,
+ public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate,
boolean isSecurityGroupEnabled, String name) {
this.id = nic.getId();
this.networkId = network.getId();