Skip to content

Commit

Permalink
Removed trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Huang committed Nov 21, 2013
1 parent e4b22d0 commit 224f479
Show file tree
Hide file tree
Showing 613 changed files with 4,403 additions and 4,403 deletions.
2 changes: 1 addition & 1 deletion agent/src/com/cloud/agent/dao/StorageComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.cloud.utils.component.Manager;

/**
*
*
*/
public interface StorageComponent extends Manager {
String get(String key);
Expand Down
2 changes: 1 addition & 1 deletion agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

/**
* Uses Properties to implement storage.
*
*
* @config {@table || Param Name | Description | Values | Default || || path |
* path to the properties _file | String | db/db.properties || * }
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,20 @@
import com.cloud.utils.script.Script;

/**
*
*
* I don't want to introduce extra cross-cutting concerns into console proxy
* process, as it involves configurations like zone/pod, agent auto self-upgrade
* etc. I also don't want to introduce more module dependency issues into our
* build system, cross-communication between this resource and console proxy
* will be done through reflection. As a result, come out with following
* solution to solve the problem of building a communication channel between
* consoole proxy and management server.
*
*
* We will deploy an agent shell inside console proxy VM, and this agent shell
* will launch current console proxy from within this special server resource,
* through it console proxy can build a communication channel with management
* server.
*
*
*/
public class ConsoleProxyResource extends ServerResourceBase implements ServerResource {
static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class);
Expand Down
2 changes: 1 addition & 1 deletion agent/src/com/cloud/agent/vmdata/VmDataServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* Maintains vm data (user data, meta-data, password) that can be fetched via
* HTTP by user vms
*
*
*/
public interface VmDataServer extends Manager {

Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/agent/api/HostVmStateReportEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// TODO vmsync
// We should also have a HostVmStateReport class instead of using raw Map<> data structure,
// for now, we store host-specific info at each VM entry and host fields are fixed
//
//
// This needs to be refactor-ed afterwards
//
public class HostVmStateReportEntry {
Expand Down
8 changes: 4 additions & 4 deletions api/src/com/cloud/agent/manager/allocator/HostAllocator.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ public interface HostAllocator extends Adapter {
/**
* Determines which physical hosts are suitable to allocate the guest
* virtual machines on
*
*
* Allocators must set any other hosts not considered for allocation in the
* ExcludeList avoid. Thus the avoid set and the list of hosts suitable,
* together must cover the entire host set in the cluster.
*
*
* @param VirtualMachineProfile
* vmProfile
* @param DeploymentPlan
Expand All @@ -81,8 +81,8 @@ public interface HostAllocator extends Adapter {
* Allocators must set any other hosts not considered for allocation in the
* ExcludeList avoid. Thus the avoid set and the list of hosts suitable,
* together must cover the entire host set in the cluster.
*
*
*
*
* @param VirtualMachineProfile
* vmProfile
* @param DeploymentPlan
Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/ha/FenceBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public interface FenceBuilder extends Adapter {
/**
* Fence off the vm.
*
*
* @param vm vm
* @param host host where the vm was running on.
*/
Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/ha/Investigator.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
public interface Investigator extends Adapter {
/**
* Returns if the vm is still alive.
*
*
* @param vm to work on.
*/
public Boolean isVmAlive(VirtualMachine vm, Host host);
Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/hypervisor/Hypervisor.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static HypervisorType getType(String hypervisor) {

/**
* This method really needs to be part of the properties of the hypervisor type itself.
*
*
* @param hyperType
* @return
*/
Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/hypervisor/HypervisorGuru.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public interface HypervisorGuru extends Adapter {
/**
* Give the hypervisor guru the opportinity to decide if additional clean is
* required for nics before expunging the VM
*
*
*/
List<Command> finalizeExpungeNics(VirtualMachine vm, List<NicProfile> nics);
}
16 changes: 8 additions & 8 deletions api/src/com/cloud/network/NetworkMigrationResponder.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
import com.cloud.vm.VirtualMachineProfile;

/**
* NetworkGuru and NetworkElements that implement this interface
* NetworkGuru and NetworkElements that implement this interface
* will be called during Virtual Machine migration.
*/
public interface NetworkMigrationResponder {
/**
* Prepare for migration.
*
*
* This method will be called per nic before the vm migration.
* @param nic
* @param network
Expand All @@ -42,9 +42,9 @@ public interface NetworkMigrationResponder {

/**
* Cancel for migration preparation.
*
* This method will be called per nic when the entire vm migration
* process failed and need to release the resouces that was
*
* This method will be called per nic when the entire vm migration
* process failed and need to release the resouces that was
* allocated at the migration preparation.
* @param nic destination nic
* @param network destination network
Expand All @@ -56,9 +56,9 @@ public interface NetworkMigrationResponder {

/**
* Commit the migration resource.
*
* This method will be called per nic when the entire vm migration
* process was successful. This is useful to release the resource of
*
* This method will be called per nic when the entire vm migration
* process was successful. This is useful to release the resource of
* source deployment where vm has left.
* @param nic source nic
* @param network source network
Expand Down
4 changes: 2 additions & 2 deletions api/src/com/cloud/network/NetworkModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
/**
* The NetworkModel presents a read-only view into the Network data such as L2 networks,
* Nics, PublicIps, NetworkOfferings, traffic labels, physical networks and the like
* The idea is that only the orchestration core should be able to modify the data, while other
* The idea is that only the orchestration core should be able to modify the data, while other
* participants in the orchestration can use this interface to query the data.
*/
public interface NetworkModel {

/**
* Lists IP addresses that belong to VirtualNetwork VLANs
*
*
* @param accountId
* - account that the IP address should belong to
* @param associatedNetworkId
Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/network/Networks.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* Network includes all of the enums used within networking.
*
*
*/
public class Networks {

Expand Down
2 changes: 1 addition & 1 deletion api/src/com/cloud/network/element/IpDeployer.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface IpDeployer extends Adapter {
/**
* Modify ip addresses on this network
* Depending on the State of the ip addresses the element should take
* appropriate action.
* appropriate action.
* If state is Releasing the ip address should be de-allocated
* If state is Allocating or Allocated the ip address should be provisioned
* @param network
Expand Down
6 changes: 3 additions & 3 deletions api/src/com/cloud/network/element/NetworkElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ 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.
Expand Down Expand Up @@ -124,7 +124,7 @@ boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, Deplo
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();
Expand Down
12 changes: 6 additions & 6 deletions api/src/com/cloud/network/vpc/Vpc.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public enum State {
}

/**
*
*
* @return VPC name
*/
String getName();
Expand All @@ -43,31 +43,31 @@ public enum State {
String getCidr();

/**
*
*
* @return VPC state
*/
State getState();

/**
*
*
* @return VPC offering id - the offering that VPC is created from
*/
long getVpcOfferingId();

/**
*
*
* @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 true if restart is required for the VPC; false otherwise
*/
boolean isRestartRequired();
Expand Down
6 changes: 3 additions & 3 deletions api/src/com/cloud/network/vpc/VpcOffering.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public enum State {
public static final String defaultVPCNSOfferingName = "Default VPC offering with Netscaler";

/**
*
*
* @return VPC offering name
*/
String getName();
Expand All @@ -39,13 +39,13 @@ public enum State {
String getDisplayText();

/**
*
*
* @return VPC offering state
*/
State getState();

/**
*
*
* @return true if offering is default - came with the cloudStack fresh install; false otherwise
*/
boolean isDefault();
Expand Down
Loading

0 comments on commit 224f479

Please sign in to comment.