cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [2/3] git commit: updated refs/heads/vmware-disk-controllers to 1a8fe82
Date Sat, 10 Jan 2015 11:21:06 GMT
CLOUDSTACK-3439. [VMWARE] While preparing for migration, include dynamically created nics in
case of VMware too.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b67a481
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b67a481
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b67a481

Branch: refs/heads/vmware-disk-controllers
Commit: 4b67a48144402a3a43d51c869456d9268873b1b1
Parents: 82fa918
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Mon Jan 5 11:35:43 2015 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Thu Jan 8 09:50:19 2015 +0530

----------------------------------------------------------------------
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b67a481/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9feaa80..0c7b3ed 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1377,7 +1377,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
 
     @Override
     public void prepareNicForMigration(VirtualMachineProfile vm, DeployDestination dest)
{
-        if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && vm.getHypervisorType().equals(HypervisorType.KVM)){
+        if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && (vm.getHypervisorType().equals(HypervisorType.KVM)
|| vm.getHypervisorType().equals(HypervisorType.VMware))) {
             //Include nics hot plugged and not stored in DB
             prepareAllNicsForMigration(vm, dest);
             return;


Mime
View raw message