You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/27 23:01:31 UTC
[4/50] [abbrv] git commit: VPC: added vif info to ipassoc command
VPC: added vif info to ipassoc command
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.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/110903a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/110903a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/110903a9
Branch: refs/heads/vpc
Commit: 110903a91a21c04b931a26354a04bd7f534ba050
Parents: a39fd61
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jul 25 12:57:46 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 27 13:53:41 2012 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkManager.java | 3 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 15 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 6601 ++++++++-------
.../VpcVirtualNetworkApplianceManagerImpl.java | 97 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 4807 ++++++------
server/src/com/cloud/vm/dao/NicDao.java | 2 +-
server/src/com/cloud/vm/dao/NicDaoImpl.java | 2 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 44 +-
8 files changed, 5814 insertions(+), 5757 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110903a9/server/src/com/cloud/network/NetworkManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 77ca053..8c53f96 100755
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -419,9 +419,10 @@ public interface NetworkManager extends NetworkService {
/**
* @param vm
* @param networkId
+ * @param broadcastUri TODO
* @return
*/
- NicProfile getNicProfile(VirtualMachine vm, long networkId);
+ NicProfile getNicProfile(VirtualMachine vm, long networkId, String broadcastUri);
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110903a9/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 6cb5c84..9b8e5b7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2354,8 +2354,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
@Override
- public NicProfile getNicProfile(VirtualMachine vm, long networkId) {
- NicVO nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vm.getId());
+ public NicProfile getNicProfile(VirtualMachine vm, long networkId, String broadcastUri) {
+ NicVO nic = null;
+ if (broadcastUri != null) {
+ nic = _nicDao.findByNetworkIdInstanceIdAndBroadcastUri(networkId, vm.getId(), broadcastUri);
+ } else {
+ nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vm.getId());
+ }
NetworkVO network = _networksDao.findById(networkId);
Integer networkRate = getNetworkRate(network.getId(), vm.getId());
@@ -7454,16 +7459,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (requested != null && requested.getBroadCastUri() != null) {
String broadcastUri = requested.getBroadCastUri().toString();
String ipAddress = requested.getIp4Address();
- NicVO nicVO = _nicDao.findByInstanceIdNetworkIdAndBroadcastUri(network.getId(), vm.getId(), broadcastUri);
+ NicVO nicVO = _nicDao.findByNetworkIdInstanceIdAndBroadcastUri(network.getId(), vm.getId(), broadcastUri);
if (nicVO != null) {
if (ipAddress == null || nicVO.getIp4Address().equals(ipAddress)) {
- nic = getNicProfile(vm, network.getId());
+ nic = getNicProfile(vm, network.getId(), broadcastUri);
}
}
} else {
NicVO nicVO = _nicDao.findByInstanceIdAndNetworkId(network.getId(), vm.getId());
if (nicVO != null) {
- nic = getNicProfile(vm, network.getId());
+ nic = getNicProfile(vm, network.getId(), null);
}
}
return nic;