Updated Branches:
refs/heads/master 3609e44b5 -> 48806fcc5
VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/48806fcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/48806fcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/48806fcc
Branch: refs/heads/master
Commit: 48806fcc54b0b318bf7fd15c960e0fdebd92e4e9
Parents: 3609e44
Author: Alena Prokharchyk <[email protected]>
Authored: Mon Aug 27 11:04:10 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Mon Aug 27 11:11:55 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/48806fcc/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index f4c47ed..d24009d 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -528,8 +528,9 @@ public class VpcManagerImpl implements VpcManager, Manager{
// Validate vpc offering
VpcOfferingVO vpcOff = _vpcOffDao.findById(vpcOffId);
- if (vpcOff == null) {
- InvalidParameterValueException ex = new
InvalidParameterValueException("Unable to find vpc offering by specified id");
+ if (vpcOff == null || vpcOff.getState() != State.Enabled) {
+ InvalidParameterValueException ex = new
InvalidParameterValueException("Unable to find vpc offering in " +
State.Enabled +
+ " state by specified id");
ex.addProxyObject("vpc_offerings", vpcOffId, "vpcOfferingId");
throw ex;
}
