From 3b4690424da50193a1f87c528773492db07dfbad Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 14 Mar 2012 10:45:54 -0700 Subject: [PATCH] bug 14295: allow regular user to create network with the custom cidr status 14295: resolved fixed Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java --- .../src/com/cloud/network/NetworkManagerImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 5fd4ddaef21..7578331b2cb 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2225,6 +2225,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find network offering by specified id"); if (ntwkOff != null) { ex.addProxyObject(ntwkOff, networkOfferingId, "networkOfferingId"); + // Get the VO object's table name. + String tablename = AnnotationHelper.getTableName(ntwkOff); + if (tablename != null) { + ex.addProxyObject(tablename, networkOfferingId, "networkOfferingId"); + } else { + s_logger.info("\nCould not retrieve table name (annotation) from " + tablename + " VO proxy object\n"); + } throw ex; } throw ex; @@ -2398,6 +2405,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (createVlan && !ntwkOff.getSpecifyIpRanges()) { InvalidParameterValueException ex = new InvalidParameterValueException("Network offering with specified id doesn't support adding multiple ip ranges"); ex.addProxyObject(ntwkOff, ntwkOff.getId(), "networkOfferingId"); + String tablename = AnnotationHelper.getTableName(ntwkOff); + if (tablename != null) { + ex.addProxyObject(tablename, ntwkOff.getId(), "networkOfferingId"); + } else { + s_logger.info("\nCould not retrieve table name (annotation) from " + tablename + " VO proxy object\n"); + } throw ex; }