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
[37/55] [abbrv] api_refactor: refactor project apis
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/UpgradeVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UpgradeVmResponse.java b/api/src/com/cloud/api/response/UpgradeVmResponse.java
index 9e272fb..079d1a5 100644
--- a/api/src/com/cloud/api/response/UpgradeVmResponse.java
+++ b/api/src/com/cloud/api/response/UpgradeVmResponse.java
@@ -24,7 +24,7 @@ import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
public class UpgradeVmResponse extends BaseResponse {
- @SerializedName("id")
+ @SerializedName("id")
private IdentityProxy id = new IdentityProxy("vm_instance");
public String getName() {
@@ -268,7 +268,7 @@ public class UpgradeVmResponse extends BaseResponse {
@SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
private String templateName;
- @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
+ @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
private String templateDisplayText;
@SerializedName("passwordenabled") @Param(description="true if the password rest feature is enabled, false otherwise")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UserResponse.java b/api/src/com/cloud/api/response/UserResponse.java
index d6afa71..6ecede6 100644
--- a/api/src/com/cloud/api/response/UserResponse.java
+++ b/api/src/com/cloud/api/response/UserResponse.java
@@ -68,7 +68,7 @@ public class UserResponse extends BaseResponse {
@SerializedName("accountid") @Param(description="the account ID of the user")
private IdentityProxy accountId = new IdentityProxy("account");
-
+
public Long getId() {
return id.getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UserVmResponse.java b/api/src/com/cloud/api/response/UserVmResponse.java
index 6f8f080..d1f70e0 100755
--- a/api/src/com/cloud/api/response/UserVmResponse.java
+++ b/api/src/com/cloud/api/response/UserVmResponse.java
@@ -37,10 +37,10 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the virtual machine")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vm")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm")
private String projectName;
@@ -83,7 +83,7 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
private String templateName;
- @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
+ @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
private String templateDisplayText;
@SerializedName(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the password rest feature is enabled, false otherwise")
@@ -103,7 +103,7 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
private String serviceOfferingName;
-
+
@SerializedName("forvirtualnetwork") @Param(description="the virtual network for the service offering")
private Boolean forVirtualNetwork;
@@ -118,7 +118,7 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
private String cpuUsed;
-
+
@SerializedName("networkkbsread") @Param(description="the incoming network traffic on the vm")
private Long networkKbsRead;
@@ -142,29 +142,29 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName("nic") @Param(description="the list of nics associated with vm", responseObject = NicResponse.class)
private List<NicResponse> nics;
-
+
@SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs")
private String hypervisor;
-
+
@SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="public IP address id associated with vm via Static nat rule")
private IdentityProxy publicIpId = new IdentityProxy("user_ip_address");
-
+
@SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule")
private String publicIp;
-
+
@SerializedName(ApiConstants.INSTANCE_NAME) @Param(description="instance name of the user vm; this parameter is returned to the ROOT admin only", since="3.0.1")
private String instanceName;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
@SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair")
private String keyPairName;
- public void setHypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- }
-
+ public void setHypervisor(String hypervisor) {
+ this.hypervisor = hypervisor;
+ }
+
public void setId(Long id) {
this.id.setValue(id);
}
@@ -305,7 +305,7 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
this.password = password;
}
-/*
+/*
public void setJobId(Long jobId) {
super.setJobId(jobId);
}
@@ -325,17 +325,17 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
public void setSecurityGroupList(List<SecurityGroupResponse> securityGroups) {
this.securityGroupList = securityGroups;
}
-
+
@Override
public void setProjectId(Long projectId) {
this.projectId.setValue(projectId);
}
-
+
@Override
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setPublicIpId(Long publicIpId) {
this.publicIpId.setValue(publicIpId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java b/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
index 15710b2..8f27ff3 100644
--- a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
+++ b/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java
@@ -24,19 +24,19 @@ import com.google.gson.annotations.SerializedName;
public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse {
@SerializedName(ApiConstants.ID) @Param(description="the id of the router")
private IdentityProxy id = new IdentityProxy("virtual_router_providers");
-
+
@SerializedName(ApiConstants.NSP_ID) @Param(description="the physical network service provider id of the provider")
private IdentityProxy nspId = new IdentityProxy("physical_network_service_providers");
-
+
@SerializedName(ApiConstants.ENABLED) @Param(description="Enabled/Disabled the service provider")
private Boolean enabled;
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the provider")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
private Long projectId;
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
private String projectName;
@@ -45,7 +45,7 @@ public class VirtualRouterProviderResponse extends BaseResponse implements Contr
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain associated with the provider")
private String domainName;
-
+
@Override
public void setAccountName(String accountName) {
this.accountName = accountName;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VlanIpRangeResponse.java b/api/src/com/cloud/api/response/VlanIpRangeResponse.java
index 197e3fb..527e272 100644
--- a/api/src/com/cloud/api/response/VlanIpRangeResponse.java
+++ b/api/src/com/cloud/api/response/VlanIpRangeResponse.java
@@ -64,16 +64,16 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
@SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the VLAN IP range")
private String endIp;
-
+
@SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network id of vlan range")
private IdentityProxy networkId = new IdentityProxy("networks");
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vlan range")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vlan range")
private String projectName;
-
+
@SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
@@ -88,11 +88,11 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
public void setZoneId(Long zoneId) {
this.zoneId.setValue(zoneId);
}
-
+
public void setVlan(String vlan) {
this.vlan = vlan;
}
-
+
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -136,7 +136,7 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
public void setNetworkId(Long networkId) {
this.networkId.setValue(networkId);
}
-
+
@Override
public void setProjectId(Long projectId) {
this.projectId.setValue(projectId);
@@ -146,12 +146,12 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setPhysicalNetworkId(long physicalNetworkId) {
this.physicalNetworkId.setValue(physicalNetworkId);
}
public long getphysicalNetworkId() {
return physicalNetworkId.getValue();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VolumeResponse.java b/api/src/com/cloud/api/response/VolumeResponse.java
index 2d97287..0772278 100755
--- a/api/src/com/cloud/api/response/VolumeResponse.java
+++ b/api/src/com/cloud/api/response/VolumeResponse.java
@@ -81,10 +81,10 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
@SerializedName(ApiConstants.ACCOUNT)
@Param(description = "the account associated with the disk volume")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
private String projectName;
@@ -147,11 +147,11 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
@SerializedName("isextractable")
@Param(description = "true if the volume is extractable, false otherwise")
private Boolean extractable;
-
+
@SerializedName(ApiConstants.STATUS)
@Param(description="the status of the volume")
private String status;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with volume", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
@@ -183,7 +183,7 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
public void setZoneId(Long zoneId) {
this.zoneId.setValue(zoneId);
}
-
+
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
@@ -227,7 +227,7 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
public void setDomainId(Long domainId) {
this.domainId.setValue(domainId);
}
-
+
public void setDomainName(String domainName) {
this.domainName = domainName;
}
@@ -273,10 +273,10 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
}
public void setStatus(String status) {
- this.status = status;
- }
+ this.status = status;
+ }
- public void setServiceOfferingDisplayText(String serviceOfferingDisplayText) {
+ public void setServiceOfferingDisplayText(String serviceOfferingDisplayText) {
this.serviceOfferingDisplayText = serviceOfferingDisplayText;
}
@@ -287,7 +287,7 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
public void setState(String state) {
this.state = state;
}
-
+
@Override
public void setProjectId(Long projectId) {
this.projectId.setValue(projectId);
@@ -297,7 +297,7 @@ public class VolumeResponse extends BaseResponse implements ControlledEntityResp
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcOfferingResponse.java b/api/src/com/cloud/api/response/VpcOfferingResponse.java
index 6c20c34..14d5c9c 100644
--- a/api/src/com/cloud/api/response/VpcOfferingResponse.java
+++ b/api/src/com/cloud/api/response/VpcOfferingResponse.java
@@ -31,22 +31,22 @@ public class VpcOfferingResponse extends BaseResponse{
@SerializedName(ApiConstants.NAME) @Param(description="the name of the vpc offering")
private String name;
-
+
@SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the vpc offering.")
private String displayText;
-
+
@SerializedName(ApiConstants.CREATED) @Param(description="the date this vpc offering was created")
private Date created;
-
+
@SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if vpc offering is default, false otherwise")
private Boolean isDefault;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="state of the vpc offering. Can be Disabled/Enabled")
private String state;
-
+
@SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
-
+
public void setId(Long id) {
this.id.setValue(id);
@@ -71,7 +71,7 @@ public class VpcOfferingResponse extends BaseResponse{
public void setServices(List<ServiceResponse> services) {
this.services = services;
}
-
+
public void setState(String state) {
this.state = state;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/com/cloud/api/response/VpcResponse.java
index d94a796..88a4610 100644
--- a/api/src/com/cloud/api/response/VpcResponse.java
+++ b/api/src/com/cloud/api/response/VpcResponse.java
@@ -31,55 +31,55 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
@SerializedName(ApiConstants.NAME) @Param(description="the name of the VPC")
private String name;
-
+
@SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the VPC.")
private String displayText;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="state of the VPC. Can be Inactive/Enabled")
private String state;
-
+
@SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the vpc")
private IdentityProxy zoneId = new IdentityProxy("data_center");
-
+
@SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the VPC belongs to")
private String zoneName;
-
+
@SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
-
+
@SerializedName(ApiConstants.CIDR) @Param(description="the cidr the VPC")
private String cidr;
-
+
@SerializedName(ApiConstants.VPC_OFF_ID) @Param(description="vpc offering id the VPC is created from")
private IdentityProxy vpcOfferingId = new IdentityProxy("vpc_offerings");
-
+
@SerializedName(ApiConstants.CREATED) @Param(description="the date this VPC was created")
private Date created;
-
+
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the VPC")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the VPC")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the VPC")
private String projectName;
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the VPC owner")
private IdentityProxy domainId = new IdentityProxy("domain");
-
+
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
private String domain;
-
+
@SerializedName(ApiConstants.NETWORK) @Param(description="the list of networks belongign to the VPC", responseObject = NetworkResponse.class)
private List<NetworkResponse> networks;
-
+
@SerializedName(ApiConstants.RESTART_REQUIRED) @Param(description="true VPC requires restart")
private Boolean restartRequired;
-
+
@SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain of the VPC")
private String networkDomain;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with the project", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
@@ -102,7 +102,7 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
public void setServices(List<ServiceResponse> services) {
this.services = services;
}
-
+
public void setState(String state) {
this.state = state;
}
@@ -139,7 +139,7 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
public void setCidr(String cidr) {
this.cidr = cidr;
}
-
+
public void setVpcOfferingId(Long vpcOfferingId) {
this.vpcOfferingId.setValue(vpcOfferingId);
}
@@ -151,19 +151,19 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
public void setNetworks(List<NetworkResponse> networks) {
this.networks = networks;
}
-
+
public void setRestartRequired(Boolean restartRequired) {
this.restartRequired = restartRequired;
}
-
+
public void setNetworkDomain(String networkDomain) {
this.networkDomain = networkDomain;
}
-
+
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/VpnUsersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/VpnUsersResponse.java b/api/src/com/cloud/api/response/VpnUsersResponse.java
index 97f2686..db12593 100644
--- a/api/src/com/cloud/api/response/VpnUsersResponse.java
+++ b/api/src/com/cloud/api/response/VpnUsersResponse.java
@@ -37,18 +37,18 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn")
private String domainName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
private String projectName;
-
+
public void setId(Long id) {
this.id.setValue(id);
}
-
+
public void setUserName(String name) {
this.userName = name;
}
@@ -62,9 +62,9 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
}
public void setDomainName(String name) {
- this.domainName = name;
+ this.domainName = name;
}
-
+
@Override
public void setProjectId(Long projectId) {
this.projectId.setValue(projectId);
@@ -73,6 +73,6 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
@Override
public void setProjectName(String projectName) {
this.projectName = projectName;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ZoneResponse.java b/api/src/com/cloud/api/response/ZoneResponse.java
index 69c83cb..147e8a7 100755
--- a/api/src/com/cloud/api/response/ZoneResponse.java
+++ b/api/src/com/cloud/api/response/ZoneResponse.java
@@ -45,44 +45,44 @@ public class ZoneResponse extends BaseResponse {
@SerializedName(ApiConstants.INTERNAL_DNS2) @Param(description="the second internal DNS for the Zone")
private String internalDns2;
-
+
@SerializedName(ApiConstants.VLAN) @Param(description="the vlan range of the zone")
private String vlan;
@SerializedName(ApiConstants.GUEST_CIDR_ADDRESS) @Param(description="the guest CIDR address for the Zone")
private String guestCidrAddress;
-
+
//TODO - generate description
@SerializedName("status")
private String status;
@SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the display text of the zone")
private String displayText;
-
+
@SerializedName(ApiConstants.DOMAIN) @Param(description="Network domain name for the networks in the zone")
private String domain;
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the containing domain, null for public zones")
private Long domainId;
-
+
@SerializedName("domainname") @Param(description="the name of the containing domain, null for public zones")
private String domainName;
-
+
@SerializedName(ApiConstants.NETWORK_TYPE) @Param(description="the network type of the zone; can be Basic or Advanced")
private String networkType;
-
+
@SerializedName("securitygroupsenabled") @Param(description="true if security groups support is enabled, false otherwise")
private boolean securityGroupsEnabled;
-
+
@SerializedName("allocationstate") @Param(description="the allocation state of the cluster")
- private String allocationState;
-
+ private String allocationState;
+
@SerializedName(ApiConstants.ZONE_TOKEN) @Param(description="Zone Token")
- private String zoneToken;
-
+ private String zoneToken;
+
@SerializedName(ApiConstants.DHCP_PROVIDER) @Param(description="the dhcp Provider for the Zone")
- private String dhcpProvider;
-
+ private String dhcpProvider;
+
@SerializedName("capacity") @Param(description="the capacity of the Zone", responseObject = CapacityResponse.class)
private List<CapacityResponse> capacitites;
@@ -140,7 +140,7 @@ public class ZoneResponse extends BaseResponse {
public void setDomainId(Long domainId) {
this.domainId = domainId;
}
-
+
public void setType(String networkType) {
this.networkType = networkType;
}
@@ -148,11 +148,11 @@ public class ZoneResponse extends BaseResponse {
public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
this.securityGroupsEnabled = securityGroupsEnabled;
}
-
+
public void setAllocationState(String allocationState) {
this.allocationState = allocationState;
}
-
+
public void setZoneToken(String zoneToken) {
this.zoneToken = zoneToken;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/capacity/Capacity.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/capacity/Capacity.java b/api/src/com/cloud/capacity/Capacity.java
index 2da2a67..d698189 100755
--- a/api/src/com/cloud/capacity/Capacity.java
+++ b/api/src/com/cloud/capacity/Capacity.java
@@ -42,10 +42,10 @@ public interface Capacity {
public long getTotalCapacity();
- public short getCapacityType();
+ public short getCapacityType();
public long getReservedCapacity();
-
+
public Float getUsedPercentage();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/capacity/CapacityState.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/capacity/CapacityState.java b/api/src/com/cloud/capacity/CapacityState.java
index be17663..b368567 100755
--- a/api/src/com/cloud/capacity/CapacityState.java
+++ b/api/src/com/cloud/capacity/CapacityState.java
@@ -17,9 +17,9 @@
package com.cloud.capacity;
public enum CapacityState {
-
+
Enabled,
- Disabled,
+ Disabled,
Maintenance,
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/configuration/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index 78d7a22..c4ed278 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -57,7 +57,7 @@ public interface ConfigurationService {
/**
* Updates a configuration entry with a new value
- *
+ *
* @param cmd
* - the command wrapping name and value parameters
* @return updated configuration object if successful
@@ -66,7 +66,7 @@ public interface ConfigurationService {
/**
* Create a service offering through the API
- *
+ *
* @param cmd
* the command object that specifies the name, number of cpu cores, amount of RAM, etc. for the service
* offering
@@ -76,7 +76,7 @@ public interface ConfigurationService {
/**
* Updates a service offering
- *
+ *
* @param serviceOfferingId
* @param userId
* @param name
@@ -90,7 +90,7 @@ public interface ConfigurationService {
/**
* Deletes a service offering
- *
+ *
* @param userId
* @param serviceOfferingId
*/
@@ -98,7 +98,7 @@ public interface ConfigurationService {
/**
* Updates a disk offering
- *
+ *
* @param cmd
* - the command specifying diskOfferingId, name, description, tags
* @return updated disk offering
@@ -108,7 +108,7 @@ public interface ConfigurationService {
/**
* Deletes a disk offering
- *
+ *
* @param cmd
* - the command specifying disk offering id
* @return true or false
@@ -118,7 +118,7 @@ public interface ConfigurationService {
/**
* Creates a new disk offering
- *
+ *
* @param domainId
* @param name
* @param description
@@ -131,7 +131,7 @@ public interface ConfigurationService {
/**
* Creates a new pod based on the parameters specified in the command object
- *
+ *
* @param zoneId
* TODO
* @param name
@@ -154,7 +154,7 @@ public interface ConfigurationService {
/**
* Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system.
- *
+ *
* @param UpdatePodCmd
* api command
*/
@@ -162,7 +162,7 @@ public interface ConfigurationService {
/**
* Deletes a pod from the database. Will not allow you to delete pods that are being used anywhere in the system.
- *
+ *
* @param cmd
* - the command containing podId
* @return true or false
@@ -172,7 +172,7 @@ public interface ConfigurationService {
/**
* Creates a new zone
- *
+ *
* @param cmd
* @return the zone if successful, null otherwise
* @throws
@@ -182,7 +182,7 @@ public interface ConfigurationService {
/**
* Edits a zone in the database. Will not allow you to edit DNS values if there are VMs in the specified zone.
- *
+ *
* @param UpdateZoneCmd
* @return Updated zone
*/
@@ -190,7 +190,7 @@ public interface ConfigurationService {
/**
* Deletes a zone from the database. Will not allow you to delete zones that are being used anywhere in the system.
- *
+ *
* @param userId
* @param zoneId
*/
@@ -200,7 +200,7 @@ public interface ConfigurationService {
* Adds a VLAN to the database, along with an IP address range. Can add three types of VLANs: (1) zone-wide VLANs on
* the
* virtual public network (2) pod-wide direct attached VLANs (3) account-specific direct attached VLANs
- *
+ *
* @param userId
* @param vlanType
* - either "DomR" (VLAN for a virtual public network) or "DirectAttached" (VLAN for IPs that will be
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/dao/EntityManager.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dao/EntityManager.java b/api/src/com/cloud/dao/EntityManager.java
index 0e5b07f..552e69d 100644
--- a/api/src/com/cloud/dao/EntityManager.java
+++ b/api/src/com/cloud/dao/EntityManager.java
@@ -37,7 +37,7 @@ public interface EntityManager {
* @return T if found; null if not.
*/
public <T, K extends Serializable> T findById(Class<T> entityType, K id);
-
+
/**
* Finds an entity by external id which is always String
* @param <T> entity class
@@ -46,7 +46,7 @@ public interface EntityManager {
* @return T if found, null if not.
*/
public <T> T findByXid(Class<T> entityType, String xid);
-
+
/**
* Lists all entities. Use this method at your own risk.
* @param <T> entity class
@@ -54,7 +54,7 @@ public interface EntityManager {
* @return List<T>
*/
public <T> List<? extends T> list(Class<T> entityType);
-
+
/**
* Persists the entity.
* @param <T> entity class
@@ -62,13 +62,13 @@ public interface EntityManager {
* @return persisted entity. Only use this after persisting.
*/
public <T> T persist(T t);
-
+
public <T> SearchBuilder<T> createSearchBuilder(Class<T> entityType);
-
+
public <T, K> GenericSearchBuilder<T, K> createGenericSearchBuilder(Class<T> entityType, Class<K> resultType);
-
+
public <T, K> List<K> search(Class<T> entityType, SearchCriteria<K> sc);
-
+
public <T, K extends Serializable> void remove(Class<T> entityType, K id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/dc/Pod.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/Pod.java b/api/src/com/cloud/dc/Pod.java
index 791c5ad..d0a2ce9 100644
--- a/api/src/com/cloud/dc/Pod.java
+++ b/api/src/com/cloud/dc/Pod.java
@@ -20,7 +20,7 @@ import com.cloud.org.Grouping;
/**
* Represents one pod in the cloud stack.
- *
+ *
*/
public interface Pod extends Grouping {
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/dc/StorageNetworkIpRange.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/com/cloud/dc/StorageNetworkIpRange.java
index 59aa98a..8786251 100755
--- a/api/src/com/cloud/dc/StorageNetworkIpRange.java
+++ b/api/src/com/cloud/dc/StorageNetworkIpRange.java
@@ -30,8 +30,8 @@ public interface StorageNetworkIpRange {
String getNetworkUuid();
String getZoneUuid();
-
+
String getNetmask();
-
+
String getGateway();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/deploy/DataCenterDeployment.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DataCenterDeployment.java b/api/src/com/cloud/deploy/DataCenterDeployment.java
index 25522e0..f046b66 100644
--- a/api/src/com/cloud/deploy/DataCenterDeployment.java
+++ b/api/src/com/cloud/deploy/DataCenterDeployment.java
@@ -37,7 +37,7 @@ public class DataCenterDeployment implements DeploymentPlan {
public DataCenterDeployment(long dataCenterId, Long podId, Long clusterId, Long hostId, Long poolId, Long physicalNetworkId) {
this(dataCenterId, podId, clusterId, hostId, poolId, physicalNetworkId, null);
}
-
+
public DataCenterDeployment(long dataCenterId, Long podId, Long clusterId, Long hostId, Long poolId, Long physicalNetworkId, ReservationContext context) {
_dcId = dataCenterId;
_podId = podId;
@@ -87,7 +87,7 @@ public class DataCenterDeployment implements DeploymentPlan {
public Long getPhysicalNetworkId() {
return _physicalNetworkId;
}
-
+
@Override
public ReservationContext getReservationContext() {
return _context;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/deploy/DeploymentPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index e5dcff1..537dd31 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -37,7 +37,7 @@ import com.cloud.vm.VirtualMachineProfile;
public interface DeploymentPlanner extends Adapter {
/**
* plan is called to determine where a virtual machine should be running.
- *
+ *
* @param vm
* virtual machine.
* @param plan
@@ -51,7 +51,7 @@ public interface DeploymentPlanner extends Adapter {
/**
* check() is called right before the virtual machine starts to make sure
* the host has enough capacity.
- *
+ *
* @param vm
* virtual machine in question.
* @param plan
@@ -69,7 +69,7 @@ public interface DeploymentPlanner extends Adapter {
* canHandle is called before plan to determine if the plan can do the allocation. Planers should be exclusive so
* planner writer must
* make sure only one planer->canHandle return true in the planner list
- *
+ *
* @param vm
* virtual machine.
* @param plan
@@ -187,7 +187,7 @@ public interface DeploymentPlanner extends Adapter {
}
_clusterIds.addAll(clusterList);
}
-
+
public void addHost(long hostId) {
if (_hostIds == null) {
_hostIds = new HashSet<Long>();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/event/Event.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/Event.java b/api/src/com/cloud/event/Event.java
index 6a30537..30115be 100644
--- a/api/src/com/cloud/event/Event.java
+++ b/api/src/com/cloud/event/Event.java
@@ -27,7 +27,7 @@ public interface Event extends ControlledEntity{
Started,
Completed;
}
-
+
long getId();
String getType();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index e69e4a4..8c62225 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -267,26 +267,26 @@ public class EventTypes {
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_ADD = "PHYSICAL.FIREWALL.ADD";
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_DELETE = "PHYSICAL.FIREWALL.DELETE";
public static final String EVENT_EXTERNAL_FIREWALL_DEVICE_CONFIGURE = "PHYSICAL.FIREWALL.CONFIGURE";
-
+
// VPC
public static final String EVENT_VPC_CREATE = "VPC.CREATE";
public static final String EVENT_VPC_UPDATE = "VPC.UPDATE";
public static final String EVENT_VPC_DELETE = "VPC.DELETE";
public static final String EVENT_VPC_RESTART = "VPC.RESTART";
-
+
// VPC offerings
public static final String EVENT_VPC_OFFERING_CREATE = "VPC.OFFERING.CREATE";
public static final String EVENT_VPC_OFFERING_UPDATE = "VPC.OFFERING.UPDATE";
public static final String EVENT_VPC_OFFERING_DELETE = "VPC.OFFERING.DELETE";
-
+
// Private gateway
public static final String EVENT_PRIVATE_GATEWAY_CREATE = "PRIVATE.GATEWAY.CREATE";
public static final String EVENT_PRIVATE_GATEWAY_DELETE = "PRIVATE.GATEWAY.DELETE";
-
+
// Static routes
public static final String EVENT_STATIC_ROUTE_CREATE = "STATIC.ROUTE.CREATE";
public static final String EVENT_STATIC_ROUTE_DELETE = "STATIC.ROUTE.DELETE";
-
+
// tag related events
public static final String EVENT_TAGS_CREATE = "CREATE_TAGS";
public static final String EVENT_TAGS_DELETE = "DELETE_TAGS";
@@ -295,7 +295,7 @@ public class EventTypes {
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_ADD = "PHYSICAL.NVPCONTROLLER.ADD";
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_DELETE = "PHYSICAL.NVPCONTROLLER.DELETE";
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_CONFIGURE = "PHYSICAL.NVPCONTROLLER.CONFIGURE";
-
+
// AutoScale
public static final String EVENT_COUNTER_CREATE = "COUNTER.CREATE";
public static final String EVENT_COUNTER_DELETE = "COUNTER.DELETE";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/AgentUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/AgentUnavailableException.java b/api/src/com/cloud/exception/AgentUnavailableException.java
index a2d052b..8919324 100644
--- a/api/src/com/cloud/exception/AgentUnavailableException.java
+++ b/api/src/com/cloud/exception/AgentUnavailableException.java
@@ -24,17 +24,17 @@ import com.cloud.utils.SerialVersionUID;
*
*/
public class AgentUnavailableException extends ResourceUnavailableException {
-
+
private static final long serialVersionUID = SerialVersionUID.AgentUnavailableException;
-
+
public AgentUnavailableException(String msg, long agentId) {
this(msg, agentId, null);
}
-
+
public AgentUnavailableException(long agentId) {
this("Unable to reach host.", agentId);
}
-
+
public AgentUnavailableException(String msg, long agentId, Throwable cause) {
super("Host " + agentId + ": " + msg, Host.class, agentId, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/CloudException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/CloudException.java b/api/src/com/cloud/exception/CloudException.java
index 9ebeaad..8cfae21 100644
--- a/api/src/com/cloud/exception/CloudException.java
+++ b/api/src/com/cloud/exception/CloudException.java
@@ -24,16 +24,16 @@ import com.cloud.utils.AnnotationHelper;
/**
* by the API response serializer. Any exceptions that are thrown by
* class, which extends RuntimeException instead of Exception like this
- * class does.
+ * class does.
*/
public class CloudException extends Exception {
-
+
// This holds a list of uuids and their names. Add uuid:fieldname pairs
protected ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
-
- protected Integer csErrorCode;
-
+
+ protected Integer csErrorCode;
+
public CloudException(String message) {
super(message);
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
@@ -43,34 +43,34 @@ public class CloudException extends Exception {
super(message, cause);
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
}
-
+
public void addProxyObject(Object voObj, Long id, String idFieldName) {
// Get the VO object's table name.
String tablename = AnnotationHelper.getTableName(voObj);
if (tablename != null) {
- addProxyObject(tablename, id, idFieldName);
+ addProxyObject(tablename, id, idFieldName);
}
return;
}
-
+
public CloudException() {
super();
setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
}
-
+
public void addProxyObject(String tableName, Long id, String idFieldName) {
idList.add(new IdentityProxy(tableName, id, idFieldName));
return;
}
-
+
public ArrayList<IdentityProxy> getIdProxyList() {
return idList;
}
-
+
public void setCSErrorCode(int cserrcode) {
this.csErrorCode = cserrcode;
}
-
+
public int getCSErrorCode() {
return this.csErrorCode;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/CloudExecutionException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/CloudExecutionException.java b/api/src/com/cloud/exception/CloudExecutionException.java
index 74b116a..d8d70f8 100755
--- a/api/src/com/cloud/exception/CloudExecutionException.java
+++ b/api/src/com/cloud/exception/CloudExecutionException.java
@@ -22,11 +22,11 @@ import com.cloud.utils.exception.RuntimeCloudException;
import com.cloud.utils.SerialVersionUID;
/**
- *
+ *
*/
public class CloudExecutionException extends RuntimeCloudException {
private final static long serialVersionUID = SerialVersionUID.CloudExecutionException;
-
+
private final ErrorCode code;
private final HashMap<String, Object> details;
@@ -35,15 +35,15 @@ public class CloudExecutionException extends RuntimeCloudException {
this.code = code;
details = new HashMap<String, Object>();
}
-
+
public ErrorCode getErrorCode() {
return code;
}
-
+
public String getErrorMessage() {
return new StringBuilder("Error Code=").append(code).append("; Error Message=").append(super.toString()).toString();
}
-
+
@Override
public String toString() {
StringBuilder buff = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/ConcurrentOperationException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConcurrentOperationException.java b/api/src/com/cloud/exception/ConcurrentOperationException.java
index 54826d6..cfe6ba3 100644
--- a/api/src/com/cloud/exception/ConcurrentOperationException.java
+++ b/api/src/com/cloud/exception/ConcurrentOperationException.java
@@ -19,9 +19,9 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class ConcurrentOperationException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.ConcurrentOperationException;
-
+
public ConcurrentOperationException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java b/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
index 7afcfe6..a777afa 100644
--- a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
+++ b/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
@@ -21,7 +21,7 @@ import com.cloud.utils.SerialVersionUID;
public class ConflictingNetworkSettingsException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ConflictingNetworkSettingException;
-
+
public ConflictingNetworkSettingsException() {
super();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/ConnectionException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ConnectionException.java b/api/src/com/cloud/exception/ConnectionException.java
index 966e39b..b3f0726 100644
--- a/api/src/com/cloud/exception/ConnectionException.java
+++ b/api/src/com/cloud/exception/ConnectionException.java
@@ -25,26 +25,26 @@ import com.cloud.utils.SerialVersionUID;
* processing. Upon receiving this exception, the AgentManager will
* immediately place the agent under alert. When the function to enable
* to disable the agent, the agent is disabled.
- * should be disconnected and reconnected to "refresh" all resource
+ * should be disconnected and reconnected to "refresh" all resource
* information. This is useful when the Listener needed to perform setup
* on the agent and decided it is best to flush connection and reconnect.
* situation where it keeps throwing ConnectionException.
*/
public class ConnectionException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.ConnectionException;
boolean _error;
public ConnectionException(boolean setupError, String msg) {
this(setupError, msg, null);
}
-
+
public ConnectionException(boolean setupError, String msg, Throwable cause) {
super(msg, cause);
_error = setupError;
-
+
}
-
+
public boolean isSetupError() {
return _error;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/DiscoveredWithErrorException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/DiscoveredWithErrorException.java b/api/src/com/cloud/exception/DiscoveredWithErrorException.java
index f59066f..ee59baf 100644
--- a/api/src/com/cloud/exception/DiscoveredWithErrorException.java
+++ b/api/src/com/cloud/exception/DiscoveredWithErrorException.java
@@ -19,13 +19,13 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class DiscoveredWithErrorException extends DiscoveryException {
-
+
private static final long serialVersionUID = SerialVersionUID.DiscoveredWithErrorException;
public DiscoveredWithErrorException(String msg) {
this(msg, null);
}
-
+
public DiscoveredWithErrorException(String msg, Throwable cause) {
super(msg, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/DiscoveryException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/DiscoveryException.java b/api/src/com/cloud/exception/DiscoveryException.java
index 10a7c5b..62ae272 100644
--- a/api/src/com/cloud/exception/DiscoveryException.java
+++ b/api/src/com/cloud/exception/DiscoveryException.java
@@ -19,13 +19,13 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class DiscoveryException extends CloudException {
-
+
private static final long serialVersionUID = SerialVersionUID.DiscoveryException;
public DiscoveryException(String msg) {
this(msg, null);
}
-
+
public DiscoveryException(String msg, Throwable cause) {
super(msg, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/ErrorCode.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ErrorCode.java b/api/src/com/cloud/exception/ErrorCode.java
index 15d9b7e..8f048b8 100755
--- a/api/src/com/cloud/exception/ErrorCode.java
+++ b/api/src/com/cloud/exception/ErrorCode.java
@@ -23,30 +23,30 @@ import java.util.HashSet;
public class ErrorCode {
String code;
private static HashSet<ErrorCode> s_codes = new HashSet<ErrorCode>();
-
+
public ErrorCode(String code) {
this.code = code;
assert !s_codes.contains(this) : "There is already an error code registered for this code: " + code;
s_codes.add(this);
}
-
+
public String getCode() {
return code;
}
-
+
@Override
public int hashCode() {
return code.hashCode();
}
-
+
@Override
public boolean equals(Object that) {
if (!(that instanceof ErrorCode)) {
return false;
}
-
+
return this.code.equals(((ErrorCode)that).code);
}
-
+
public final static ErrorCode UnableToReachResource = new ErrorCode("resource.unavailable");
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/HAStateException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/HAStateException.java b/api/src/com/cloud/exception/HAStateException.java
index aaa5e75..cb25174 100644
--- a/api/src/com/cloud/exception/HAStateException.java
+++ b/api/src/com/cloud/exception/HAStateException.java
@@ -23,9 +23,9 @@ import com.cloud.utils.SerialVersionUID;
* done with it. Hence this special state.
*/
public class HAStateException extends ManagementServerException {
-
+
private static final long serialVersionUID = SerialVersionUID.HAStateException;
-
+
public HAStateException(String msg) {
super(msg);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/InsufficientCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientCapacityException.java b/api/src/com/cloud/exception/InsufficientCapacityException.java
index 8a0557f..51a4e59 100755
--- a/api/src/com/cloud/exception/InsufficientCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientCapacityException.java
@@ -49,7 +49,7 @@ public abstract class InsufficientCapacityException extends CloudException {
/**
* @return the id of the object that it is insufficient in. Note that this method is
* marked such that if the id is not set, then it will throw NullPointerException.
- * This is intended as you should check to see if the Scope is present before
+ * This is intended as you should check to see if the Scope is present before
* accessing this method.
*/
public long getId() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java b/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
index 09a077b..71ec16d 100644
--- a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
@@ -20,11 +20,11 @@ import com.cloud.utils.SerialVersionUID;
public class InsufficientNetworkCapacityException extends InsufficientCapacityException {
private static final long serialVersionUID = SerialVersionUID.InsufficientAddressCapacityException;
-
+
protected InsufficientNetworkCapacityException() {
super();
}
-
+
public InsufficientNetworkCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/InsufficientServerCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientServerCapacityException.java b/api/src/com/cloud/exception/InsufficientServerCapacityException.java
index 4a30595..af34e57 100755
--- a/api/src/com/cloud/exception/InsufficientServerCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientServerCapacityException.java
@@ -24,13 +24,13 @@ import com.cloud.utils.SerialVersionUID;
* trying to start.
*/
public class InsufficientServerCapacityException extends InsufficientCapacityException {
-
+
private static final long serialVersionUID = SerialVersionUID.InsufficientServerCapacityException;
-
+
public InsufficientServerCapacityException(String msg, Long clusterId) {
this(msg, Cluster.class, clusterId);
}
-
+
public InsufficientServerCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java b/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
index f8ec106..c70bfc3 100755
--- a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
+++ b/api/src/com/cloud/exception/InsufficientStorageCapacityException.java
@@ -24,13 +24,13 @@ import com.cloud.utils.SerialVersionUID;
* storage space to create the VM.
*/
public class InsufficientStorageCapacityException extends InsufficientCapacityException {
-
+
private static final long serialVersionUID = SerialVersionUID.InsufficientStorageCapacityException;
-
+
public InsufficientStorageCapacityException(String msg, long id) {
this(msg, StoragePool.class, id);
}
-
+
public InsufficientStorageCapacityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java b/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
index 10d9ffc..4741baa 100644
--- a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
+++ b/api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java
@@ -21,11 +21,11 @@ import com.cloud.utils.SerialVersionUID;
public class InsufficientVirtualNetworkCapcityException extends InsufficientNetworkCapacityException {
private static final long serialVersionUID = SerialVersionUID.InsufficientVirtualNetworkCapacityException;
-
+
public InsufficientVirtualNetworkCapcityException(String msg, Class<?> scope, Long id) {
super(msg, scope, id);
}
-
+
public InsufficientVirtualNetworkCapcityException(String msg, long podId) {
this(msg, Pod.class, podId);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/ResourceUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/ResourceUnavailableException.java b/api/src/com/cloud/exception/ResourceUnavailableException.java
index 484659a..30daf56 100644
--- a/api/src/com/cloud/exception/ResourceUnavailableException.java
+++ b/api/src/com/cloud/exception/ResourceUnavailableException.java
@@ -23,21 +23,21 @@ public class ResourceUnavailableException extends CloudException {
Class<?> _scope;
long _id;
-
+
public ResourceUnavailableException(String msg, Class<?> scope, long resourceId) {
this(msg, scope, resourceId, null);
}
-
+
public ResourceUnavailableException(String msg, Class<?> scope, long resourceId, Throwable cause) {
super(new StringBuilder("Resource [").append(scope.getSimpleName()).append(":").append(resourceId).append("] is unreachable: ").append(msg).toString(), cause);
_scope = scope;
_id = resourceId;
}
-
+
public Class<?> getScope() {
return _scope;
}
-
+
public long getResourceId() {
return _id;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/exception/StorageUnavailableException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/StorageUnavailableException.java b/api/src/com/cloud/exception/StorageUnavailableException.java
index 7b443a9..6db1629 100644
--- a/api/src/com/cloud/exception/StorageUnavailableException.java
+++ b/api/src/com/cloud/exception/StorageUnavailableException.java
@@ -20,9 +20,9 @@ import com.cloud.storage.StoragePool;
import com.cloud.utils.SerialVersionUID;
/**
- * If the cause is due to storage pool unavailable, calling
+ * If the cause is due to storage pool unavailable, calling
* problem with.
- *
+ *
*/
public class StorageUnavailableException extends ResourceUnavailableException {
private static final long serialVersionUID = SerialVersionUID.StorageUnavailableException;
@@ -33,11 +33,11 @@ public class StorageUnavailableException extends ResourceUnavailableException {
public StorageUnavailableException(String msg, long poolId, Throwable cause) {
this(msg, StoragePool.class, poolId, cause);
}
-
+
public StorageUnavailableException(String msg, Class<?> scope, long resourceId) {
this(msg, scope, resourceId, null);
}
-
+
public StorageUnavailableException(String msg, Class<?> scope, long resourceId, Throwable th) {
super(msg, scope, resourceId, th);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/host/Host.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java
index 1bac0d2..8c95336 100755
--- a/api/src/com/cloud/host/Host.java
+++ b/api/src/com/cloud/host/Host.java
@@ -198,6 +198,6 @@ public interface Host extends StateObject<Status> {
String getHypervisorVersion();
boolean isInMaintenanceStates();
-
- ResourceState getResourceState();
+
+ ResourceState getResourceState();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/host/HostEnvironment.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/HostEnvironment.java b/api/src/com/cloud/host/HostEnvironment.java
index 3184974..89077b5 100644
--- a/api/src/com/cloud/host/HostEnvironment.java
+++ b/api/src/com/cloud/host/HostEnvironment.java
@@ -22,29 +22,29 @@ package com.cloud.host;
* the environment.
*/
public class HostEnvironment {
-
+
public String managementIpAddress;
public String managementNetmask;
public String managementGateway;
public String managementVlan;
-
+
public String[] neighborHosts;
-
+
public String storageIpAddress;
public String storageNetwork;
public String storageGateway;
public String storageVlan;
public String secondaryStroageIpAddress;
-
+
public String storage2IpAddress;
public String storage2Network;
public String storage2Gateway;
public String storage2Vlan;
public String secondaryStorageIpAddress2;
-
+
public String[] neighborStorages;
public String[] neighborStorages2;
-
+
public String publicIpAddress;
public String publicNetmask;
public String publicGateway;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/host/HostStats.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/HostStats.java b/api/src/com/cloud/host/HostStats.java
index e8fa19e..803b148 100755
--- a/api/src/com/cloud/host/HostStats.java
+++ b/api/src/com/cloud/host/HostStats.java
@@ -17,7 +17,7 @@
package com.cloud.host;
public interface HostStats {
-
+
// host related stats
public double getCpuUtilization();
public double getNetworkWriteKBs();
@@ -27,7 +27,7 @@ public interface HostStats {
public String getEntityType();
public double getUsedMemory();
public HostStats getHostStats();
-
+
// public double getAverageLoad();
- // public double getXapiMemoryUsageKBs();
+ // public double getXapiMemoryUsageKBs();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/host/Status.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java
index aed35cb..97b151d 100755
--- a/api/src/com/cloud/host/Status.java
+++ b/api/src/com/cloud/host/Status.java
@@ -32,25 +32,25 @@ public enum Status {
Removed(true, false, true),
Error(true, false, true),
Rebalancing(true, false, true);
-
+
private final boolean updateManagementServer;
private final boolean checkManagementServer;
private final boolean lostConnection;
-
+
private Status(boolean updateConnection, boolean checkManagementServer, boolean lostConnection) {
this.updateManagementServer = updateConnection;
this.checkManagementServer = checkManagementServer;
this.lostConnection = lostConnection;
}
-
+
public boolean updateManagementServer() {
return updateManagementServer;
}
-
+
public boolean checkManagementServer() {
return checkManagementServer;
}
-
+
public boolean lostConnection() {
return lostConnection;
}
@@ -82,16 +82,16 @@ public enum Status {
public String getDescription() {
return comment;
}
-
+
public boolean isUserRequest() {
return isUserRequest;
}
}
-
+
public static StateMachine2<Status, Event, Host> getStateMachine() {
return s_fsm;
}
-
+
public Status getNextStatus(Event e) throws NoTransitionException {
return s_fsm.getNextState(this, e);
}
@@ -100,7 +100,7 @@ public enum Status {
List<Status> from = s_fsm.getFromStates(this, e);
return from.toArray(new Status[from.size()]);
}
-
+
public Set<Event> getPossibleEvents() {
return s_fsm.getPossibleEvents(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/hypervisor/Hypervisor.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/com/cloud/hypervisor/Hypervisor.java
index 25dd8b1..2e0012d 100644
--- a/api/src/com/cloud/hypervisor/Hypervisor.java
+++ b/api/src/com/cloud/hypervisor/Hypervisor.java
@@ -23,7 +23,7 @@ public class Hypervisor {
XenServer,
KVM,
VMware,
- Hyperv,
+ Hyperv,
VirtualBox,
Parralels,
BareMetal,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/hypervisor/HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java
index d3608dc..b4a0b06 100644
--- a/api/src/com/cloud/hypervisor/HypervisorGuru.java
+++ b/api/src/com/cloud/hypervisor/HypervisorGuru.java
@@ -27,28 +27,28 @@ import com.cloud.vm.VirtualMachineProfile;
public interface HypervisorGuru extends Adapter {
HypervisorType getHypervisorType();
-
+
/**
* Convert from a virtual machine to the
- * virtual machine that the hypervisor expects.
- * @param vm
+ * virtual machine that the hypervisor expects.
+ * @param vm
* @return
*/
<T extends VirtualMachine> VirtualMachineTO implement(VirtualMachineProfile<T> vm);
-
+
/**
* Give hypervisor guru opportunity to decide if certain command needs to be delegated to other host, mainly to secondary storage VM host
* @param hostId original hypervisor host
* @param cmd command that is going to be sent, hypervisor guru usually needs to register various context objects into the command object
- *
+ *
* @return delegated host id if the command will be delegated
*/
long getCommandHostDelegation(long hostId, Command cmd);
-
+
/**
* @return true if VM can be migrated independently with CloudStack, and therefore CloudStack needs to track and reflect host change
* into CloudStack database, false if CloudStack enforces VM sync logic
- *
+ *
*/
boolean trackVmHostChange();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/IpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index f67a1fa..9a72d10 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -22,11 +22,11 @@ import com.cloud.acl.ControlledEntity;
import com.cloud.utils.net.Ip;
/**
- *
+ *
* - Allocated = null
* - AccountId = null
* - DomainId = null
- *
+ *
* - State = Allocated
* - AccountId = account owner.
* - DomainId = domain of the account owner.
@@ -39,7 +39,7 @@ public interface IpAddress extends ControlledEntity {
Releasing, // The IP address is being released for other network elements and is not ready for allocation.
Free // The IP address is ready to be allocated.
}
-
+
enum Purpose {
StaticNat,
Lb
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index d38f740..1a083a9 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -45,10 +45,10 @@ public interface Network extends ControlledEntity {
public static final Service Dhcp = new Service("Dhcp");
public static final Service Dns = new Service("Dns", Capability.AllowDnsSuffixModification);
public static final Service Gateway = new Service("Gateway");
- public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols,
+ public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols,
Capability.MultipleIps, Capability.TrafficStatistics);
public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedLBIsolation,
- Capability.SupportedProtocols, Capability.TrafficStatistics, Capability.LoadBalancingSupportedIps,
+ Capability.SupportedProtocols, Capability.TrafficStatistics, Capability.LoadBalancingSupportedIps,
Capability.SupportedStickinessMethods, Capability.ElasticLb);
public static final Service UserData = new Service("UserData");
public static final Service SourceNat = new Service("SourceNat", Capability.SupportedSourceNatTypes, Capability.RedundantRouter);
@@ -299,5 +299,5 @@ public interface Network extends ControlledEntity {
* @return
*/
Long getVpcId();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index a200561..1cefbb8 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -41,7 +41,7 @@ public interface NetworkService {
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
- IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) throws ResourceAllocationException,
+ IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) throws ResourceAllocationException,
InsufficientAddressCapacityException, ConcurrentOperationException;
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
@@ -79,13 +79,13 @@ public interface NetworkService {
Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long networkOfferingId);
- PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed,
+ PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed,
List<String> isolationMethods, String broadcastDomainRange, Long domainId, List<String> tags, String name);
- Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Long id, Long zoneId, String keyword,
+ Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Long id, Long zoneId, String keyword,
Long startIndex, Long pageSize, String name);
- PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags,
+ PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags,
String newVnetRangeString, String state);
boolean deletePhysicalNetwork(Long id);
@@ -114,7 +114,7 @@ public interface NetworkService {
long findPhysicalNetworkId(long zoneId, String tag, TrafficType trafficType);
- PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType,
+ PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType,
String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, String vlan);
PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id);
@@ -132,19 +132,19 @@ public interface NetworkService {
List<Pair<TrafficType, String>> listTrafficTypeImplementor(ListTrafficTypeImplementorsCmd cmd);
List<? extends Network> getIsolatedNetworksWithSourceNATOwnedByAccountInZone(long zoneId, Account owner);
-
+
List<? extends Network> listNetworksByVpc(long vpcId);
-
+
boolean isVmPartOfNetwork(long vmId, long ntwkId);
/**
* @param networkId
* @param entityId
* @return
- * @throws ConcurrentOperationException
- * @throws ResourceUnavailableException
- * @throws ResourceAllocationException
- * @throws InsufficientAddressCapacityException
+ * @throws ConcurrentOperationException
+ * @throws ResourceUnavailableException
+ * @throws ResourceAllocationException
+ * @throws InsufficientAddressCapacityException
*/
IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException,
ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException;
@@ -161,12 +161,12 @@ public interface NetworkService {
* @param networkOwnerId
* @param vpcId TODO
* @return
- * @throws InsufficientCapacityException
- * @throws ConcurrentOperationException
- * @throws ResourceAllocationException
+ * @throws InsufficientCapacityException
+ * @throws ConcurrentOperationException
+ * @throws ResourceAllocationException
*/
Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan,
- String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId)
+ String startIp, String endIP, String gateway, String netmask, long networkOwnerId, Long vpcId)
throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
/**
* @param network
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/Networks.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java
index b96eaa2..b156619 100755
--- a/api/src/com/cloud/network/Networks.java
+++ b/api/src/com/cloud/network/Networks.java
@@ -23,7 +23,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
/**
* Network includes all of the enums used within networking.
- *
+ *
*/
public class Networks {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/PhysicalNetwork.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java
index be4b1d0..03345d9 100644
--- a/api/src/com/cloud/network/PhysicalNetwork.java
+++ b/api/src/com/cloud/network/PhysicalNetwork.java
@@ -19,7 +19,7 @@ package com.cloud.network;
import java.util.List;
/**
- *
+ *
*/
public interface PhysicalNetwork {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
index 1b91311..468cb90 100644
--- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
+++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.cloud.network.Network.Service;
/**
- *
+ *
*/
public interface PhysicalNetworkServiceProvider {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
index 0c0bfa1..44c4fbf 100644
--- a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
+++ b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
@@ -19,7 +19,7 @@ package com.cloud.network;
import com.cloud.network.Networks.TrafficType;
/**
- *
+ *
*/
public interface PhysicalNetworkTrafficType {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/PublicIpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java
index 5d117b8..d8a10bc 100644
--- a/api/src/com/cloud/network/PublicIpAddress.java
+++ b/api/src/com/cloud/network/PublicIpAddress.java
@@ -22,13 +22,13 @@ import com.cloud.dc.Vlan;
/**
*/
public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan {
-
+
String getMacAddress();
-
+
public String getNetmask();
-
+
public String getGateway();
-
+
@Override
public String getVlanTag();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/RemoteAccessVpn.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/RemoteAccessVpn.java b/api/src/com/cloud/network/RemoteAccessVpn.java
index 162e0fc..1fe53c4 100644
--- a/api/src/com/cloud/network/RemoteAccessVpn.java
+++ b/api/src/com/cloud/network/RemoteAccessVpn.java
@@ -24,7 +24,7 @@ public interface RemoteAccessVpn extends ControlledEntity {
Running,
Removed
}
-
+
long getServerAddressId();
String getIpRange();
String getIpsecPresharedKey();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/Site2SiteCustomerGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
index 8950c77..e53d099 100644
--- a/api/src/com/cloud/network/Site2SiteCustomerGateway.java
+++ b/api/src/com/cloud/network/Site2SiteCustomerGateway.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/Site2SiteVpnConnection.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java
index 6cf52a9..0986c9d 100644
--- a/api/src/com/cloud/network/Site2SiteVpnConnection.java
+++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/Site2SiteVpnGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/com/cloud/network/Site2SiteVpnGateway.java
index 52ec597..ad79b27 100644
--- a/api/src/com/cloud/network/Site2SiteVpnGateway.java
+++ b/api/src/com/cloud/network/Site2SiteVpnGateway.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/VirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index 300c993..fc63615 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -26,29 +26,29 @@ import com.cloud.user.Account;
public interface VirtualNetworkApplianceService {
/**
* Starts domain router
- *
+ *
* @param cmd
* the command specifying router's id
* @return DomainRouter object
*/
- VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
+ VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
/**
* Reboots domain router
- *
+ *
* @param cmd
* the command specifying router's id
* @return router if successful
*/
- VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
+ VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
VirtualRouter upgradeRouter(UpgradeRouterCmd cmd);
/**
* Stops domain router
- *
+ *
* @param id
* of the router
* @param forced
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
index 03eb576..6e8fd38 100644
--- a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
@@ -32,7 +32,7 @@ public interface VpcVirtualNetworkApplianceService extends VirtualNetworkApplian
* @throws ResourceUnavailableException
* @throws InsufficientCapacityException
*/
- boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
+ boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
@@ -43,7 +43,7 @@ public interface VpcVirtualNetworkApplianceService extends VirtualNetworkApplian
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
+ boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant)
throws ConcurrentOperationException, ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/as/AutoScaleVmProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
index 77f5ce4..8ca5415 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
@@ -1,21 +1,21 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package com.cloud.network.as;
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.as;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java b/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
index 3c54746..76906c4 100644
--- a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
+++ b/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
@@ -38,7 +38,7 @@ public interface LoadBalancingServiceProvider extends NetworkElement {
* @param network
* @param rule
* @return true/false. true should be return if there are no validations. false should be return if any oneof the validation fails.
- * @throws
+ * @throws
*/
boolean validateLBRule(Network network, LoadBalancingRule rule);
}