You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/19 01:14:38 UTC
git commit: Summary: Changes required for network refactor branch
Updated Branches:
refs/heads/add_remove_nics 42e4961da -> 68b236cd2
Summary: Changes required for network refactor branch
Reported-by: Brian Angus <bl...@betterservers.com>
Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1358554509 -0700
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/68b236cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/68b236cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/68b236cd
Branch: refs/heads/add_remove_nics
Commit: 68b236cd2d8ef5ad998d11546eedd66e1124c633
Parents: 42e4961
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Fri Jan 18 17:15:09 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Fri Jan 18 17:15:09 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 5 ++++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 12 ++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/68b236cd/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index a99e9c5..ce53d6b 100644
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1692,6 +1692,9 @@ public class NetworkModelImpl implements NetworkModel, Manager{
} else {
nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vm.getId());
}
+ if (nic == null) {
+ return null;
+ }
NetworkVO network = _networksDao.findById(networkId);
Integer networkRate = getNetworkRate(network.getId(), vm.getId());
@@ -1836,4 +1839,4 @@ public class NetworkModelImpl implements NetworkModel, Manager{
return offering.isInline();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/68b236cd/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 0414d92..26841e1 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -962,7 +962,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
//todo: verify unique hostname in network domain?
//verify that there isn't a NIC attached to network
- if(_networkMgr.getNicInNetwork(vmInstance.getId(),network.getId()) != null){
+ if(_networkModel.getNicInNetwork(vmInstance.getId(),network.getId()) != null){
throw new CloudRuntimeException("Unable to add NIC to " + vmInstance + " because it already has a NIC attached to " + network);
}
@@ -1071,7 +1071,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
}
// no need to check permissions for network, we'll enumerate the ones they already have access to
- Network existingdefaultnet = _networkMgr.getDefaultNetworkForVm(vmId);
+ Network existingdefaultnet = _networkModel.getDefaultNetworkForVm(vmId);
// if current default equals chosen new default, return and do nothing
if (existingdefaultnet == network){
@@ -1082,8 +1082,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
s_logger.debug("looks like we want to change from " + existingdefaultnet + " to " + network);
}
- NicProfile chosen = _networkMgr.getNicProfile(vmInstance, network.getId(), null);
- NicProfile existing = _networkMgr.getNicProfile(vmInstance, existingdefaultnet.getId(), null);
+ NicProfile chosen = _networkModel.getNicProfile(vmInstance, network.getId(), null);
+ NicProfile existing = _networkModel.getNicProfile(vmInstance, existingdefaultnet.getId(), null);
// if we can't find the chosen nic, fail!
if (chosen == null){
@@ -1114,7 +1114,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
existingVO = _nicDao.persist(existingVO);
Network newdefault = null;
- newdefault = _networkMgr.getDefaultNetworkForVm(vmId);
+ newdefault = _networkModel.getDefaultNetworkForVm(vmId);
if (newdefault == null){
chosenVO.setDefaultNic(false);
@@ -1125,7 +1125,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
chosenVO = _nicDao.persist(chosenVO);
existingVO = _nicDao.persist(existingVO);
- newdefault = _networkMgr.getDefaultNetworkForVm(vmId);
+ newdefault = _networkModel.getDefaultNetworkForVm(vmId);
if (newdefault.getId() == existingdefaultnet.getId()) {
throw new CloudRuntimeException("Setting a default nic failed, and we had no default nic, but we were able to set it back to the original");
}