You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/06 13:44:23 UTC
[1/3] git commit: updated refs/heads/4.4 to 0b08d53
Repository: cloudstack
Updated Branches:
refs/heads/4.4 5fe7eb335 -> 0b08d5319
CLOUDSTACK-6676: cleanup ip address details on ip disassoc
(cherry picked from commit 66df43572e1a12ad2bd32f8c0aa9acaeb271828e)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11d8c953
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11d8c953
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11d8c953
Branch: refs/heads/4.4
Commit: 11d8c953e3bc3fdb495aa51245f3736e60128bc2
Parents: 5fe7eb3
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 5 17:26:01 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 6 13:41:23 2014 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11d8c953/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
index b569718..e1530ca 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -25,6 +25,7 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -63,6 +64,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
protected GenericSearchBuilder<IPAddressVO, Long> CountFreePublicIps;
@Inject
ResourceTagDao _tagsDao;
+ @Inject
+ UserIpAddressDetailsDao _detailsDao;
// make it public for JUnit test
public IPAddressDaoImpl() {
@@ -166,6 +169,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
address.setSystem(false);
address.setVmIp(null);
address.setDisplay(true);
+ //remove resource details for the ip
+ _detailsDao.removeDetails(ipAddressId);
update(ipAddressId, address);
}
[3/3] git commit: updated refs/heads/4.4 to 0b08d53
Posted by da...@apache.org.
Fixed unittest
(cherry picked from commit 96bfa8a73f0054db42beaff6a8ba3af058d3d915)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b08d531
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b08d531
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b08d531
Branch: refs/heads/4.4
Commit: 0b08d5319cc1cc1a3c8f0d41be5f9fc9c063f893
Parents: e6c37ff
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 5 18:20:33 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 6 13:43:56 2014 +0200
----------------------------------------------------------------------
.../networkoffering/CreateNetworkOfferingTest.java | 11 +++++++----
server/test/resources/createNetworkOffering.xml | 4 +++-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b08d531/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
index ccebb95..466adb5 100644
--- a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
+++ b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
@@ -26,6 +26,10 @@ import javax.inject.Inject;
import junit.framework.TestCase;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
+import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,10 +39,6 @@ import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
-
import com.cloud.configuration.ConfigurationManager;
import com.cloud.event.dao.UsageEventDao;
import com.cloud.event.dao.UsageEventDetailsDao;
@@ -90,6 +90,9 @@ public class CreateNetworkOfferingTest extends TestCase {
@Inject
UsageEventDetailsDao usageEventDetailsDao;
+ @Inject
+ UserIpAddressDetailsDao userIpAddressDetailsDao;
+
@Override
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b08d531/server/test/resources/createNetworkOffering.xml
----------------------------------------------------------------------
diff --git a/server/test/resources/createNetworkOffering.xml b/server/test/resources/createNetworkOffering.xml
index 887a8af..1336367 100644
--- a/server/test/resources/createNetworkOffering.xml
+++ b/server/test/resources/createNetworkOffering.xml
@@ -49,5 +49,7 @@
<bean id="usageEventDaoImpl" class="com.cloud.event.dao.UsageEventDaoImpl" />
<bean id="usageEventDetailsDaoImpl" class="com.cloud.event.dao.UsageEventDetailsDaoImpl" />
<bean id="storagePoolHostDaoImpl" class="com.cloud.storage.dao.StoragePoolHostDaoImpl" />
- <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
+ <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
+ <bean id="userIpAddressDetailsDao" class="org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDaoImpl" />
+
</beans>
[2/3] git commit: updated refs/heads/4.4 to 0b08d53
Posted by da...@apache.org.
CLOUDSTACK-6853: Search for non-removed nics only when check if the running vm belongs to a certain network
(cherry picked from commit 03623fe57e6597782b628815140283151d066a36)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6c37ffd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6c37ffd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6c37ffd
Branch: refs/heads/4.4
Commit: e6c37ffd4127534e3d72b21f989121ba78368353
Parents: 11d8c95
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 5 17:07:52 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 6 13:42:12 2014 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6c37ffd/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
index 7a05be8..f72690e 100755
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -297,6 +297,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
if (UserVmSearch == null) {
SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL);
nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL);
nicSearch.cp();