Skip to content

Commit cd0ef09

Browse files
spark404spark404
committed
Fix typo and add the right exception to the error map.
1 parent d781824 commit cd0ef09

35 files changed

Lines changed: 151 additions & 150 deletions

File tree

api/src/com/cloud/exception/InsufficientVirtualNetworkCapcityException.java renamed to api/src/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import com.cloud.dc.Pod;
2020
import com.cloud.utils.SerialVersionUID;
2121

22-
public class InsufficientVirtualNetworkCapcityException extends InsufficientNetworkCapacityException {
22+
public class InsufficientVirtualNetworkCapacityException extends InsufficientNetworkCapacityException {
2323
private static final long serialVersionUID = SerialVersionUID.InsufficientVirtualNetworkCapacityException;
2424

25-
public InsufficientVirtualNetworkCapcityException(String msg, Class<?> scope, Long id) {
25+
public InsufficientVirtualNetworkCapacityException(String msg, Class<?> scope, Long id) {
2626
super(msg, scope, id);
2727
}
2828

29-
public InsufficientVirtualNetworkCapcityException(String msg, long podId) {
29+
public InsufficientVirtualNetworkCapacityException(String msg, long podId) {
3030
this(msg, Pod.class, podId);
3131
}
3232
}

‎api/src/com/cloud/network/guru/NetworkGuru.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.cloud.deploy.DeploymentPlan;
2121
import com.cloud.exception.ConcurrentOperationException;
2222
import com.cloud.exception.InsufficientAddressCapacityException;
23-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
23+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
2424
import com.cloud.network.Network;
2525
import com.cloud.network.NetworkProfile;
2626
import com.cloud.network.Networks.TrafficType;
@@ -103,13 +103,13 @@ public interface NetworkGuru extends Adapter {
103103
* @param offering network offering that the network was created with.
104104
* @param destination where the network is being deployed in.
105105
* @return a fully implemented Network.
106-
* @throws InsufficientVirtualNetworkCapcityException if there's not
106+
* @throws InsufficientVirtualNetworkCapacityException if there's not
107107
* enough resources to make the guest network usable in the physical
108108
* environment. At this time, the admin generally must be involved to
109109
* allocate more resources before any more guest network can be implemented.
110110
*/
111111
Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context)
112-
throws InsufficientVirtualNetworkCapcityException;
112+
throws InsufficientVirtualNetworkCapacityException;
113113

114114
/**
115115
* Once a guest network has been designed, virtual machines can be
@@ -122,12 +122,12 @@ Network implement(Network network, NetworkOffering offering, DeployDestination d
122122
* network settings to make sure everything will work.
123123
* @param vm virtual machine that is about to be deployed.
124124
* @return NicProfile nic with all of the information
125-
* @throws InsufficientVirtualNetworkCapcityException if there's
125+
* @throws InsufficientVirtualNetworkCapacityException if there's
126126
* insufficient capacity within the guest network.
127127
* @throws InsufficientAddressCapacityException if there are not addresses
128128
* to be assigned.
129129
*/
130-
NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException,
130+
NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapacityException,
131131
InsufficientAddressCapacityException, ConcurrentOperationException;
132132

133133
/**
@@ -141,15 +141,15 @@ NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) t
141141
* @param vm vm
142142
* @param dest destination the vm is deployed to
143143
* @param context Reservation context from which to get the owner, caller, and reservation id
144-
* @throws InsufficientVirtualNetworkCapcityException if there's not enough
144+
* @throws InsufficientVirtualNetworkCapacityException if there's not enough
145145
* resources.
146146
* @throws InsufficientAddressCapacityException if there's not enough ip
147147
* addresses.
148148
* @throws ConcurrentOperationException if there are multiple operations
149149
* happening on this guest network or vm.
150150
*/
151151
void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
152-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException;
152+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException;
153153

154154
/**
155155
* When a virtual machine is stopped, the NetworkGuru is informed via the

‎api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
import com.cloud.event.EventTypes;
3434
import com.cloud.exception.InsufficientAddressCapacityException;
35-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
35+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
3636
import com.cloud.exception.InvalidParameterValueException;
3737
import com.cloud.exception.NetworkRuleConflictException;
3838
import com.cloud.exception.ResourceAllocationException;
@@ -231,7 +231,7 @@ public void create() {
231231
} catch (InsufficientAddressCapacityException e) {
232232
s_logger.warn("Exception: ", e);
233233
throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, e.getMessage());
234-
} catch (InsufficientVirtualNetworkCapcityException e) {
234+
} catch (InsufficientVirtualNetworkCapacityException e) {
235235
s_logger.warn("Exception: ", e);
236236
throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, e.getMessage());
237237
}

‎api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.cloudstack.api.command.user.loadbalancer.ListApplicationLoadBalancersCmd;
2323

2424
import com.cloud.exception.InsufficientAddressCapacityException;
25-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
25+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
2626
import com.cloud.exception.NetworkRuleConflictException;
2727
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
2828
import com.cloud.utils.Pair;
@@ -31,7 +31,7 @@ public interface ApplicationLoadBalancerService {
3131

3232
ApplicationLoadBalancerRule createApplicationLoadBalancer(String name, String description, Scheme scheme, long sourceIpNetworkId, String sourceIp, int sourcePort,
3333
int instancePort, String algorithm, long networkId, long lbOwnerId, Boolean forDisplay) throws InsufficientAddressCapacityException, NetworkRuleConflictException,
34-
InsufficientVirtualNetworkCapcityException;
34+
InsufficientVirtualNetworkCapacityException;
3535

3636
boolean deleteApplicationLoadBalancer(long id);
3737

‎engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.cloud.exception.ConcurrentOperationException;
3030
import com.cloud.exception.InsufficientAddressCapacityException;
3131
import com.cloud.exception.InsufficientCapacityException;
32-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
32+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
3333
import com.cloud.exception.ResourceAllocationException;
3434
import com.cloud.exception.ResourceUnavailableException;
3535
import com.cloud.network.Network;
@@ -147,12 +147,12 @@ boolean startNetwork(long networkId, DeployDestination dest, ReservationContext
147147
* @param deviceId
148148
* @param vm
149149
* @return
150-
* @throws InsufficientVirtualNetworkCapcityException
150+
* @throws InsufficientVirtualNetworkCapacityException
151151
* @throws InsufficientAddressCapacityException
152152
* @throws ConcurrentOperationException
153153
*/
154154
Pair<NicProfile, Integer> allocateNic(NicProfile requested, Network network, Boolean isDefaultNic, int deviceId, VirtualMachineProfile vm)
155-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException;
155+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException;
156156

157157
/**
158158
* @param vmProfile
@@ -161,14 +161,14 @@ Pair<NicProfile, Integer> allocateNic(NicProfile requested, Network network, Boo
161161
* @param nicId
162162
* @param network
163163
* @return
164-
* @throws InsufficientVirtualNetworkCapcityException
164+
* @throws InsufficientVirtualNetworkCapacityException
165165
* @throws InsufficientAddressCapacityException
166166
* @throws ConcurrentOperationException
167167
* @throws InsufficientCapacityException
168168
* @throws ResourceUnavailableException
169169
*/
170170
NicProfile prepareNic(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context, long nicId, Network network)
171-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
171+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
172172
ResourceUnavailableException;
173173

174174
void removeNic(VirtualMachineProfile vm, Nic nic);
@@ -183,7 +183,7 @@ NicProfile prepareNic(VirtualMachineProfile vmProfile, DeployDestination dest, R
183183
void releaseNic(VirtualMachineProfile vmProfile, Nic nic) throws ConcurrentOperationException, ResourceUnavailableException;
184184

185185
NicProfile createNicForVm(Network network, NicProfile requested, ReservationContext context, VirtualMachineProfile vmProfile, boolean prepare)
186-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
186+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
187187
ResourceUnavailableException;
188188

189189
NetworkProfile convertNetworkToNetworkProfile(long networkId);

‎engine/components-api/src/com/cloud/network/IpAddressManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.cloud.exception.ConcurrentOperationException;
2626
import com.cloud.exception.InsufficientAddressCapacityException;
2727
import com.cloud.exception.InsufficientCapacityException;
28-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
28+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
2929
import com.cloud.exception.ResourceAllocationException;
3030
import com.cloud.exception.ResourceUnavailableException;
3131
import com.cloud.network.addr.PublicIp;
@@ -107,7 +107,7 @@ boolean applyIpAssociations(Network network, boolean rulesRevoked, boolean conti
107107
boolean handleSystemIpRelease(IpAddress ip);
108108

109109
void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfile vm, Network network, String requestedIpv4, String requestedIpv6)
110-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException;
110+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException;
111111

112112
/**
113113
* @param owner

‎engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
import com.cloud.exception.InsufficientAddressCapacityException;
135135
import com.cloud.exception.InsufficientCapacityException;
136136
import com.cloud.exception.InsufficientServerCapacityException;
137-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
137+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
138138
import com.cloud.exception.InvalidParameterValueException;
139139
import com.cloud.exception.OperationTimedoutException;
140140
import com.cloud.exception.ResourceUnavailableException;
@@ -1740,7 +1740,7 @@ private void orchestrateStorageMigration(String vmUuid, StoragePool destPool) {
17401740
} catch (ConcurrentOperationException e) {
17411741
s_logger.debug("Failed to migration: " + e.toString());
17421742
throw new CloudRuntimeException("Failed to migration: " + e.toString());
1743-
} catch (InsufficientVirtualNetworkCapcityException e) {
1743+
} catch (InsufficientVirtualNetworkCapacityException e) {
17441744
s_logger.debug("Failed to migration: " + e.toString());
17451745
throw new CloudRuntimeException("Failed to migration: " + e.toString());
17461746
} catch (InsufficientAddressCapacityException e) {

‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
import com.cloud.exception.ConnectionException;
8787
import com.cloud.exception.InsufficientAddressCapacityException;
8888
import com.cloud.exception.InsufficientCapacityException;
89-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
89+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
9090
import com.cloud.exception.InvalidParameterValueException;
9191
import com.cloud.exception.ResourceAllocationException;
9292
import com.cloud.exception.ResourceUnavailableException;
@@ -790,7 +790,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws Insuff
790790
@DB
791791
@Override
792792
public Pair<NicProfile, Integer> allocateNic(NicProfile requested, Network network, Boolean isDefaultNic, int deviceId, VirtualMachineProfile vm)
793-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException {
793+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException {
794794

795795
NetworkVO ntwkVO = _networksDao.findById(network.getId());
796796
s_logger.debug("Allocating nic for vm " + vm.getVirtualMachine() + " in network " + network + " with requested profile " + requested);
@@ -1286,7 +1286,7 @@ public int compare(NicVO nic1, NicVO nic2) {
12861286

12871287
@Override
12881288
public NicProfile prepareNic(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context, long nicId, Network network)
1289-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
1289+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
12901290
ResourceUnavailableException {
12911291

12921292
Integer networkRate = _networkModel.getNetworkRate(network.getId(), vmProfile.getId());
@@ -3020,7 +3020,7 @@ protected NicProfile getNicProfileForVm(Network network, NicProfile requested, V
30203020

30213021
@Override
30223022
public NicProfile createNicForVm(Network network, NicProfile requested, ReservationContext context, VirtualMachineProfile vmProfile, boolean prepare)
3023-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
3023+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
30243024
ResourceUnavailableException {
30253025

30263026
VirtualMachine vm = vmProfile.getVirtualMachine();

‎plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import com.cloud.deploy.DeployDestination;
3838
import com.cloud.exception.ConcurrentOperationException;
3939
import com.cloud.exception.InsufficientAddressCapacityException;
40-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
40+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
4141
import com.cloud.host.HostVO;
4242
import com.cloud.host.dao.HostDao;
4343
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -81,7 +81,7 @@ public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru {
8181

8282
@Override
8383
public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
84-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException {
84+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException {
8585
if (dest.getHost().getHypervisorType() != HypervisorType.BareMetal) {
8686
super.reserve(nic, network, vm, dest, context);
8787
return;
@@ -153,7 +153,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
153153
s_logger.debug("Allocated a nic " + nic + " for " + vm);
154154
}
155155

156-
private void getBaremetalIp(NicProfile nic, Pod pod, VirtualMachineProfile vm, Network network, String requiredIp) throws InsufficientVirtualNetworkCapcityException,
156+
private void getBaremetalIp(NicProfile nic, Pod pod, VirtualMachineProfile vm, Network network, String requiredIp) throws InsufficientVirtualNetworkCapacityException,
157157
InsufficientAddressCapacityException, ConcurrentOperationException {
158158
DataCenter dc = _dcDao.findById(pod.getDataCenterId());
159159
if (nic.getIp4Address() == null) {

‎plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.cloud.deploy.DeployDestination;
3939
import com.cloud.deploy.DeploymentPlan;
4040
import com.cloud.exception.InsufficientAddressCapacityException;
41-
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
41+
import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
4242
import com.cloud.host.HostVO;
4343
import com.cloud.host.dao.HostDao;
4444
import com.cloud.host.dao.HostDetailsDao;
@@ -128,7 +128,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use
128128

129129
@Override
130130
public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context)
131-
throws InsufficientVirtualNetworkCapcityException {
131+
throws InsufficientVirtualNetworkCapacityException {
132132
assert (network.getState() == State.Implementing) : "Why are we implementing " + network;
133133

134134
long dcId = dest.getDataCenter().getId();
@@ -151,7 +151,7 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin
151151
String vnet =
152152
_dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), context.getReservationId(), UseSystemGuestVlans.valueIn(network.getAccountId()));
153153
if (vnet == null) {
154-
throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, dcId);
154+
throw new InsufficientVirtualNetworkCapacityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, dcId);
155155
}
156156
// when supporting more types of networks this need to become
157157
// int vlan = Integer.parseInt(BroadcastDomainType.getValue(vnet));
@@ -198,7 +198,7 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin
198198

199199
@Override
200200
public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
201-
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException {
201+
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
202202
// TODO Auto-generated method stub
203203
super.reserve(nic, network, vm, dest, context);
204204
}

0 commit comments

Comments
 (0)